Merge a30, fix summer/holidaymode, ww_mode in thermostat

src/uart/emsuart_esp32.cpp

@@ -60,7 +60,7 @@ void EMSuart::emsuart_recvTask(void * para) {
 void IRAM_ATTR EMSuart::emsuart_rx_intr_handler(void * para) {
     static uint8_t rxbuf[EMS_MAXBUFFERSIZE];
     static uint8_t length;
-
+    UART_MUTEX_LOCK();
     if (EMS_UART.int_st.rxfifo_full) {
         EMS_UART.int_clr.rxfifo_full = 1;
         emsTxBufIdx++;
@@ -93,6 +93,7 @@ void IRAM_ATTR EMSuart::emsuart_rx_intr_handler(void * para) {
             xRingbufferSendFromISR(buf_handle, rxbuf, length - 1, &baseType);
         }
         drop_next_rx = false;
+        UART_MUTEX_UNLOCK();
     }
 }
 
@@ -101,16 +102,17 @@ void IRAM_ATTR EMSuart::emsuart_tx_timer_intr_handler() {
     if (emsTxBufIdx > EMS_MAXBUFFERSIZE) {
         return;
     }
-
+    UART_MUTEX_LOCK();
     emsTxBufIdx++;
-
     if (emsTxBufIdx < emsTxBufLen) {
         EMS_UART.fifo.rw_byte = emsTxBuf[emsTxBufIdx];
+        timerWrite(timer, 0);
         timerAlarmWrite(timer, emsTxWait, false);
         timerAlarmEnable(timer);
     } else if (emsTxBufIdx == emsTxBufLen) {
         EMS_UART.conf0.txd_brk = 1; // <brk> after send
     }
+    UART_MUTEX_UNLOCK();
 }
 
 /*
@@ -124,6 +126,7 @@ void EMSuart::start(uint8_t tx_mode) {
         return;
     }
     tx_mode_ = tx_mode;
+    UART_MUTEX_LOCK();
 
     uart_config_t uart_config = {
         .baud_rate = EMSUART_BAUD,
@@ -148,20 +151,24 @@ void EMSuart::start(uint8_t tx_mode) {
     emsTxBufLen = 0;
     timer       = timerBegin(1, 80, true);                             // timer prescale to 1 µs, countup
     timerAttachInterrupt(timer, &emsuart_tx_timer_intr_handler, true); // Timer with edge interrupt
+    UART_MUTEX_UNLOCK();
 }
 
 /*
  * Stop, disables interrupt
  */
 void EMSuart::stop() {
+    UART_MUTEX_LOCK();
     EMS_UART.int_ena.val = 0; // disable all intr.
                               // timerAlarmDisable(timer);
+    UART_MUTEX_UNLOCK();
 };
 
 /*
  * Restart Interrupt
  */
 void EMSuart::restart() {
+    UART_MUTEX_LOCK();
     if (EMS_UART.int_raw.brk_det) {
         EMS_UART.int_clr.brk_det = 1;    // clear flag
         drop_next_rx             = true; // and drop first frame
@@ -169,6 +176,7 @@ void EMSuart::restart() {
     EMS_UART.int_ena.brk_det = 1; // activate only break
     emsTxBufIdx              = 0;
     emsTxBufLen              = 0;
+    UART_MUTEX_UNLOCK();
 }
 
 /*
@@ -176,10 +184,12 @@ void EMSuart::restart() {
  */
 void EMSuart::send_poll(uint8_t data) {
     // if (tx_mode_ >= 6 || tx_mode_ < 4) { // modes 1, 2, 3 also here
+    UART_MUTEX_LOCK();
     if (tx_mode_ >= 5) {
         EMS_UART.fifo.rw_byte = data;
         emsTxBufIdx           = 0;
         emsTxBufLen           = 1;
+        timerWrite(timer, 0);
         timerAlarmWrite(timer, emsTxWait, false);
         timerAlarmEnable(timer);
     } else if (tx_mode_ == 5) {
@@ -212,6 +222,7 @@ void EMSuart::send_poll(uint8_t data) {
         }
         EMS_UART.conf0.txd_brk = 1; // <brk>
     }
+    UART_MUTEX_UNLOCK();
 }
 
 /*
@@ -223,6 +234,7 @@ uint16_t EMSuart::transmit(uint8_t * buf, uint8_t len) {
     if (len == 0 || len >= EMS_MAXBUFFERSIZE) {
         return EMS_TX_STATUS_ERR;
     }
+    UART_MUTEX_LOCK();
 
     // if (tx_mode_ >= 6 || tx_mode_ < 4) { // timer controlled modes, also modes 1, 2, 3 because delays not working
     if (tx_mode_ >= 5) { // timer controlled modes
@@ -232,8 +244,10 @@ uint16_t EMSuart::transmit(uint8_t * buf, uint8_t len) {
         EMS_UART.fifo.rw_byte = buf[0];
         emsTxBufIdx           = 0;
         emsTxBufLen           = len;
+        timerWrite(timer, 0);
         timerAlarmWrite(timer, emsTxWait, false);
         timerAlarmEnable(timer);
+        UART_MUTEX_UNLOCK();
         return EMS_TX_STATUS_OK;
     }
 
@@ -246,6 +260,7 @@ uint16_t EMSuart::transmit(uint8_t * buf, uint8_t len) {
         emsTxBufLen                      = len;
         EMS_UART.conf1.rxfifo_full_thrhd = 1;
         EMS_UART.int_ena.rxfifo_full     = 1;
+        UART_MUTEX_UNLOCK();
         return EMS_TX_STATUS_OK;
     }
 
@@ -254,6 +269,7 @@ uint16_t EMSuart::transmit(uint8_t * buf, uint8_t len) {
             EMS_UART.fifo.rw_byte = buf[i];
         }
         EMS_UART.conf0.txd_brk = 1; // <brk> after send
+        UART_MUTEX_UNLOCK();
         return EMS_TX_STATUS_OK;
     }
 
@@ -265,6 +281,7 @@ uint16_t EMSuart::transmit(uint8_t * buf, uint8_t len) {
         EMS_UART.conf0.txd_brk = 1; // <brk> after send, cleard by hardware after send
         // delayMicroseconds(EMSUART_TX_WAIT_BRK);
         // EMS_UART.conf0.txd_brk = 0;
+        UART_MUTEX_UNLOCK();
         return EMS_TX_STATUS_OK;
     }
 
@@ -276,6 +293,7 @@ uint16_t EMSuart::transmit(uint8_t * buf, uint8_t len) {
         EMS_UART.conf0.txd_brk = 1; // <brk> after send, cleard by hardware after send
         // delayMicroseconds(EMSUART_TX_WAIT_BRK);
         // EMS_UART.conf0.txd_brk = 0;
+        UART_MUTEX_UNLOCK();
         return EMS_TX_STATUS_OK;
     }
 
@@ -294,6 +312,7 @@ uint16_t EMSuart::transmit(uint8_t * buf, uint8_t len) {
     EMS_UART.conf0.txd_brk = 1; // <brk> after send, cleard by hardware after send
     // delayMicroseconds(EMSUART_TX_WAIT_BRK);
     // EMS_UART.conf0.txd_brk = 0;
+    UART_MUTEX_UNLOCK();
     return EMS_TX_STATUS_OK;
 }