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,925 Commits 6 Branches 30 Tags
8c0359215700bfaca3d81e017f2c6f2a29bf075f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Proddy 8c03592157 Merge pull request #1400 from MichaelDvP/dev2x 
Small change from my Dev2
 2023-11-09 23:30:36 +01:00
Proddy 06f5e1226f Merge pull request #1391 from proddy/dev2 
sync with latest dev
 2023-11-05 17:15:20 +01:00
Proddy af57af46b0 Merge pull request #1390 from proddy/dev 
update changelog and bump version
 2023-11-05 17:13:33 +01:00
Proddy 207953e8d1 Merge pull request #1383 from proddy/dev 
no commands for nrgheat & nrgww - #1382
 2023-11-04 14:11:13 +01:00
Proddy 2afe50fc9e Merge pull request #1381 from MichaelDvP/dev2 
Dev2: relais, fix exhausttemp, fix RC20 remote
 2023-11-04 11:53:46 +01:00
Proddy 6f097e4613 Merge pull request #1377 from proddy/dev 
small updates
 2023-10-31 22:09:04 +01:00
Proddy 90af88f36d Merge pull request #1376 from proddy/dev2 
Dev2
 2023-10-31 22:07:48 +01:00
Proddy 6853651c8b Merge pull request #1374 from proddy/dev2 
Dev2
 2023-10-31 18:09:45 +01:00
Proddy 1991ca4128 Merge pull request #1372 from proddy/dev 
shower duration in sec
 2023-10-31 12:34:18 +01:00
Proddy 879df338e3 Merge pull request #1371 from proddy/dev2 
small things
 2023-10-31 12:33:53 +01:00
Proddy af8e77029e Merge pull request #1369 from MichaelDvP/dev2 
Testbuild
 2023-10-30 16:43:33 +01:00
Proddy 94519179df Merge pull request #1368 from proddy/dev 
use DEBUG logging for commands with json output - #1364
 2023-10-30 13:10:58 +01:00
Proddy 6a221e84cc Merge pull request #1365 from proddy/dev 
3.6.3-dev.5
 2023-10-29 13:44:42 +01:00
Proddy 7ea7a4b25a Merge branch 'emsesp:dev' into dev 2023-10-29 13:44:17 +01:00
Proddy 222f853616 Merge pull request #1362 from proddy/dev 
messing with yarn again (bored)
 2023-10-26 12:17:15 -07:00
Proddy 6c7787b2ae Merge pull request #1358 from owenvoke/feature/tls-typo 
chore: fix typos of TLS
 2023-10-25 06:22:16 -07:00
Proddy 8929e15e00 Merge pull request #1356 from proddy/dev 
show options and range in export - #1342
 2023-10-23 07:12:04 -07:00
Proddy 4c789a656b Merge pull request #1355 from proddy/dev 
minor changes
 2023-10-22 07:54:24 -07:00
Proddy be93627ec0 Merge pull request #1353 from proddy/dev 
minor changes plus Michael's updated AsyncTCP library
 2023-10-22 03:43:15 -07:00
Proddy 36ca7e09ca Merge pull request #1352 from proddy/dev 
quick link from device entities to custom entities page (the list icon)
 2023-10-21 07:15:47 -07:00
Proddy 1fded64f2e Merge pull request #1343 from proddy/dev 
show entity count in device list, remove type
 2023-10-20 07:42:02 -07:00
Proddy f9a176e09c Merge pull request #1341 from proddy/dev 
fixes from previous checkin
 2023-10-17 12:21:19 -07:00
Proddy 8584901229 Merge pull request #1340 from proddy/dev 
add missing 'yarn webUI'
 2023-10-17 11:29:14 -07:00
Proddy 9223a00270 Merge pull request #1339 from proddy/dev 
update web building
 2023-10-17 07:19:21 -07:00
Proddy 20e301594c Update github-releases-to-discord.yml 2023-10-16 15:01:30 +02:00
Proddy f90f4279d7 Create github-releases-to-discord.yml 2023-10-16 14:58:08 +02:00
Proddy 9962f16d62 Merge pull request #1336 from proddy/dev 
fixed helper text in entity dialog for numeric values
 2023-10-16 04:16:32 -07:00
Proddy 9641adce1c Merge pull request #1333 from proddy/dev 
added timestamp to shower_data, add HA's ent_cat discovery to all sensors
 2023-10-15 10:33:05 -07:00
Proddy 8395983106 Merge pull request #1319 from MichaelDvP/dev 
add forceheatingoff #1262 and header/heatblock #1317
 2023-10-08 12:19:22 +01:00
Proddy a8c7b2bca4 Merge pull request #1318 from proddy/dev 
fix shower duration
 2023-10-03 22:08:55 +01:00
Proddy f76e6b56b1 Merge pull request #1316 from MichaelDvP/dev 
arduino 2.0.13 and 3.0.0 ready
 2023-10-03 21:35:47 +01:00
Proddy 4b41180785 Merge pull request #1312 from proddy/dev 
preparing for 3.6.3
 2023-10-01 17:50:27 +02:00
Proddy 20d8b6400f Merge pull request #1311 from proddy/dev 
minor changes
 2023-10-01 17:32:50 +02:00
Proddy f9a53cf320 Merge pull request #1309 from MichaelDvP/dev 
Some small corrections
 2023-09-29 11:18:24 +02:00
Proddy 5bc3bd23e2 Merge pull request #1306 from proddy/dev 
small changes
 2023-09-25 09:15:44 +02:00
Proddy 398cbadb64 Merge pull request #1304 from MichaelDvP/dev 
burner settings use min/max from telegram 4, fix max for values < 0
 2023-09-21 20:31:06 +02:00
Proddy 385d2377db Merge pull request #1303 from proddy/dev 
disabled entity values shown in white text in web
 2023-09-20 23:10:41 +02:00
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