merged Tx Delay https://github.com/proddy/EMS-ESP/pull/113

CHANGELOG.md

@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Improved Tx code, by @Susis Strolch [(pull request 113)](https://github.com/proddy/EMS-ESP/pull/113). Use `set_txdelay 2`
+
 ## [1.7.0] 2019-05-11
 
 ### Added

src/ems.cpp

@@ -687,7 +687,7 @@ void _ems_readTelegram(uint8_t * telegram, uint8_t length) {
         _last_emsPollFrequency          = EMS_RxTelegram.timestamp;
 
         // check first for a Poll for us
-        if (value == (EMS_ID_ME | 0x80)) {
+        if ((value & 0x7F) == EMS_ID_ME) {
             EMS_Sys_Status.emsTxCapable = true;
 
             // do we have something to send thats waiting in the Tx queue?

src/emsuart.cpp

@@ -225,8 +225,7 @@ void ICACHE_FLASH_ATTR emsuart_tx_buffer(uint8_t * buf, uint8_t len) {
              * ° Break detected (bus collision) - not handled now...
              */
             for (uint8_t l = 0; l < 13; l++) {
-                if (((USS(EMSUART_UART) >> USRXC) & 0xFF) 
-                  || (U0IS & ((1 << UIFF) | (1 << UITO) | (1 << UIBD))))
+                if (((USS(EMSUART_UART) >> USRXC) & 0xFF) || (U0IS & ((1 << UIFF) | (1 << UITO) | (1 << UIBD))))
                     break;
                 delayMicroseconds(UART_BIT_TIME / 8); // ~13µs
             }

src/version.h

@@ -6,5 +6,5 @@
 #pragma once
 
 #define APP_NAME "EMS-ESP"
-#define APP_VERSION "1.8.0b1"
+#define APP_VERSION "1.8.0b2"
 #define APP_HOSTNAME "ems-esp"