andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-09-13 21:54:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,687 Commits 6 Branches 30 Tags
96ff5ed123a34ddd90499aaa9158ce9987994766
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Proddy 96ff5ed123 Merge pull request #1302 from MichaelDvP/dev2 
network connection and powerentities
 2023-09-20 20:08:22 +02:00
Proddy af935d8124 Merge pull request #1298 from proddy/dev 
some refactoring and change #1297
 2023-09-19 16:47:30 +02:00
Proddy 0eb96e764c Merge pull request #1296 from proddy/dev 
3.6.2-dev-0
 2023-09-16 09:27:09 +02:00
Proddy 34f87a0a21 Merge pull request #1292 from proddy/dev 
use espressif core 2.0.12 via Tasmota for 4MB build
 2023-09-10 13:18:46 +02:00
Proddy 4da45a7240 Merge pull request #1291 from proddy/dev 
preparing 3.7.0
 2023-09-09 15:02:12 +02:00
Proddy 677f6c5a6e Merge pull request #1290 from proddy/dev 
#1280 sample value is a string for enums
 2023-09-09 13:43:09 +02:00
Proddy 877d60f46f Merge pull request #1289 from MichaelDvP/dev 
Fixes from testbuild
 2023-09-09 12:32:57 +02:00
Proddy 33ea1c6863 Merge pull request #1288 from proddy/dev 
fix for MQTT enum index option leads to error in HA #1280
 2023-09-09 10:26:25 +02:00
Proddy 83211e0ef8 Merge pull request #1286 from MichaelDvP/dev 
show color wifi-quality in network selector
 2023-09-08 15:26:05 +02:00
Proddy 04fd04b2ab Merge pull request #1285 from proddy/dev 
mqtt fix
 2023-09-08 09:26:50 +02:00
Proddy 27aa72eda1 Merge pull request #1284 from MichaelDvP/dev 
fix for espressif@6.4.0
 2023-09-06 10:59:49 +02:00
Proddy 9ebcfe38bc Merge pull request #1279 from proddy/dev 
add missing translations and show value type in table
 2023-09-02 13:41:58 +02:00
Proddy 243aec37fd Merge pull request #1277 from proddy/dev 
minor changes
 2023-09-02 11:14:30 +02:00
Proddy f60197e9bf Merge pull request #1273 from MichaelDvP/dev 
update Mqtt Client
 2023-08-31 12:12:08 +02:00
Proddy d6ae55218f Merge pull request #1272 from proddy/dev 2023-08-30 22:35:49 +02:00
Proddy d049572239 Merge pull request #1266 from proddy/dev 
update web packages
 2023-08-19 10:07:50 +02:00
Proddy f6faad7255 Merge pull request #1263 from proddy/dev 
build s3
 2023-08-15 18:54:36 +02:00
Proddy b1f2273bb5 Merge pull request #1261 from proddy/dev 
prepare for 3.7.0
 2023-08-13 14:40:29 +02:00
Proddy f6c34ee2c9 Merge pull request #1258 from proddy/dev 
minor updates
 2023-08-11 21:19:31 +02:00
Proddy faec42ac71 Merge pull request #1257 from MichaelDvP/dev 2023-08-11 20:43:49 +02:00
Proddy ac889d921f Merge pull request #1254 from MichaelDvP/dev 
nl translations from BBQKees
 2023-08-10 21:05:12 +02:00
Proddy 0f88b7cfbc Merge pull request #1253 from proddy/dev 
update sonar scanner
 2023-08-09 13:51:43 +02:00
Proddy b96cede131 Merge pull request #1252 from proddy/dev 
rename EMS-ESP Status to System Status so HA doesn't complain (fixes #1243)
 2023-08-09 09:16:20 +02:00
