andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-09-13 13:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,677 Commits 6 Branches 30 Tags
501726c6ad2fa55b27360409b632f4850201a4e4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Proddy 66b3572dfe Merge branch 'emsesp:dev' into dev 2022-05-02 15:12:19 +02:00
Proddy 7ad1251c89 Merge pull request #485 from proddy/dev 
attributes via API #462
 2022-05-02 13:10:40 +02:00
Proddy 75317d278d Merge branch 'emsesp:dev' into dev 2022-05-02 13:10:13 +02:00
Proddy 2ae5d4dcf5 Merge pull request #484 from proddy/dev 
added shower commands & some refactoring
 2022-05-01 23:00:28 +02:00
Proddy 473b870035 Merge branch 'emsesp:dev' into dev 2022-05-01 22:59:56 +02:00
Proddy 20ff1725e7 Merge pull request #483 from proddy/dev 
update react dropzone
 2022-05-01 17:54:29 +02:00
Proddy a0759f68b2 Merge branch 'emsesp:dev' into dev 2022-05-01 17:53:59 +02:00
Proddy bf40d8feaf Merge pull request #482 from proddy/dev 
make value sortable, it doesn't really make sense but it fixes the formatting alignment issues
 2022-05-01 16:41:29 +02:00
Proddy 2c54cafdb6 Merge branch 'emsesp:dev' into dev 2022-05-01 16:40:40 +02:00
Proddy 469677aba5 Merge pull request #481 from proddy/dev 
table formatting, upgrade packages & arduinojson, fix mqtt retry
 2022-05-01 16:04:46 +02:00
Proddy cc42ac3584 Merge pull request #478 from MichaelDvP/dev 
fix #476 and some names
 2022-04-25 09:02:54 -04:00
Proddy 343d0a7baa fix arduino core to 3.5.0 for ci jobs 2022-04-24 19:28:40 -04:00
Proddy b688f6f7d0 b13 2022-04-24 19:21:44 -04:00
Proddy 9cc03948fa Merge pull request #475 from proddy/dev 
Changes to Table (sorting, format, search)
 2022-04-24 19:20:16 -04:00
Proddy 15f5f55833 Merge branch 'emsesp:dev' into dev 2022-04-19 12:25:11 +02:00
Proddy a243b0a853 Merge pull request #472 from bavo/fix-selected-temp-range 
Increase range for the selected_room_temperature variable
 2022-04-19 12:24:56 +02:00
Proddy 101f94bea6 Merge pull request #5 from proddy/newtable 
Newtable
 2022-04-17 20:58:26 +02:00
Proddy 45cda9b0cc Merge pull request #471 from MichaelDvP/dev 
Additions for #437, #459, #464
 2022-04-14 18:26:46 +02:00
Proddy fdefd02812 Merge pull request #467 from kwertie01/feature/moduline400WWandTimer 
Feature Moduline 400 WW settings and timer clock program
 2022-04-13 23:21:51 +02:00
Proddy 555b1ad996 Merge pull request #460 from MichaelDvP/dev 
add Hybrid Heatpump
 2022-04-08 17:25:52 +02:00
Proddy c3256824b2 Merge pull request #458 from MichaelDvP/dev 
mqtt HA uses only json, disable single
 2022-04-08 13:42:15 +02:00
Proddy b496f7731a Merge pull request #457 from MichaelDvP/dev 
Changes #450
 2022-04-08 11:13:00 +02:00
Proddy 8479be5bd4 Merge pull request #455 from proddy/dev 
mqtt clean session default off #441
 2022-04-08 07:47:01 +02:00
Proddy 8b31e8a9c4 Merge pull request #453 from proddy/dev 
updated changelog for Moduline updates
 2022-04-06 20:23:35 +02:00
Proddy 1a58f76ab7 Merge pull request #449 from kwertie01/feature/moduline400 
added moduline 400 installation parameters
 2022-04-06 10:15:26 +02:00
