andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 16:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,609 Commits 5 Branches 25 Tags
b062f30bddb77524b29a4dfcfe566eb4e0c5475d
Commit Graph

50 Commits

Author SHA1 Message Date
proddy
b062f30bdd tx_mode optimizations 2020-07-27 18:56:24 +02:00
proddy
7109bb0d62 merge in Michael's change from v2_uart branch 2020-07-26 21:40:56 +02:00
proddy
90d33259f2 tidy up how EMS bus line state is handled 2020-07-26 20:29:30 +02:00
proddy
840eff4443 removed DEBUG, which caused a crash when compiled with EMSESP_DEBUG flag 2020-07-20 15:56:36 +02:00
proddy
0766c51a74 Merge remote-tracking branch 'origin/v2_web' into v2 2020-07-17 20:10:27 +02:00
MichaelDvP
40ac7bbf5b fix: mqtt subscriptions, web devcelist, roomcontrol replys after switchoff 2020-07-07 16:46:27 +02:00
proddy
c5933e8c14 initial commit 2020-07-05 18:29:08 +02:00
MichaelDvP
eb5ce5fb33 validate read to queue front 2020-07-05 13:40:15 +02:00
MichaelDvP
1b00a4405b Junkers modes sorted. 2020-06-30 16:53:32 +02:00
proddy
f57f6b1095 minor text changes 2020-06-26 13:04:22 +02:00
proddy
466c1ddb15 added more consts, merged Michael's fix for sending EMS+ Tx 2020-06-25 16:11:08 +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
Proddy
9566f86ac9 Merge pull request #405 from MichaelDvP/v2 
do not call shell while sending
 2020-06-21 18:00:43 +02:00
proddy
e1269bcb31 refactor read_value. added read_bitvalue 2020-06-21 16:02:37 +02:00
MichaelDvP
5d6e9dd704 do not call shell while sending 2020-06-21 14:18:28 +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
cf8404be86 refactor tx retry 2020-06-19 20:26:58 +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
64e5f93854 improved EMS+ telegram parsing to typeids for F7&F9 2020-06-17 16:28:26 +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
8b6adf56ec uart fixes, no logging while tx sends 2020-06-15 16:14:29 +02:00
proddy
9e84fefed6 code cleanup 2020-06-15 15:00:06 +02:00
MichaelDvP
d4a5686baa Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 2020-06-15 12:13:21 +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
10b6682842 fixed type_id for EMS+, cleaned up code, added watch, added option for Tx at top of queue 2020-06-13 15:49:38 +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
44d4160621 fix tracing in raw mode 2020-06-08 22:27:18 +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
c619701137 show tx fails in ems sub-menu 2020-06-04 11:05:03 +02:00
proddy
0d787d56f8 added poll ack after we get a poll request in Tx 2020-06-03 23:32:03 +02:00
MichaelDvP
4247633850 don't wait in rx loop 2020-06-02 15:14: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
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
b4aca3bcb9 more updates 2020-05-28 23:17:25 +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
Paul
69646c1a1c a8 2020-05-25 23:18:30 +02:00
Paul
d3953d90ca a7 2020-05-25 17:13:05 +02:00
Paul
be4f075663 alpha v4 2020-05-18 21:00:38 +02:00
Paul
3801042ea5 alpha 0.2 - add solar, mixing, heatpump 2020-05-11 23:00:53 +02:00
Paul
30b502a1e4 initial commit 2020-05-08 16:04:53 +02:00