Proddy b2590fc9e0 Merge branch 'emsesp:dev' into dev 2023-08-09 09:15:15 +02:00
Proddy 7a3aca1220 Merge pull request #1251 from MichaelDvP/dev 
Fix HM200 compressor speed
 2023-08-08 17:09:56 +02:00
Proddy 9226e5b303 Merge pull request #1250 from proddy/dev 
small changes
 2023-08-08 15:53:52 +02:00
Proddy 4e4cc93092 Merge branch 'emsesp:dev' into dev 2023-08-08 15:49:24 +02:00
Proddy 45fc13f7a0 Merge pull request #1249 from proddy/dev 
hardcode links to release notes
 2023-08-08 07:59:04 +02:00
Proddy 94407e5192 Merge branch 'emsesp:dev' into dev 2023-08-08 07:58:13 +02:00
Proddy 2698116c63 Merge pull request #1245 from proddy/dev 
Enhance version check to differentiate between ESP32 and ESP32-S3 bin versions #1240
 2023-08-08 07:51:20 +02:00
Proddy 6e653eea7e Merge pull request #1237 from MichaelDvP/dev 
more tr translations #1076
 2023-07-31 14:53:15 +02:00
Proddy c167aa90bc Merge pull request #1236 from proddy/dev 
merge dev2
 2023-07-30 22:38:25 +02:00
Proddy dda2d6316d Merge pull request #1235 from MichaelDvP/dev2 
tr translation (part), response api
 2023-07-30 14:54:27 +02:00
Proddy 4295b2d114 Merge pull request #1234 from MichaelDvP/dev2 
add cooling state, make mqtt on_message more clear
 2023-07-24 21:11:07 +01:00
Proddy 6a675736eb Merge pull request #1232 from proddy/dev2 
upgrade arduinojson 6.21.3 and other minor formatting
 2023-07-24 08:37:58 +01:00
Proddy 4a11147467 Merge pull request #1231 from MichaelDvP/dev2 
fix mqtt `on_message`
 2023-07-24 08:03:39 +01:00
Proddy 168a31d331 Merge pull request #1230 from proddy/dev2 
Dev2
 2023-07-21 23:49:12 +02:00
Proddy ba409b808d Merge pull request #1229 from MichaelDvP/dev2 
api/response, Gateway S3, small fixes
 2023-07-21 23:33:47 +02:00
Proddy ad6be2d5ef Merge pull request #1227 from proddy/dev2 
standalone compiling and some formatting
 2023-07-19 07:25:19 +02:00
Proddy 981cdaecf1 Merge pull request #1226 from proddy/dev2 
dev2 - minor changes
 2023-07-14 17:25:37 +02:00
Proddy 875507d7a9 Merge pull request #1225 from proddy/dev2 
replace react with preact #1224
 2023-07-13 12:10:48 +02:00
Proddy 5af1f932bd Merge branch 'emsesp:dev2' into dev2 2023-07-13 08:28:22 +02:00
Proddy ac96ea5308 Merge pull request #1223 from proddy/dev2 
update changelog & version
 2023-07-12 08:22:54 +02:00
Proddy 8557fec581 Merge pull request #1222 from MichaelDvP/dev2 
MqttSecure, see #1178
 2023-07-12 08:02:23 +02:00
Proddy 39624dcfcc Merge pull request #1219 from proddy/dev2 
Add endpoint to read firmware capabilities #1218
 2023-07-11 21:33:08 +02:00
Proddy 362d837baa Merge pull request #1211 from proddy/dev2 
report on invalid extension - fixes #1210
 2023-07-10 08:36:57 +02:00
Proddy 32884da60d Merge branch 'emsesp:dev2' into dev2 2023-07-09 17:43:38 +02:00
Proddy b57bc11070 Merge pull request #1209 from proddy/dev2 
add timeout so Wifi Scan works
 2023-07-07 17:07:45 +02:00
Proddy 60594ff4b7 Merge pull request #1208 from proddy/dev2 
refresh change log with all 3.6.0 updates
 2023-07-07 14:43:14 +02:00
