Version 2.3.3

- Move the Mongoose for WebSocket server to fix stability issues and win10 WebSocket issues - Round hum and temp values to 1 decimal - clean-up includes, move to c++ libs
arjenhiemstra · Dec 5, 2021 · 36bbefc · 36bbefc
1 parent afbde58
commit 36bbefc
Show file tree

Hide file tree

Showing 40 changed files with 6,983 additions and 286 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -22,3 +22,6 @@ url=https://github.com/arjenhiemstra/FS_FilePrint
 [submodule "software/lib/ESPAsyncTCP"]
 	path = software/lib/ESPAsyncTCP
 	url = https://github.com/me-no-dev/ESPAsyncTCP
+[submodule "software/lib/Mongoose"]
+	path = software/lib/Mongoose
+	url = https://github.com/cesanta/mongoose.git
diff --git a/compiled_firmware_files/firmware.json b/compiled_firmware_files/firmware.json
@@ -5,12 +5,12 @@
       "link":"https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/hardware_rev_1/nrgitho-hw1-v2.2.1.bin"
     },
     "2": {
-      "latest_fw":"2.3.2",
-      "link":"https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/hardware_rev_2/nrgitho-hw2-v2.3.2.bin"
+      "latest_fw":"2.3.3",
+      "link":"https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/hardware_rev_2/nrgitho-hw2-v2.3.3.bin"
     },
     "NON-CVE 1": {
-      "latest_fw":"2.3.2",
-      "link":"https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/non-cve_rev_1/nrgitho-noncve-v2.3.2.bin"
+      "latest_fw":"2.3.3",
+      "link":"https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/non-cve_rev_1/nrgitho-noncve-v2.3.3.bin"
     }
   }
 }
diff --git a/compiled_firmware_files/hardware_rev_2/nrgitho-hw2-v2.3.3.bin b/compiled_firmware_files/hardware_rev_2/nrgitho-hw2-v2.3.3.bin
diff --git a/compiled_firmware_files/non-cve_rev_1/nrgitho-noncve-v2.3.3.bin b/compiled_firmware_files/non-cve_rev_1/nrgitho-noncve-v2.3.3.bin
diff --git a/software/NRG_itho_wifi/02_JS_UI.ino b/software/NRG_itho_wifi/02_JS_UI.ino
@@ -10,7 +10,7 @@ var sensor = -1;
 
 sessionStorage.setItem("statustimer", 0);
 