Proddy 4279962e59 Merge pull request #452 from proddy/dev 
saving customizations would overwrite previous settings
 2022-04-05 23:29:30 +02:00
Proddy 3d072f73b7 Merge pull request #447 from proddy/dev 
changes per #444
 2022-04-04 21:47:12 +02:00
Proddy 08cae822f1 Merge pull request #445 from MichaelDvP/dev 
Status of changes for the last issues
 2022-04-04 15:24:59 +02:00
Proddy ecaa0ec4bb Merge pull request #442 from proddy/dev 
fix changing masks for customizations
 2022-04-03 17:50:13 +02:00
Proddy 0bd122b643 Merge pull request #435 from MichaelDvP/dev 
check readonly before set datetime to thermostat
 2022-04-02 10:19:13 +02:00
Proddy 91484fd09f Merge pull request #434 from proddy/dev 
smaller icons in customization table
 2022-04-01 09:17:12 +02:00
Proddy b455827c17 Merge branch 'emsesp:dev' into dev 2022-04-01 09:15:48 +02:00
Proddy b6363957a8 Merge pull request #432 from MichaelDvP/dev 
fix/optimization for mode/temperature set
 2022-04-01 09:12:25 +02:00
Proddy 608d5e332d Merge pull request #431 from proddy/dev 
minor updates to customization test data and layout
 2022-03-30 21:05:29 +02:00
Proddy 90c38d0403 Merge pull request #430 from MichaelDvP/dev 
Errormessage
 2022-03-30 17:51:53 +02:00
Proddy 54d09ceb51 Merge pull request #429 from proddy/dev 
updates to customization screen
 2022-03-30 13:16:40 +02:00
Proddy 97c1d6d73a Merge pull request #427 from MichaelDvP/dev 
add NTP status to mqtt/ha (heartbeat) and log
 2022-03-29 20:28:47 +02:00
Proddy 0f0fc2a8f7 Merge pull request #426 from proddy/dev 
#418
 2022-03-29 18:41:24 +02:00
Proddy c41344e2a5 Merge branch 'emsesp:dev' into dev 2022-03-29 18:40:59 +02:00
Proddy b96c2a731c Merge pull request #425 from proddy/dev 
more icons to dashboard
 2022-03-29 18:33:58 +02:00
Proddy 4f1b768b6c Merge branch 'emsesp:dev' into dev 2022-03-29 18:33:17 +02:00
Proddy d269029bb1 Merge pull request #424 from MichaelDvP/dev 
try to fix #408 and #412
 2022-03-29 16:35:12 +02:00
Proddy 80c87c8c43 Merge pull request #423 from MichaelDvP/dev 
remove `(hidden)` text, force exclude from web icon
 2022-03-29 12:16:16 +02:00
Proddy ac1de4c995 Merge pull request #422 from proddy/dev 
Michael's PR merged (dv sort, remove id)
 2022-03-29 09:06:53 +02:00
Proddy cc31143a6c Merge pull request #421 from proddy/dev 
fixes #411
 2022-03-28 17:52:44 +02:00
Proddy 07ec5c3b12 Merge pull request #417 from MichaelDvP/dev 
fix #412, daylightsaving with manual time setting
 2022-03-28 10:38:53 +02:00
Proddy 28ae1ae3d4 Merge pull request #416 from proddy/dev 
Dev
 2022-03-27 23:19:52 +02:00
Proddy b9e1c0ba56 Merge branch 'emsesp:dev' into dev 2022-03-27 23:18:14 +02:00
Proddy 9f946f3514 Merge pull request #414 from proddy/dev 
code optimizations
 2022-03-27 22:48:27 +02:00
Proddy 904198013e Merge branch 'emsesp:dev' into dev 2022-03-27 22:47:51 +02:00
Proddy 6c3d33d4a1 Merge pull request #413 from proddy/dev 
rename exclude_entities to masked_entities - fixes for #411
 2022-03-27 22:19:35 +02:00
Proddy b031e1a232 Merge pull request #409 from MichaelDvP:dev 
Customizations to names with more options
 2022-03-26 21:29:21 +00:00