Proddy 1f7ddcec55 Merge pull request #1207 from MichaelDvP/dev2 2023-07-05 15:16:03 +02:00
Proddy d6e7b136a8 Merge pull request #1206 from proddy/dev2 
order languages alphabetically
 2023-07-05 09:39:38 +02:00
Proddy cbbe6ac589 Merge pull request #1205 from MichaelDvP/dev2 
update it translations, etc
 2023-07-03 21:32:42 +02:00
Proddy 7b0d73e275 Merge pull request #1203 from MichaelDvP/dev2 
reset dirty when saving
 2023-07-03 13:15:38 +02:00
Proddy d15de88065 Merge pull request #1202 from MichaelDvP/dev2 
github action
 2023-07-03 08:48:24 +02:00
Proddy 2663bc15f4 Merge pull request #1201 from MichaelDvP/dev2 
Merge dev2
 2023-07-02 15:43:16 +02:00
Proddy 449bb4055c Merge pull request #1200 from proddy/dev-alova 
Dev alova - #1112
 2023-07-02 13:09:01 +02:00
Proddy 43dc177a6d Merge pull request #1189 from emsesp/dev_fix 2023-06-04 16:41:39 +02:00
Proddy 46578dbe69 Update roboto.css - fix typo 2023-06-04 12:18:05 +02:00
Proddy d9c2fe0fb9 Merge pull request #1186 from proddy/dev 
suppress lint warning with make
 2023-06-03 11:12:51 +04:00
Proddy ee0e6ed29f Merge pull request #1185 from proddy/dev 
minor updates
 2023-06-03 10:09:59 +04:00
Proddy 26b873da9e Merge pull request #1184 from emsesp/dev-fix 
fix #1182
 2023-05-31 23:18:48 +04:00
Proddy 53c8d9372e Merge pull request #1180 from pswid/dev 2023-05-30 23:04:58 +04:00
Proddy d314e1d050 Merge pull request #1181 from emsesp/dev-fix 2023-05-30 23:03:13 +04:00
Proddy 4a3201f194 Merge pull request #1177 from proddy/dev 
formatting
 2023-05-27 09:43:41 +02:00
Proddy 06e3c0a41f Merge pull request #1176 from MichaelDvP/dev 
AM20, HIU, Ventilation and other
 2023-05-27 08:39:48 +02:00
Proddy 2d70f637c9 Merge pull request #1175 from proddy/dev 
Table sizes
 2023-05-25 20:20:52 +02:00
Proddy cf042271c3 Merge branch 'emsesp:dev' into dev 2023-05-25 20:20:26 +02:00
Proddy 0c1042abc9 Merge pull request #1162 from proddy/dev 
web render update - #1116
 2023-05-24 20:42:36 +02:00
Proddy c3e5e8d6d1 Merge branch 'dev' into dev 2023-04-23 01:05:36 +02:00
Proddy 6f155fab0b Merge pull request #1159 from MichaelDvP/dev 
add writeable setting to custom entities
 2023-04-15 18:32:50 +02:00
Proddy 79bff902e1 Merge pull request #1154 from proddy/dev 
standalone compile issues
 2023-04-06 21:20:42 +02:00
Proddy 0c8a7d51a8 Merge pull request #1151 from MichaelDvP/dev 
Custom telegram handler #1079
 2023-04-06 21:08:28 +02:00
Proddy 05e1bbf86b Merge branch 'dev' into dev 2023-04-06 21:08:18 +02:00
Proddy 004ec92d68 Merge pull request #1153 from proddy/dev 
minor updates, can't remember what
 2023-04-06 20:56:53 +02:00
Proddy 24eccf1e04 Merge branch 'emsesp:dev' into dev 2023-04-02 16:14:01 +02:00
Proddy 1673acd537 Merge pull request #1149 from pswid/dev 
fixed PL and NO translation of "haclimate"
 2023-04-02 10:57:48 +02:00