-var websocketServerLocation = 'ws://' + window.location.hostname + '/ws';
+var websocketServerLocation = 'ws://' + window.location.hostname + ':8000/ws';
 
 
 function startWebsock(websocketServerLocation){

diff --git a/software/NRG_itho_wifi/06_Websock_func.ino b/software/NRG_itho_wifi/06_Websock_func.ino
diff --git a/software/NRG_itho_wifi/09_init_code.ino b/software/NRG_itho_wifi/09_init_code.ino
@@ -10,7 +10,7 @@ void failSafeBoot() {
     yield();
 
     if (digitalRead(FAILSAVE_PIN) == HIGH) {
-
+      
       ACTIVE_FS.begin(true);
       ACTIVE_FS.format();
 
@@ -71,6 +71,7 @@ void failSafeBoot() {
       for (;;) {
         yield();
         if (shouldReboot) {
+          ACTIVE_FS.end();
           delay(1000);
           esp_task_wdt_init(1, true);
           esp_task_wdt_add(NULL);
@@ -487,8 +488,9 @@ void ArduinoOTAinit() {
 }
 
 void websocketInit() {
-  ws.onEvent(onWsEvent);
-  server.addHandler(&ws);
+  mg_log_set("0");
+  mg_mgr_init(&mgr);  // Initialise event manager
+  mg_http_listen(&mgr, s_listen_on_ws, wsEvent, NULL);  // Create WS listener
 }
 
 void webServerInit() {

diff --git a/software/NRG_itho_wifi/10_Gen_func.ino b/software/NRG_itho_wifi/10_Gen_func.ino
@@ -1,11 +1,11 @@
 void getIthoStatusJSON(JsonObject root) {
   if (SHT3x_original || SHT3x_alternative || itho_internal_hum_temp) {
-    root["temp"] = ithoTemp;
-    root["hum"] = ithoHum;
+    root["temp"] = static_cast<int>(ithoTemp * 10 + 0.5) / 10.0;
+    root["hum"] = static_cast<int>(ithoHum * 10 + 0.5) / 10.0;
 
     auto b = 611.21 * pow(2.7183, ((18.678 - ithoTemp / 234.5) * ithoTemp) / (257.14 + ithoTemp));
     auto ppmw = b / (101325 - b) * ithoHum / 100 * 0.62145 * 1000000;
-    root["ppmw"] = (int)(ppmw+0.5);
+    root["ppmw"] = static_cast<int>(ppmw+0.5);
   }
 
   if (!ithoInternalMeasurements.empty()) {

diff --git a/software/NRG_itho_wifi/CC1101.h b/software/NRG_itho_wifi/CC1101.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <stdio.h>
+#include <cstdio>
 #include "CC1101Packet.h"
 #include <SPI.h>
 // On Arduino, SPI pins are predefined

diff --git a/software/NRG_itho_wifi/CC1101Packet.h b/software/NRG_itho_wifi/CC1101Packet.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <stdio.h>
+#include <cstdio>
 #include <Arduino.h>
 
 #define CC1101_BUFFER_LEN        64

diff --git a/software/NRG_itho_wifi/IthoCC1101.cpp b/software/NRG_itho_wifi/IthoCC1101.cpp
@@ -17,7 +17,7 @@
 
 #include "IthoCC1101.h"
 #include "IthoPacket.h"
-#include <string.h>
+#include <string>
 #include <Arduino.h>
 #include <SPI.h>
 

diff --git a/software/NRG_itho_wifi/IthoCC1101.h b/software/NRG_itho_wifi/IthoCC1101.h
@@ -4,11 +4,15 @@
 
 #pragma once
 
-#include <stdio.h>
+#include <cstdio>
+#include <string>
+
+#include <Ticker.h>
+
 #include "CC1101.h"
 #include "IthoPacket.h"
-#include <Ticker.h>
-#include <string>
+
+
 
 #define MAX_NUMBER_OF_REMOTES 10
 

diff --git a/software/NRG_itho_wifi/IthoPacket.h b/software/NRG_itho_wifi/IthoPacket.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 enum IthoCommand
 {

diff --git a/software/NRG_itho_wifi/IthoQueue.cpp b/software/NRG_itho_wifi/IthoQueue.cpp
@@ -1,6 +1,8 @@
-#include "IthoQueue.h"
 #include <algorithm>
 
+#include "IthoQueue.h"
+
+
 
 // default constructor
 IthoQueue::IthoQueue() {

diff --git a/software/NRG_itho_wifi/IthoQueue.h b/software/NRG_itho_wifi/IthoQueue.h
@@ -3,10 +3,10 @@
 #define MAX_QUEUE 10
 #define QUEUE_UPDATE_MS 100
 
-
 #include <algorithm>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <string>
+
 #include <Arduino.h>
 #include <ArduinoJson.h>
 #include <Ticker.h>

diff --git a/software/NRG_itho_wifi/IthoRemote.cpp b/software/NRG_itho_wifi/IthoRemote.cpp
@@ -1,6 +1,6 @@
 #include "IthoRemote.h"
 
-#include <string.h>
+#include <string>
 #include <Arduino.h>
 
 

diff --git a/software/NRG_itho_wifi/IthoRemote.h b/software/NRG_itho_wifi/IthoRemote.h
@@ -3,11 +3,13 @@
 #define MAX_NUMBER_OF_REMOTES 10
 #define REMOTE_CONFIG_VERSION "002"
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <string>
+
 #include <Arduino.h>
 #include <ArduinoJson.h>
 #include <Ticker.h>
+
 #include "IthoPacket.h"
 
 class IthoRemote {

diff --git a/software/NRG_itho_wifi/IthoSystem.cpp b/software/NRG_itho_wifi/IthoSystem.cpp
@@ -128,7 +128,7 @@ int getSettingsLength(const uint8_t deviceID, const uint8_t version) {
       }
 
       for (int i = 0; i < 999; i++) {
-        if ((int) * (*(ithoDevicesptr->settingsMapping + version) + i) == 999) {
+        if (static_cast<int>( * (*(ithoDevicesptr->settingsMapping + version) + i) == 999 )) {
           //end of array
           if (ithoSettingsArray == nullptr) ithoSettingsArray = new ithoSettings[i];
           return i;
@@ -156,7 +156,7 @@ void getSetting(const uint8_t i, const bool updateState, const bool updateweb, c
   JsonObject root = doc.to<JsonObject>();
 
   root["Index"] = i;
-  root["Description"] = settingsPtr->settingsDescriptions[(int) * (*(settingsPtr->settingsMapping + version) + i)];
+  root["Description"] = settingsPtr->settingsDescriptions[static_cast<int>( * (*(settingsPtr->settingsMapping + version) + i ))];
 
   if (!updateState && !updateweb) {
     root["update"] = false;
@@ -250,7 +250,7 @@ int getStatusLabelLength(const uint8_t deviceID, const uint8_t version) {
       }
 
       for (int i = 0; i < 255; i++) {
-        if ((int) * (*(ithoDevicesptr->statusLabelMapping + version) + i) == 255) {
+        if (static_cast<int>( * (*(ithoDevicesptr->statusLabelMapping + version) + i) == 255 )) {
           //end of array
           return i;
         }
@@ -297,10 +297,10 @@ const char* getSatusLabel(const uint8_t i, const struct ihtoDeviceType* statusPt
   }
   else {
     if (systemConfig.api_normalize == 0) {
-      return (statusPtr->settingsStatusLabels[(int) * (*(statusPtr->statusLabelMapping + version) + i)].labelFull);
+      return (statusPtr->settingsStatusLabels[static_cast<int>( * (*(statusPtr->statusLabelMapping + version) + i) )].labelFull);
     }
     else {
-      return (statusPtr->settingsStatusLabels[(int) * (*(statusPtr->statusLabelMapping + version) + i)].labelNormalized);
+      return (statusPtr->settingsStatusLabels[static_cast<int>( * (*(statusPtr->statusLabelMapping + version) + i) )].labelNormalized);
     }
   }
 

diff --git a/software/NRG_itho_wifi/IthoSystem.h b/software/NRG_itho_wifi/IthoSystem.h
@@ -1,14 +1,15 @@
 #pragma once
 
-#include <stdio.h>
+#include <cstdio>
 #include <string>
+#include <cstring>
 #include <vector>
 #include <map>
-#include <cstring>
+
 #include <Arduino.h>
 #include <Ticker.h>
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
 
 extern uint8_t ithoDeviceID;
 extern uint8_t itho_fwversion;

diff --git a/software/NRG_itho_wifi/NRG_itho_wifi.ino b/software/NRG_itho_wifi/NRG_itho_wifi.ino
@@ -1,4 +1,4 @@
-#define FWVERSION "2.3.2"
+#define FWVERSION "2.3.3"
 
 #define LOGGING_INTERVAL 21600000  //Log system status at regular intervals
 #define ENABLE_FAILSAVE_BOOT
@@ -50,6 +50,7 @@
 #include <time.h>
 #include <Ticker.h>
 #include <string>
+#include <cstring>
 
 #include "IthoQueue.h"
 #include "System.h"
@@ -68,8 +69,8 @@
 #include "esp_wifi.h"
 #include <ESPmDNS.h>
 #include <AsyncTCP.h>
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
 #include "esp_task_wdt.h"
 #include "IthoCC1101.h"   // Largly based on and thanks to https://github.com/supersjimmie/IthoEcoFanRFT
 #include "IthoPacket.h"   // Largly based on and thanks to https://github.com/supersjimmie/IthoEcoFanRFT
@@ -169,6 +170,7 @@ unsigned long wifiLedUpdate = 0;
 unsigned long SHT3x_readout = 0;
 unsigned long query2401tim = 0;
 unsigned long lastLog = 0;
+unsigned long lastVersionCheck;
 
 //flags used
 bool joinSend = false;

diff --git a/software/NRG_itho_wifi/SHTSensor.cpp b/software/NRG_itho_wifi/SHTSensor.cpp
@@ -26,7 +26,8 @@
  *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <inttypes.h>
+#include <cinttypes>
+
 #include <Wire.h>
 #include <Arduino.h>
 

diff --git a/software/NRG_itho_wifi/SHTSensor.h b/software/NRG_itho_wifi/SHTSensor.h
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <inttypes.h>
+#include <cinttypes>
 
 // Forward declaration
 class SHTSensorDriver;

diff --git a/software/NRG_itho_wifi/SystemConfig.cpp b/software/NRG_itho_wifi/SystemConfig.cpp
@@ -1,7 +1,9 @@
-#include "SystemConfig.h"
-#include <string.h>
+#include <string>
+
 #include <Arduino.h>
 
+#include "SystemConfig.h"
+
 SystemConfig systemConfig;
 
 // default constructor

diff --git a/software/NRG_itho_wifi/SystemConfig.h b/software/NRG_itho_wifi/SystemConfig.h
@@ -2,8 +2,9 @@
 
 #define CONFIG_VERSION "005" //Change when SystemConfig struc changes
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <string>
+
 #include <Arduino.h>
 #include <ArduinoJson.h>
 

diff --git a/software/NRG_itho_wifi/TaskCC1101.ino b/software/NRG_itho_wifi/TaskCC1101.ino
@@ -174,6 +174,8 @@ void TaskCC1101( void * pvParameters ) {
     reboot.attach(2, []() {
       logInput("Setup: init of CC1101 RF module failed");
       saveSystemConfig();
+      delay(1000);
+      ACTIVE_FS.end();
       esp_task_wdt_init(1, true);
       esp_task_wdt_add(NULL);
       while (true);

diff --git a/software/NRG_itho_wifi/TaskMQTT.ino b/software/NRG_itho_wifi/TaskMQTT.ino
@@ -227,7 +227,7 @@ void mqttCallback(const char* topic, const byte* payload, unsigned int length) {
   if (length > 1023) length = 1023;
 
   char s_payload[length];
-  memcpy(s_payload, payload, length);
+  std::memcpy(s_payload, payload, length);
   s_payload[length] = '\0';
 
   if (strcmp(topic, systemConfig.mqtt_cmd_topic) == 0) {

diff --git a/software/NRG_itho_wifi/TaskSysControl.ino b/software/NRG_itho_wifi/TaskSysControl.ino
@@ -43,6 +43,8 @@ void TaskSysControl( void * pvParameters ) {
       if (!dontSaveConfig) {
         saveSystemConfig();
       }
+      delay(1000);
+      ACTIVE_FS.end();
       esp_task_wdt_init(1, true);
       esp_task_wdt_add(NULL);
       while (true);
@@ -160,6 +162,13 @@ void execSystemControlTasks() {
     }
 
   }
+  if (!(itho_fwversion > 0) && millis() - lastVersionCheck > 60000) {
+    lastVersionCheck = millis();
+    if (xSemaphoreTake(mutexI2Ctask, (TickType_t) 1000 / portTICK_PERIOD_MS) == pdTRUE) {
+      sendQueryDevicetype(i2c_result_updateweb);
+      xSemaphoreGive(mutexI2Ctask);
+    }
+  }
   //request itho status every 5 sec.
   if (millis() - query2401tim >= systemConfig.itho_updatefreq * 1000UL && i2cStartCommands) {
     query2401tim = millis();

diff --git a/software/NRG_itho_wifi/TaskWeb.ino b/software/NRG_itho_wifi/TaskWeb.ino
@@ -40,14 +40,15 @@ void TaskWeb( void * pvParameters ) {
     TaskWebHWmark = uxTaskGetStackHighWaterMark( NULL );
     vTaskDelay(25 / portTICK_PERIOD_MS);
   }
-
+  mg_mgr_free(&mgr);
   //else delete task
   vTaskDelete( NULL );
 }
 
 void execWebTasks() {
   ArduinoOTA.handle();
-  ws.cleanupClients();
+  //ws.cleanupClients();
+  mg_mgr_poll(&mgr, 1000);
   if (millis() - previousUpdate >= 5000 || sysStatReq) {
     if (millis() - lastSysMessage >= 1000 && !onOTA) { //rate limit messages to once a second
       sysStatReq = false;

diff --git a/software/NRG_itho_wifi/WifiConfig.cpp b/software/NRG_itho_wifi/WifiConfig.cpp
@@ -1,7 +1,9 @@
-#include "WifiConfig.h"
-#include <string.h>
+#include <string>
+
 #include <Arduino.h>
 
+#include "WifiConfig.h"
+
 
 // default constructor
 WifiConfig::WifiConfig() {