andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-10 17:59:53 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,436 Commits 5 Branches 25 Tags
876489494ff7abb521f0ada365fa90f084bc03ba
Commit Graph

53 Commits

Author SHA1 Message Date
MichaelDvP
876489494f Merge a30, fix summer/holidaymode, ww_mode in thermostat 2020-06-29 15:19:07 +02:00
proddy
f57f6b1095 minor text changes 2020-06-26 13:04:22 +02:00
proddy
ab295f06b6 fix for boilers/controllers clashing with same product_id. Don't overwrite brand if we already have one. 2020-06-25 16:12:04 +02:00
proddy
b5f13a040e removed comment 2020-06-22 21:02:35 +02:00
proddy
2fcf8d169f tx_mode resets counts 2020-06-22 16:32:19 +02:00
proddy
04503298ab fix retry bug 2020-06-20 11:27:31 +02:00
Proddy
05161e7a39 Merge pull request #402 from MichaelDvP/v2 
Uart mode 5
 2020-06-19 20:29:38 +02:00
proddy
e0a35066fc refactor tx retry 2020-06-19 20:27:21 +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
proddy
ee13a02409 cleaner handling of Tx retries for both READ and WRITE operations 2020-06-18 12:19:21 +02:00
proddy
ccd999bd6a also parse any messages going to a gateway/modem 2020-06-17 16:29:20 +02:00
MichaelDvP
2a09ff92f9 Merge and change uart timer modes to pause between bytes (5..50) 2020-06-16 14:19:23 +02:00
proddy
a710080c46 use log NOTICE for printing output from 'watch' command 2020-06-14 14:43:23 +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
proddy
56ffe76638 new command called 'watch'. telegrams are no longer shown in log debug 2020-06-13 15:47:29 +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
proddy
5888f7619b move test_data.h 2020-06-08 22:25:54 +02:00
proddy
19f0575c8b tx debug statements 2020-06-08 16:36:57 +02:00
proddy
3bd5be2de6 more commands in ems menu 2020-06-07 18:01:23 +02:00
proddy
34d782a58a consistent sorting of values in console 2020-06-06 21:42:51 +02:00
proddy
408b78fa34 in standalone mode, always go as SU/admin 2020-06-06 20:56:39 +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
proddy
a0b9ef2ba8 set commands under ems context only for ADMINs 2020-06-04 23:05:38 +02:00
proddy
6e2662fbbf text changes showing ems stats 2020-06-04 23:03:43 +02:00
proddy
e7f2d194ae clang style formatting 2020-06-04 22:22:36 +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
proddy
c619701137 show tx fails in ems sub-menu 2020-06-04 11:05:03 +02:00
proddy
a6549bc66d improve Tx retry code 2020-06-03 23:33:23 +02:00
proddy
b9e80ad5d8 merged with michael's changes - https://github.com/proddy/EMS-ESP/pull/393 2020-06-03 18:49:31 +02:00
MichaelDvP
be7445d024 Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 2020-06-03 18:14:15 +02:00
proddy
9d1f6b9479 fix typo 2020-06-03 17:31:27 +02:00
proddy
83c90dec08 start console before network, added delay to help telnet performance 2020-06-03 17:25:20 +02:00
MichaelDvP
1ae7d24bd3 Boiler: sort values, delete doubles, thermostat: add mode to change temp 2020-06-03 12:51:08 +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
Paul
cfeb1ce291 michael's updates 2020-05-30 14:13:24 +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
Paul
c976d330d2 change tx_mode without needing a restart 2020-05-28 23:40:47 +02:00
Paul
b4aca3bcb9 more updates 2020-05-28 23:17:25 +02:00
Paul
f807eac26a a9 - roll back uart changes for esp8266 2020-05-26 13:28:23 +02:00
Paul
69646c1a1c a8 2020-05-25 23:18:30 +02:00
Paul
d3953d90ca a7 2020-05-25 17:13:05 +02:00
Paul
b2bb8e2b5a a6 2020-05-23 14:00:14 +02:00
Paul
1ceef8afd5 esp32 support 2020-05-19 17:03:00 +02:00
Paul
be4f075663 alpha v4 2020-05-18 21:00:38 +02:00