andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

spelling checks

Browse Source
This commit is contained in:
Paul
2019-12-30 14:47:23 +01:00
parent f0c7b954a5
commit b64c35732e
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MyESP.cpp
View File

@@ -524,7 +524,7 @@ void MyESP::_wifi_setup() {
WiFi.setSleepMode(WIFI_NONE_SLEEP); // added to possibly fix wifi dropouts in arduino core 2.5.0 WiFi.setSleepMode(WIFI_NONE_SLEEP); // added to possibly fix wifi dropouts in arduino core 2.5.0
// ref: https://github.com/esp8266/Arduino/issues/6471 // ref: https://github.com/esp8266/Arduino/issues/6471
// ref: https://github.com/esp8266/Arduino/issues/6366 // ref: https://github.com/esp8266/Arduino/issues/6366
// high tx power causing weird behavior, slighly lowering from 20.5 to 20.0 may help stability // high tx power causing weird behavior, slightly lowering from 20.5 to 20.0 may help stability
WiFi.setOutputPower(20.0); // in DBM WiFi.setOutputPower(20.0); // in DBM
#endif #endif

42
src/emsuart.cpp
View File

@@ -224,27 +224,27 @@ _EMS_TX_STATUS ICACHE_FLASH_ATTR emsuart_tx_buffer(uint8_t * buf, uint8_t len) {
} }
emsuart_tx_brk(); // send <BRK> emsuart_tx_brk(); // send <BRK>
} else if (EMS_Sys_Status.emsTxMode == EMS_TXMODE_DEFAULT) { } else if (EMS_Sys_Status.emsTxMode == EMS_TXMODE_DEFAULT) {
/* /*
* based on code from https://github.com/proddy/EMS-ESP/issues/103 by @susisstrolch * based on code from https://github.com/proddy/EMS-ESP/issues/103 by @susisstrolch
* we emit the whole telegram, with Rx interrupt disabled, collecting busmaster response in FIFO. * we emit the whole telegram, with Rx interrupt disabled, collecting busmaster response in FIFO.
* after sending the last char we poll the Rx status until either * after sending the last char we poll the Rx status until either
* - size(Rx FIFO) == size(Tx-Telegram) * - size(Rx FIFO) == size(Tx-Telegram)
* - <BRK> is detected * - <BRK> is detected
* At end of receive we re-enable Rx-INT and send a Tx-BRK in loopback mode. * At end of receive we re-enable Rx-INT and send a Tx-BRK in loopback mode.
* *
* EMS-Bus error handling * EMS-Bus error handling
* 1. Busmaster stops echoing on Tx w/o permission * 1. Busmaster stops echoing on Tx w/o permission
* 2. Busmaster cancel telegram by sending a BRK * 2. Busmaster cancel telegram by sending a BRK
* *
* Case 1. is handled by a watchdog counter which is reset on each * Case 1. is handled by a watchdog counter which is reset on each
* Tx attempt. The timeout should be 20x EMSUART_BIT_TIME plus * Tx attempt. The timeout should be 20x EMSUART_BIT_TIME plus
* some smart guess for processing time on targeted EMS device. * some smart guess for processing time on targeted EMS device.
* We set EMS_Sys_Status.emsTxStatus to EMS_TX_WTD_TIMEOUT and return * We set EMS_Sys_Status.emsTxStatus to EMS_TX_WTD_TIMEOUT and return
* *
* Case 2. is handled via a BRK chk during transmission. * Case 2. is handled via a BRK chk during transmission.
* We set EMS_Sys_Status.emsTxStatus to EMS_TX_BRK_DETECT and return * We set EMS_Sys_Status.emsTxStatus to EMS_TX_BRK_DETECT and return
* *
*/ */
uint16_t wdc = EMS_TX_TO_COUNT; uint16_t wdc = EMS_TX_TO_COUNT;
ETS_UART_INTR_DISABLE(); // disable rx interrupt ETS_UART_INTR_DISABLE(); // disable rx interrupt