Proddy a695f85359 Merge pull request #401 from MichaelDvP/dev_ 
add RC35 values #398
 2022-03-14 15:06:21 +01:00
Proddy 0aa5c73635 Update README.md 
added sonarcloud badge
 2022-03-11 17:00:09 +01:00
Proddy afda97870a Merge pull request #394 from MichaelDvP/dev 
adds for #392 and #393
 2022-03-11 16:57:02 +01:00
Proddy f539a236f1 Merge pull request #391 from MichaelDvP/dev 
fix #390, fetching summer2_ids
 2022-03-11 08:51:45 +01:00
Proddy 26b7075696 Merge pull request #389 from proddy/dev 
update arduinojson 6.19.3
 2022-03-09 09:15:03 +01:00
Proddy eaca7df527 Merge pull request #385 from MichaelDvP/dev 
show correct hostname in startup message
 2022-03-08 18:00:03 +01:00
Proddy 47aab98964 Merge pull request #384 from proddy/dev 
update static code analysis from codacy to sonar #381
 2022-03-07 12:50:42 +01:00
Proddy e247b9e5f9 Merge pull request #379 from MichaelDvP:dev_ 
climate hidden, customization of hidden and commands, cleanup
 2022-02-27 14:24:27 +01:00
Proddy 142ca1e32c Merge pull request #378 from MichaelDvP:dev_ 
check selTemp, roomTemp visibility for climate creation
 2022-02-26 17:58:53 +01:00
Proddy 16eb3f021d Merge pull request #375 from MichaelDvP/dev_ 
move HA climate to mqtt
 2022-02-26 15:55:38 +01:00
Proddy 807bf4c061 Merge pull request #370 from MichaelDvP/dev_ 
add ww to thermostat single publish
 2022-02-20 20:36:12 +01:00
Proddy 76579c426e Merge pull request #367 from MichaelDvP/dev_ 
add missing subscriptions to dallas/analogsensor
 2022-02-19 15:15:25 +01:00
Proddy 9ceec6e306 Merge pull request #365 from MichaelDvP/dev_ 
publish all mixers to one json
 2022-02-19 11:02:27 +01:00
Proddy 7da6b1925d Merge pull request #364 from proddy:dev 
fix static code analysis warnings
 2022-02-18 21:03:15 +01:00
Proddy 33835fef7b Merge pull request #362 from MichaelDvP/dev_mqtt 
Fahrenheit for HA-climate min/max
 2022-02-17 10:47:20 +01:00
Proddy 4c4a6f668d Merge pull request #361 from MichaelDvP/dev_mqtt 
mqtt, analog, fahrenheit and other changes
 2022-02-17 10:04:25 +01:00
Proddy 802e7a080f Merge branch 'dev' into dev 2022-02-13 22:31:09 +01:00
Proddy e2163546fe Merge branch 'emsesp:dev' into dev 2022-02-13 13:01:18 +01:00
Proddy 002fa82afb Merge branch 'emsesp:dev' into dev 2022-02-12 17:38:38 +01:00
Proddy 668276e7d0 Merge branch 'emsesp:dev' into dev 2022-02-10 22:10:40 +01:00
Proddy 99743e8e0f Merge pull request #352 from MichaelDvP/dev_ 
fix telegram_last dest read flag
 2022-02-06 12:19:12 +01:00
Proddy 5143040ba9 Merge pull request #332 from MichaelDvP/dev_ 
fix #329, numberformat in Edge, Chrome
 2022-02-05 12:51:14 +01:00
Proddy 01c75ad5c0 Merge pull request #348 from MichaelDvP/dev_327 
fix #327, analogsensor sending multiple mqtt messages
 2022-02-05 12:50:43 +01:00
Proddy 43d0197a60 Merge pull request #347 from MichaelDvP/dev_340 
fix #340, refresh only device/sensor-data if open
 2022-02-05 12:48:18 +01:00
