Merge pull request #802 from IgorYbema/main

v4.0 - now good

Author: Egyras

HeishaMon/HeishaMon.ino

@@ -741,21 +741,25 @@ bool readSerial()
             log_message(_F("Extra data available on this heatpump"));
             extraDataBlockAvailable = true; //request for extra data next run
           }
+          #ifdef RAWDEBUG
           {
             char mqtt_topic[256];
             sprintf(mqtt_topic, "%s/raw/data", heishamonSettings.mqtt_topic_base);
             mqtt_client.publish(mqtt_topic, (const uint8_t *)actData, DATASIZE, false); //do not retain this raw data
           }
+          #endif
           data_length = 0;
           return true;
         } else if (data[3] == 0x21) { //decode the new model extra data block
           extraDataBlockAvailable = true; //set the flag to true so we know we can request this data always
           decode_heatpump_data_extra(data, actDataExtra, mqtt_client, log_message, heishamonSettings.mqtt_topic_base, heishamonSettings.updateAllTime);
+          #ifdef RAWDEBUG
           {
             char mqtt_topic[256];
             sprintf(mqtt_topic, "%s/raw/dataextra", heishamonSettings.mqtt_topic_base);
             mqtt_client.publish(mqtt_topic, (const uint8_t *)actDataExtra, DATASIZE, false); //do not retain this raw data
           }
+          #endif
           data_length = 0;
           return true;
         } else {
@@ -814,6 +818,7 @@ void pushCommandBuffer(byte* command, int length) {
 void serialTXTask(void *pvParameters) {
   unsigned long lastPCBSendTime = 0;
   unsigned long lastHPSendTime = 0;
+  unsigned long lastHPExtraSendTime = 0;
   unsigned long lastPCBSaveTime = 0;
   char local_log_msg[LOG_MSG_SIZE];
 
@@ -857,18 +862,26 @@ void serialTXTask(void *pvParameters) {
         byte chk = calcChecksum(panasonicQuery, PANASONICQUERYSIZE);
         heatpumpSerial.write(panasonicQuery, PANASONICQUERYSIZE);
         heatpumpSerial.write(chk);
-        if (extraDataBlockAvailable) {
-          panasonicQuery[3] = 0x21;
-          chk = calcChecksum(panasonicQuery, PANASONICQUERYSIZE);
-          heatpumpSerial.write(panasonicQuery, PANASONICQUERYSIZE);
-          heatpumpSerial.write(chk);
-          panasonicQuery[3] = 0x10;
-        }
-        sprintf_P(local_log_msg, PSTR("heatpump request datagram sent bytes: %d"), PANASONICQUERYSIZE + 1);
+        sprintf_P(local_log_msg, PSTR("heatpump request query sent bytes: %d"), PANASONICQUERYSIZE + 1);
         xQueueSend(logQueue,local_log_msg,0);    
       }
     }
 
+    // third priority: extra data block query every waitTime seconds (offset from basic query)
+    if ((!sending) && (!heishamonSettings.listenonly) && extraDataBlockAvailable) {
+      if ((unsigned long)(now - lastHPExtraSendTime) >= (1000 * heishamonSettings.waitTime)) {
+        lastHPExtraSendTime = now;
+        sending = true;
+        sendCommandReadTime = now;
+        panasonicQuery[3] = 0x21;
+        byte chk = calcChecksum(panasonicQuery, PANASONICQUERYSIZE);
+        heatpumpSerial.write(panasonicQuery, PANASONICQUERYSIZE);
+        heatpumpSerial.write(chk);
+        panasonicQuery[3] = 0x10;
+        xQueueSend(logQueue, (void*)"heatpump extra query sent", 0);
+      }
+    }    
+
     // lowest priority: user commands from queue
     if ((!sending) && (!heishamonSettings.listenonly)) {
       struct cmdbuffer_t cmd;

HeishaMon/src/common/webserver.cpp

@@ -945,18 +945,23 @@ int http_parse_multipart_body(struct webserver_t *client, unsigned char *buf, ui
                 client->readlen += (pos1+4);
                 client->substep = 7;  // skip case 5 entirely, go straight to data
             } else {
-                // Single \r\n - more headers follow, go to case 5
+                // Single \r\n - if more headers follow, go to case 5
                 ptr1 = strncasestr(&client->buffer[pos], "\r\n", client->ptr-pos);
                 if(ptr1 != NULL) {
-                    client->buffer[pos++] = '=';
-                    uint16_t pos1 = (ptr1-client->buffer);
-                    uint16_t newlen = client->ptr-((pos1+2)-pos);
-                    memmove(&client->buffer[pos], &client->buffer[pos1+2], newlen);
-                    client->ptr = newlen;
-                    client->readlen += (pos1+2);
-                    client->substep = 5;
-                } else {
-                    client->substep = 6;
+                    if (((ptr1-client->buffer) + 4) >= client->ptr) {
+                        //CRLF on end of buffer, wait for two more to make sure we are not at end of header
+					    loop = 0;
+                    } else {
+                        client->buffer[pos++] = '=';
+                        uint16_t pos1 = (ptr1-client->buffer);
+                        uint16_t newlen = client->ptr-((pos1+2)-pos);
+                        memmove(&client->buffer[pos], &client->buffer[pos1+2], newlen);
+                        client->ptr = newlen;
+                       client->readlen += (pos1+2);
+                        client->substep = 5;
+                    }
+                  } else {
+                      client->substep = 6;
                 }
             }
           } else {

binaries/model-type-large/HeishaMon.ino.esp32-v4.0.bin

@@ -1 +1 @@
-f0ad2f3ac41f38c7f20bb6e8f8892cb3
+c9d1bbed9e5b87789fc2978964940bba

…ge/HeishaMon.ino.esp32-v4.0-complete.bin …ge/HeishaMon.ino.esp32-v4.0.complete.binbinaries/model-type-large/HeishaMon.ino.esp32-v4.0-complete.bin renamed to binaries/model-type-large/HeishaMon.ino.esp32-v4.0.complete.bin binaries/model-type-large/HeishaMon.ino.esp32-v4.0-complete.bin renamed to binaries/model-type-large/HeishaMon.ino.esp32-v4.0.complete.bin

@@ -1 +1 @@
-a84f109434b184a117cf14f0975bbcf4
+c57c0ce91e8b0935c4a6abbcea421e70