Proddy d993b356f9 Merge pull request #1150 from minusdreidb/dev 
Fix #1147 - Exhaust temperature always zero on GB125/MC110/RC310
 2023-04-02 10:43:35 +02:00
Proddy 17b108597e Merge pull request #1145 from MichaelDvP/dev 
revert another wrong translation
 2023-03-25 11:12:33 +01:00
Proddy 904403f8fa Merge pull request #1142 from MichaelDvP/dev 
fixes
 2023-03-24 20:32:16 +01:00
Proddy ddad1bbe09 Merge pull request #1141 from proddy/dev 
minor fixes
 2023-03-24 13:36:26 +01:00
Proddy 0674426d29 Merge pull request #1139 from proddy/dev 
use number as table id's - #1126
 2023-03-24 12:14:17 +01:00
Proddy 80ec86361a Merge pull request #1138 from Vikingn/dev 
Norwegian translations added again
 2023-03-24 12:13:56 +01:00
Proddy 274855a19e Merge branch 'emsesp:dev' into dev 2023-03-23 20:40:15 +01:00
Proddy d26d2ae556 Merge pull request #1137 from pswid/dev 
improve view of settings pages (app and mqtt)
 2023-03-23 20:37:06 +01:00
Proddy 93d68996b4 Merge pull request #1128 from MichaelDvP/dev 2023-03-18 14:17:19 +01:00
Proddy e46c5263d9 Merge pull request #1124 from MichaelDvP/dev 
fix device icons in dashboard
 2023-03-15 12:36:08 +01:00
Proddy 0c9c15f854 Merge pull request #1123 from MichaelDvP/dev 
fix translations for EMSESP_EN_ONLY, EMSESP_DE_ONLY
 2023-03-15 08:22:09 +01:00
Proddy 432220dc86 Merge pull request #1122 from proddy/dev 
update ArduinoJson to 6.21.0
 2023-03-14 22:06:17 +01:00
Proddy bac266eadc Merge pull request #1121 from MichaelDvP/dev 
some small fixes
 2023-03-14 18:17:37 +01:00
Proddy 2c572f8099 Merge pull request #1119 from pswid/dev 
fix: tags in names in HA were not translated
 2023-03-14 09:12:15 +01:00
Proddy 354741a81d Merge pull request #1117 from proddy/dev 
add EMSESP_EN_ONLY and EMSESP_DE_ONLY to be safe
 2023-03-12 11:15:57 +01:00
Proddy 1e1baa9781 Update sonar_check.yml 2023-03-12 10:59:22 +01:00
Proddy 94678a6726 Merge pull request #1114 from proddy/dev 
#1112 - web optimizations
 2023-03-12 08:49:45 +01:00
Proddy ae890dab37 Merge pull request #1113 from proddy/dev 
rollback notistack to 2.0.8 so it fits flash
 2023-03-10 17:25:57 +05:30
Proddy c16b9968e1 Merge pull request #1108 from proddy/dev 
fix standalone
 2023-03-08 12:01:24 +05:30
Proddy e1e8c1064a Merge pull request #1107 from MichaelDvP/dev 
add thermostat names, missing turk locale
 2023-03-08 11:49:36 +05:30
Proddy 94ff01bf2c Merge pull request #1106 from pswid/dev 
Polish translation update
 2023-03-08 11:48:57 +05:30
Proddy 8d437c31ce Merge pull request #1105 from MichaelDvP/dev 
scheduler and fixes
 2023-03-06 19:45:52 +01:00
Proddy cdb64a4c15 Merge pull request #1103 from proddy/dev 
#701 scheduler web dialog updates
 2023-03-05 18:28:33 +01:00
Proddy dd200f6d34 Merge pull request #1101 from MichaelDvP/dev 
some case and nullptr checks
 2023-03-04 18:43:08 +01:00