clang formatting

src/devices/mixing.cpp

@@ -162,6 +162,9 @@ void Mixing::process_MMStatusMessage(std::shared_ptr<const Telegram> telegram) {
     telegram->read_value(flowSetTemp_, 0);
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+
 // Mixing on a MM10 - 0xAA
 // e.g. Thermostat -> Mixing Module, type 0xAA, telegram: 10 21 AA 00 FF 0C 0A 11 0A 32 xx
 void Mixing::process_MMConfigMessage(std::shared_ptr<const Telegram> telegram) {
@@ -177,4 +180,6 @@ void Mixing::process_MMSetMessage(std::shared_ptr<const Telegram> telegram) {
     // pos 1: position in %
 }
 
+#pragma GCC diagnostic pop
+
 } // namespace emsesp

src/devices/thermostat.cpp

@@ -816,8 +816,8 @@ void Thermostat::show_values(uuid::console::Shell & shell) {
 
     if (flags == EMS_DEVICE_FLAG_RC35) {
         print_value(shell, 2, F("Damped Outdoor temperature"), F_(degrees), Helpers::render_value(buffer, dampedoutdoortemp, 1));
-        print_value(shell, 2, F("Tempsensor 1"), F_(degrees), Helpers::render_value(buffer, tempsensor1, 10));
+        print_value(shell, 2, F("Temp sensor 1"), F_(degrees), Helpers::render_value(buffer, tempsensor1, 10));
-        print_value(shell, 2, F("Tempsensor 2"), F_(degrees), Helpers::render_value(buffer, tempsensor2, 10));
+        print_value(shell, 2, F("Temp sensor 2"), F_(degrees), Helpers::render_value(buffer, tempsensor2, 10));
     }
     if (flags == EMS_DEVICE_FLAG_RC30_1) {
         // settings parameters

src/helpers.h

@@ -29,7 +29,7 @@ class Helpers {
     static char *      hextoa(char * result, const uint8_t value);
     static std::string data_to_hex(const uint8_t * data, const uint8_t length);
 
-    static char *   render_value(char * result, const float value, const uint8_t format); // format is precision
+    static char *   render_value(char * result, const float value, const uint8_t format); // format is the precision
     static char *   render_value(char * result, const uint8_t value, const uint8_t format);
     static char *   render_value(char * result, const int8_t value, const uint8_t format);
     static char *   render_value(char * result, const uint16_t value, const uint8_t format);

src/roomcontrol.cpp

@@ -70,7 +70,7 @@ void Roomctrl::check(const uint8_t addr, const uint8_t * data) {
         return;
     }
     // reply to writes with write nack byte
-    if(addr & 0x80) { // it's a write to us
+    if (addr & 0x80) { // it's a write to us
         nack_write();  // we don't accept writes.
         return;
     }

src/roomcontrol.h

@@ -37,7 +37,6 @@ class Roomctrl {
     static void unknown(uint8_t addr, uint8_t dst, uint8_t type, uint8_t offset);
     static void temperature(uint8_t addr, uint8_t dst);
     static void nack_write();
-
 };
 
 } // namespace emsesp

src/uart/emsuart_esp32.cpp

@@ -105,9 +105,9 @@ void EMSuart::start(uint8_t tx_mode) {
         emsTxWait = EMSUART_BIT_TIME * 20;
     } else if (tx_mode == EMS_TXMODE_HT3) {
         emsTxWait = EMSUART_BIT_TIME * 17;
-    } else if(tx_mode > 10 ) {
+    } else if (tx_mode > 10) {
         emsTxWait = EMSUART_BIT_TIME * tx_mode;
-    } else if(tx_mode > 5 ) {
+    } else if (tx_mode > 5) {
         emsTxWait = EMSUART_BIT_TIME * tx_mode * 2;
     }
     if (tx_mode_ != 0xFF) { // uart already initialized

src/uart/emsuart_esp32.h

@@ -75,7 +75,6 @@ class EMSuart {
     static void           emsuart_recvTask(void * para);
     static void IRAM_ATTR emsuart_rx_intr_handler(void * para);
     static void IRAM_ATTR emsuart_tx_timer_intr_handler();
-
 };
 
 } // namespace emsesp

src/uart/emsuart_esp8266.cpp

@@ -31,7 +31,6 @@ os_event_t            recvTaskQueue[EMSUART_recvTaskQueueLen]; // our Rx queue
 EMSuart::EMSRxBuf_t * pEMSRxBuf;
 EMSuart::EMSRxBuf_t * paEMSRxBuf[EMS_MAXBUFFERS];
 uint8_t               emsRxBufIdx  = 0;
-uint8_t               phantomBreak = 0;
 uint8_t               tx_mode_     = 0xFF;
 bool                  drop_next_rx = true;
 uint32_t              emsRxTime;
@@ -40,7 +39,6 @@ uint8_t               emsTxBufIdx;
 uint8_t               emsTxBufLen;
 uint32_t              emsTxWait;
 
-
 //
 // Main interrupt handler
 // Important: must not use ICACHE_FLASH_ATTR
@@ -84,11 +82,6 @@ void ICACHE_FLASH_ATTR EMSuart::emsuart_recvTask(os_event_t * events) {
     uint8_t length        = pCurrent->length;                           // number of bytes including the BRK at the end
     pCurrent->length      = 0;
 
-    if (phantomBreak) {
-        phantomBreak = 0;
-        length--; // remove phantom break from Rx buffer
-    }
-
     // it's a poll or status code, single byte and ok to send on, then quit
     if (length == 2) {
         EMSESP::incoming_telegram((uint8_t *)pCurrent->buffer, 1);
@@ -209,7 +202,6 @@ void ICACHE_FLASH_ATTR EMSuart::start(uint8_t tx_mode) {
     ETS_UART_INTR_ATTACH(emsuart_rx_intr_handler, nullptr);
     ETS_UART_INTR_ENABLE();
     drop_next_rx = true;
-    // LOG_INFO(F("UART service for Rx/Tx started"));
 
     // for sending with large delay in EMS+ mode we use a timer interrupt
     timer1_attachInterrupt(emsuart_tx_timer_intr_handler); // Add ISR Function
@@ -244,7 +236,6 @@ void ICACHE_FLASH_ATTR EMSuart::restart() {
  * Which is a 11-bit set of zero's (11 cycles)
  */
 void ICACHE_FLASH_ATTR EMSuart::tx_brk() {
-
     // must make sure Tx FIFO is empty
     while (((USS(EMSUART_UART) >> USTXC) & 0xFF))
         ;
@@ -306,7 +297,7 @@ uint16_t ICACHE_FLASH_ATTR EMSuart::transmit(uint8_t * buf, uint8_t len) {
     // if ((uuid::get_uptime() - emsRxTime) > EMS_RX_TO_TX_TIMEOUT)) { // send allowed within 20 ms
     //      return EMS_TX_STATUS_ERR;
     // }
-    // reset tx-brk, just in case it is accidently set
+    // reset tx-brk, just in case it is accidentally set
     USC0(EMSUART_UART) &= ~(1 << UCBRK);
 
     // timer controlled modes with extra delay
@@ -322,7 +313,7 @@ uint16_t ICACHE_FLASH_ATTR EMSuart::transmit(uint8_t * buf, uint8_t len) {
     }
 
     // new code from Michael. See https://github.com/proddy/EMS-ESP/issues/380
-    if (tx_mode_ >= EMS_TXMODE_NEW) {
+    if (tx_mode_ >= EMS_TXMODE_NEW) { // tx_mode 4
         for (uint8_t i = 0; i < len; i++) {
             USF(EMSUART_UART) = buf[i];
         }
@@ -331,7 +322,7 @@ uint16_t ICACHE_FLASH_ATTR EMSuart::transmit(uint8_t * buf, uint8_t len) {
     }
 
     // EMS+ https://github.com/proddy/EMS-ESP/issues/23#
-    if (tx_mode_ == EMS_TXMODE_EMSPLUS) { // With extra tx delay for EMS+
+    if (tx_mode_ == EMS_TXMODE_EMSPLUS) { // tx_mode 2, with extra tx delay for EMS+
         for (uint8_t i = 0; i < len; i++) {
             USF(EMSUART_UART) = buf[i];
             delayMicroseconds(EMSUART_TX_BRK_WAIT); // 2070
@@ -341,7 +332,7 @@ uint16_t ICACHE_FLASH_ATTR EMSuart::transmit(uint8_t * buf, uint8_t len) {
     }
 
     // Junkers logic by @philrich
-    if (tx_mode_ == EMS_TXMODE_HT3) {
+    if (tx_mode_ == EMS_TXMODE_HT3) { // tx_mode 3
         for (uint8_t i = 0; i < len; i++) {
             USF(EMSUART_UART) = buf[i];
 
@@ -383,7 +374,6 @@ uint16_t ICACHE_FLASH_ATTR EMSuart::transmit(uint8_t * buf, uint8_t len) {
 
     // disable rx interrupt
     // clear Rx status register, resetting the Rx FIFO and flush it
-    // noInterrupts();
     ETS_UART_INTR_DISABLE();
     // USC0(EMSUART_UART) |= (1 << UCRXRST); // reset uart rx fifo
     emsuart_flush_fifos();
@@ -414,12 +404,8 @@ uint16_t ICACHE_FLASH_ATTR EMSuart::transmit(uint8_t * buf, uint8_t len) {
         }
 
         USC0(EMSUART_UART) &= ~(1 << UCBRK); // clear <BRK>
-        // USC0(EMSUART_UART) &= ~((1 << UCBRK) | (1 << UCLBE)); // disable loopback & clear <BRK>
-        // USIC(EMSUART_UART) = (1 << UIBD);                     // clear BRK detect IRQ
-        // phantomBreak       = 1;
     }
 
-    // interrupts();
     ETS_UART_INTR_ENABLE(); // open up the FIFO again to start receiving
 
     return EMS_TX_STATUS_OK; // send the Tx ok status back