Proddy 35013a71d4 Merge pull request #346 from MichaelDvP/dev_336 
fix #336, map Junkers hc3/4 to masterthermostat
 2022-02-05 12:47:54 +01:00
Proddy 381acbf00f Merge pull request #323 from MichaelDvP/dev 
always show RC300 tempautotemp with minimum to -1°C #321
 2022-02-05 12:32:52 +01:00
Proddy 915418eca8 Merge pull request #330 from MichaelDvP/dev_ 
fixes #327 #329
 2022-01-26 20:27:02 +01:00
Proddy 8c4e5e5185 Merge pull request #324 from MichaelDvP/dev_ 2022-01-25 13:24:29 +01:00
Proddy 4569ee50a5 Merge pull request #320 from MichaelDvP/dev 
helptext for string commands
 2022-01-24 20:31:13 +01:00
Proddy ab34f7c056 Merge pull request #319 from MichaelDvP/dev 2022-01-24 13:30:09 +01:00
Proddy 02e2b51814 Merge pull request #307 from MichaelDvP/dev 
check received status before toggling fetch on empty telegram
 2022-01-20 10:04:03 +01:00
Proddy 3d8e1b8f86 Merge pull request #245 from proddy:dev 
Add back RC30 - #243
 2021-12-14 20:23:34 +00:00
Proddy 0f41079803 Merge pull request #235 from pswid:dev 
fix overlapping 0xC2 and overflow of offset
 2021-12-14 19:49:37 +00:00
Proddy 90c39d1f85 Merge pull request #234 from pswid/dev 2021-12-03 09:38:40 +01:00
Proddy 84d3d42306 Merge pull request #220 from proddy:dev 
minor updates
 2021-11-25 09:16:03 +01:00
Proddy 5de529cbb2 Merge pull request #218 from pswid:dev 
timestamp in boiler last error code
 2021-11-25 08:49:44 +01:00
Proddy 6532abd870 Merge pull request #217 from proddy:dev 
text changes, renamed status to bus_status in heartbeat, improved WebUI table layout, added Ethernet phy to custom profile board
 2021-11-22 09:11:41 +01:00
Proddy 5a9122f8be Merge pull request #215 from proddy/dev 2021-11-20 21:25:02 +01:00
Proddy 30b111b986 Merge pull request #208 from proddy:dev 
fixes #207
 2021-11-19 13:00:58 +01:00
Proddy 96180c837d Merge pull request #203 from proddy:dev 
Add Network to MQTT topic info and system/info command
 2021-11-18 12:11:40 +01:00
Proddy 74287ebb99 Merge pull request #201 from proddy:dev 
fixes #199 - change value validation fails
 2021-11-17 19:03:27 +01:00
Proddy 5f6033cac1 Merge pull request #197 from proddy/dev 
fixes #196 (HA missing entities), add row click to devices, change max limit on integer types to avoid NaN, refactored generation of device value JSON objects
 2021-11-15 17:45:52 +01:00
Proddy 7c16870294 Merge pull request #194 from kpschaper/bugfix_settemp 
bugfix revert auto mode -> the mode is hardcoded for the thermostat_ha_cmd #183
 2021-11-14 18:17:18 +01:00
Proddy e368f422f4 Merge pull request #195 from proddy/dev 
Fix console UOM, set temperature to show 1 decimal place in web
 2021-11-14 18:04:39 +01:00
Proddy 5893487d4a Merge pull request #189 from proddy:dev 
fix MQTT non-JSON payloads
 2021-11-14 12:56:20 +01:00
Proddy 3c8e20d4e4 Merge pull request #193 from kpschaper/fix_rc10_mode 
Mode update for #183
 2021-11-14 12:55:37 +01:00
Proddy 409d382ff9 Merge pull request #188 from MichaelDvP:dev 
Mode update for #183
 2021-11-11 20:04:25 +01:00
Proddy 72a59917fb Merge pull request #185 from kpschaper/fix_shower_alert 
Fix shower timer; doing_cold_shot is never being reset
 2021-11-07 17:42:49 +01:00