Memory usage improvements

maidnl · maidnl · commit 56afeeb5c16d · 2023-05-09T10:59:54.000+02:00
Former-commit-id: 7a40ed3ae1c166ea6683c41f88b06a619436d779
diff --git a/src/CEspCommunication.cpp b/src/CEspCommunication.cpp
@@ -45,6 +45,12 @@ bool CEspCom::get_msg_from_esp(CMsg &msg) {
    return false;
 }
 
+/* -------------------------------------------------------------------------- */
+void CEspCom::clearFromEspQueue() {
+/* -------------------------------------------------------------------------- */   
+   CEspCom::from_ESP32_queue = {};
+}
+
 /* -------------------------------------------------------------------------- */
 bool CEspCom::send_msg_to_app(const uint8_t *buffer, uint16_t dim) {
 /* -------------------------------------------------------------------------- */  
@@ -79,6 +85,13 @@ bool CEspCom::get_msg_from_app(uint8_t *buffer, uint16_t dim) {
    return rv;
 }
 
+/* -------------------------------------------------------------------------- */
+void CEspCom::clearToEspQueue() {
+/* -------------------------------------------------------------------------- */
+   CEspCom::to_ESP32_queue = {};
+}
+
+
 /* -------------------------------------------------------------------------- */
 bool CEspCom::storeStationMsg(CMsg &msg) {
 /* -------------------------------------------------------------------------- */   
diff --git a/src/CEspCommunication.h b/src/CEspCommunication.h
@@ -66,6 +66,8 @@ class CEspCom {
 
    static void clearStationRx();
    static void clearSoftApRx();
+   static void clearFromEspQueue();
+   static void clearToEspQueue();
 
 };
 
diff --git a/src/CEspControl.cpp b/src/CEspControl.cpp
@@ -184,9 +184,14 @@ int CEspControl::process_msgs_received(CCtrlMsgWrapper* response) {
 /* -------------------------------------------------------------------------- */   
    int rv = ESP_CONTROL_EMPTY_RX_QUEUE;  
    CMsg msg;
+   bool res = false;
+   do {
    /* get the message */
    __disable_irq();
-   bool res = CEspCom::get_msg_from_esp(msg);
+   res = CEspCom::get_msg_from_esp(msg);
+   if(!res) {
+      CEspCom::clearFromEspQueue();
+   }
    __enable_irq();
    if(res) {
       
@@ -218,7 +223,10 @@ int CEspControl::process_msgs_received(CCtrlMsgWrapper* response) {
          }
          else {
             rv = process_ctrl_messages(msg, response); 
-         } 
+         }
+         if(rv == ESP_CONTROL_MSG_RX) {
+            break;
+         }
       }
       /* NETWORK_MESSAGES____________________________________________________ */
       else if(msg.get_if_type() == ESP_STA_IF) {
@@ -256,7 +264,7 @@ int CEspControl::process_msgs_received(CCtrlMsgWrapper* response) {
          
       }
    }
-   
+   } while(res);
    return rv;
 }
 
diff --git a/src/EspSpiDriver.cpp b/src/EspSpiDriver.cpp
@@ -302,6 +302,9 @@ bool esp_host_there_are_data_to_be_tx() {
    /* the function esp32_receive_msg_to_be_sent_on_SPI memset the tx buffer to 0 if there are no data to be tx*/
    __disable_irq();
    bool rv = CEspCom::get_msg_from_app((uint8_t*)esp32_spi_tx_buffer, MAX_SPI_BUFFER_SIZE);
+   if(!rv) {
+      CEspCom::clearToEspQueue();
+   }
    __enable_irq();
    #ifdef ESP_HOST_DEBUG_ENABLED_AVOID
    Serial.print("**** TX data? ");
