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
1,791 Commits 6 Branches 30 Tags
fdafa6d9746800ef9325bc97cb520670cb4f03ce
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
MichaelDvP ffb672f3fd suggestion for #477 2020-09-04 14:45:22 +02:00
MichaelDvP 55d670b59b Fix MM100 wwc names (#479) and cmd:temp for some thermostats (#478) 2020-09-04 12:04:23 +02:00
MichaelDvP 72376e5360 Merge branch 'dev' of https://github.com/proddy/EMS-ESP into dev 2020-08-30 15:48:42 +02:00
MichaelDvP 0d6b6bc88b master thermostat detection and HA thermostat modes 2020-08-30 15:30:15 +02:00
MichaelDvP 8a98f7cac8 DS18S20 fix, sensors right align with 1 decimal, telegram counter 32 bit 2020-08-30 14:27:11 +02:00
MichaelDvP 6065248f94 menu item highlighting 2020-08-19 08:40:43 +02:00
MichaelDvP af6ce2c1ad sensor fix buffer overflow 2020-08-17 17:06:02 +02:00
MichaelDvP 36931ef303 Junkers values as mentioned in #445, save some memory for remote thermostats 2020-08-17 11:14:33 +02:00
MichaelDvP 5540d6de0f Merge branch 'v2_cmd' of https://github.com/proddy/EMS-ESP into v2_c 2020-08-13 18:36:24 +02:00
MichaelDvP 59db38f261 feedback for read-command and set tx_mode, move show mqtt, 2020-08-13 18:35:54 +02:00
MichaelDvP 6df1f3f708 thermostat allow master, snc commands 2020-08-03 07:51:48 +02:00
MichaelDvP 91573f5594 onewire for esp32 improved, retry for sensors 2020-08-02 08:54:30 +02:00
MichaelDvP e735ac0338 update readme (add mqtt) 2020-08-01 12:20:55 +02:00
MichaelDvP d2549d025b add thermostat values, change output thermostat mqtt-custom to single format 2020-08-01 12:20:16 +02:00
MichaelDvP bbc40e5bfb add solar values 2020-08-01 12:19:01 +02:00
MichaelDvP 2936de3e3f add boler values 2020-08-01 12:18:20 +02:00
MichaelDvP d6c5321a5f update uarts 2020-08-01 12:17:31 +02:00
MichaelDvP 6a434f0cef round sensor values, no yield for esp32 (dualcore) 2020-08-01 12:14:49 +02:00
MichaelDvP 7ca593f374 enlarge json buffer to hold sensor and boiler values 2020-08-01 12:12:42 +02:00
MichaelDvP 931dc6dd18 Fix #441 2020-07-30 20:43:18 +02:00
MichaelDvP 01ce088791 update uart 2020-07-21 14:02:35 +02:00
MichaelDvP 40ac7bbf5b fix: mqtt subscriptions, web devcelist, roomcontrol replys after switchoff 2020-07-07 16:46:27 +02:00
MichaelDvP 6b3b97efe6 Merge branch 'v2_web' of https://github.com/proddy/EMS-ESP into web 2020-07-07 06:18:48 +02:00
MichaelDvP 37b35d395b ISM-values, typo in web 2020-07-07 06:16:42 +02:00
MichaelDvP 43b519f5ba Merge branch 'v2_web' of https://github.com/proddy/EMS-ESP into web 2020-07-06 14:46:45 +02:00
MichaelDvP 5261a42c30 no prompt in logging 2020-07-06 08:40:36 +02:00
MichaelDvP 909f292c75 uart fixed delay 2020-07-05 21:47:30 +02:00
MichaelDvP be0951b2c3 thermostat: add times for pause/party/holiday, validate typeids changed 2020-07-05 13:45:36 +02:00
MichaelDvP eb5ce5fb33 validate read to queue front 2020-07-05 13:40:15 +02:00
MichaelDvP 627807d57f sensor conversion time set to min 1 sec. 2020-07-05 13:37:34 +02:00
MichaelDvP d9fd27c22b esp32 uart tx-modes working 2020-07-03 10:32:10 +02:00
MichaelDvP 7d4d69ae62 Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 2020-07-03 09:54:00 +02:00
MichaelDvP 51e52846f0 mode settings, RC35 temperature factor, UART modes 2020-07-02 16:56:37 +02:00
MichaelDvP 1b00a4405b Junkers modes sorted. 2020-06-30 16:53:32 +02:00
MichaelDvP 876489494f Merge a30, fix summer/holidaymode, ww_mode in thermostat 2020-06-29 15:19:07 +02:00
MichaelDvP b45dc92159 publish thermostat wwMode 2020-06-27 14:57:01 +02:00
MichaelDvP e2eb5a61d4 Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 2020-06-27 14:42:43 +02:00
MichaelDvP 55da8a77d2 add wWSetTemp to boiller mqtt, add wwmode to thermostat 2020-06-27 14:42:30 +02:00
MichaelDvP 4b06a6dd13 Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 2020-06-26 05:59:46 +02:00
MichaelDvP c5ce22eb6e Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 2020-06-25 16:32:06 +02:00
MichaelDvP ad7de09a62 fix send_telegram TX_READ for EMS+ 2020-06-25 13:17:07 +02:00
MichaelDvP f32f4ad469 Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 2020-06-25 10:30:17 +02:00
MichaelDvP c644990c14 set first active hc for mqtt and terminal commands, some fixes for #410 2020-06-25 10:28:58 +02:00
MichaelDvP 1c73af88d2 fix fluctuating bitvalues, fix "send telegram", add solarpump softstart, add DHW temp for 9000i 2020-06-23 13:15:56 +02:00
MichaelDvP 28b2f6116e RC300 show only active hc, summermode and setpoint 2020-06-22 14:22:04 +02:00
MichaelDvP 5d6e9dd704 do not call shell while sending 2020-06-21 14:18:28 +02:00
MichaelDvP 76a5de4bf9 Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 2020-06-19 16:22:06 +02:00
MichaelDvP 5a189813ee new uartmode 5 to test 2020-06-19 08:36:29 +02:00
MichaelDvP 8ab319dcbb ems+ empty messages, Flags for solar modules, roomtemp from remote thermostats 2020-06-17 12:11:30 +02:00
MichaelDvP 57762845a4 Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 2020-06-17 12:09:08 +02:00
MichaelDvP f5f886b5ac mqtt faster out 2020-06-17 07:30:28 +02:00
MichaelDvP 2a09ff92f9 Merge and change uart timer modes to pause between bytes (5..50) 2020-06-16 14:19:23 +02:00
MichaelDvP 01de545b41 Timeout back to tx_mode 1 2020-06-16 07:55:21 +02:00
MichaelDvP 6737a48da6 uart changes and merge https://github.com/proddy/EMS-ESP 2020-06-15 18:58:54 +02:00
MichaelDvP 10607a9125 esp32 uart modes with delay included, but failed 2020-06-15 17:59:06 +02:00
MichaelDvP 8b6adf56ec uart fixes, no logging while tx sends 2020-06-15 16:14:29 +02:00
MichaelDvP d4a5686baa Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 2020-06-15 12:13:21 +02:00
MichaelDvP 6456cb7266 Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 2020-06-14 10:12:36 +02:00
MichaelDvP 11ac08c869 new tx modes with selectable delay 2020-06-14 08:37:24 +02:00
MichaelDvP b75eea44a1 Test new tx_mode 2, small changes to MM100, SM100 and RC300, see #397 2020-06-13 10:29:03 +02:00
MichaelDvP 359d6fbfde Merge proddy v2a14, remove tx start-timeout, yield in sensors for uart-task 2020-06-06 13:10:09 +02:00
MichaelDvP 5f29ad27d7 reset tx-retry-conter, increase receive priority 2020-06-05 08:34:41 +02:00
MichaelDvP d9da0bfdde Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 2020-06-04 14:38:41 +02:00
MichaelDvP 5e90d264bc add remote room controller, add mqtt-set for thermostat-settings 2020-06-04 14:35:39 +02:00
MichaelDvP be7445d024 Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 2020-06-03 18:14:15 +02:00
MichaelDvP 1ae7d24bd3 Boiler: sort values, delete doubles, thermostat: add mode to change temp 2020-06-03 12:51:08 +02:00
MichaelDvP 4247633850 don't wait in rx loop 2020-06-02 15:14:59 +02:00
MichaelDvP 3300f1e757 esp8266 uart with irq disabled 2020-06-02 14:01:35 +02:00
MichaelDvP ba08fb65ef Typos, version string 2020-06-01 14:39:59 +02:00
MichaelDvP 19abeb7456 Merge branch 'v2 a11' of https://github.com/proddy/EMS-ESP into v2 2020-05-31 14:07:17 +02:00
MichaelDvP f6854b8ad4 esp32 uart timing, RC35 thermostat mqtt enhancement, fix type_id display 2020-05-31 09:28:41 +02:00
MichaelDvP bf5172eefb Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 
esp32 uart
 2020-05-29 16:06:10 +02:00
MichaelDvP 348df3e96f uart and some small fixes 2020-05-29 12:20:26 +02:00
MichaelDvP f73c3b01d7 Merge branch 'v2'a9 of https://github.com/proddy/EMS-ESP into v2 2020-05-29 12:06:01 +02:00
MichaelDvP 5f1d6adaf5 Merge branch 'v2a8' of https://github.com/proddy/EMS-ESP into v2 2020-05-28 08:25:36 +02:00
MichaelDvP 55c60365f6 small change 2020-05-26 11:42:28 +02:00
MichaelDvP 91f8afd3b1 Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 2020-05-25 11:58:03 +02:00
MichaelDvP 4d5e512952 esp32 uart and wemos d1-mini32 2020-05-25 08:45:09 +02:00
MichaelDvP 0f2b4b27b9 add _setValue32() for energy-values 2020-04-27 13:38:13 +02:00
MichaelDvP d284a3c1b8 solar energy values changed to 32bit 2020-04-26 17:48:48 +02:00
MichaelDvP 0e750d44a0 mqtt temperature pushback, read seltemp on RC35, MM50 fix, use first found thermostat 2020-04-19 15:47:52 +02:00
MichaelDvP 4c6410d9ba rename RC20StatusMessage3 to RC20NStatusMessage 2020-04-09 11:08:04 +02:00
MichaelDvP 32e3e64b4a add bin-file 2020-04-09 09:56:09 +02:00
MichaelDvP ff1b45fd8b add new RC20 thermostat (messages 0xAD, 0xAE) 2020-04-09 09:52:14 +02:00
MichaelDvP 14e4c6f2a3 revert back subscription of only active heating circuits 2020-02-01 14:36:15 +01:00
MichaelDvP 875ca6e9ae Merge branch 'dev' of https://github.com/proddy/EMS-ESP.git into MM10 2020-01-29 08:16:47 +01:00
MichaelDvP 610b9525c7 Merge branch 'dev' of https://github.com/proddy/EMS-ESP.git into MM10 2020-01-29 08:16:25 +01:00
MichaelDvP 9ad6bbfadd Merge branch 'dev' of https://github.com/proddy/EMS-ESP.git into MM10 2020-01-20 15:16:53 +01:00
MichaelDvP e819d082d7 Namings 2020-01-20 15:01:25 +01:00
MichaelDvP b950cf8246 summery over last commitsto MM10 
- add MM200 warm water circuits (#299)
- add terminal boiler wwactive on/off command (#301)
- show first active thermostat hc in web (instead always 1)
- add log d [id] to show messages from/to specific ID (may replace log t and log s)
- add mixer version to info
- add warm water circulation active to terminal and mqtt
- mqtt subscribe only to active hc
- change NOTSET values for short/ushort and set the compare to level (match 0x7D00, 0x8000 and 0x8300 as notset)
- add calculated flow temperature to thermostat stats
 2020-01-18 19:12:53 +01:00
MichaelDvP 9343132820 Merge remote-tracking branch 'upstream/dev' into MM10 2020-01-13 10:25:42 +01:00
MichaelDvP 093df344e2 Test 2020-01-13 10:25:37 +01:00
MichaelDvP 0fb9019c51 Sync with upstream/dev 2020-01-12 18:41:53 +01:00
MichaelDvP db4fa83c3c merge with upstream/dev 2020-01-12 13:50:57 +01:00
MichaelDvP fc13004093 add mqtt-subscription for WWcirculation 2020-01-12 13:46:05 +01:00
MichaelDvP 041203936e Merge remote-tracking branch 'upstream/dev' into MM10 2020-01-12 09:59:51 +01:00
MichaelDvP 1c424d372f change command for WW-OneTime 2020-01-12 09:59:19 +01:00
MichaelDvP 4be2383ad8 Merge remote-tracking branch 'upstream/dev' into MM10 2020-01-09 10:22:36 +01:00
MichaelDvP 13e87bab97 Merge remote-tracking branch 'upstream/dev' into MM10 2020-01-05 10:49:07 +01:00
MichaelDvP 0537705924 Fix unknown device 2020-01-04 16:05:21 +01:00