Version 2.4.4-beta3

For testing purposes only!

Changes since 2.4.4-beta2:

fix: improve system stability (still a workaround)

.gitmodules

@@ -25,3 +25,6 @@ url=https://github.com/arjenhiemstra/FS_FilePrint
 [submodule "software/lib/Mongoose"]
 	path = software/lib/Mongoose
 	url = https://github.com/cesanta/mongoose.git
+[submodule "software/lib/Syslog"]
+	path = software/lib/Syslog
+	url = https://github.com/arcao/Syslog

compiled_firmware_files/firmware.json

@@ -9,14 +9,14 @@
         "2": {
             "latest_fw": "2.4.3",
             "link": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/hardware_rev_2/nrgitho-hw2-v2.4.3.bin",
-            "latest_beta_fw": "2.4.4-beta2",
-            "link_beta": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/hardware_rev_2/nrgitho-hw2-v2.4.4-beta2.bin"
+            "latest_beta_fw": "2.4.4-beta3",
+            "link_beta": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/hardware_rev_2/nrgitho-hw2-v2.4.4-beta3.bin"
         },
         "NON-CVE 1": {
             "latest_fw": "2.4.3",
             "link": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/non-cve_rev_1/nrgitho-noncve-v2.4.3.bin",
-            "latest_beta_fw": "2.4.4-beta2",
-            "link_beta": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/non-cve_rev_1/nrgitho-noncve-v2.4.4-beta2.bin"
+            "latest_beta_fw": "2.4.4-beta3",
+            "link_beta": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/non-cve_rev_1/nrgitho-noncve-v2.4.4-beta3.bin"
         }
     }
 }

software/NRG_itho_wifi/NRG_itho_wifi.ino

@@ -11,4 +11,7 @@
  * Choose partition scheme: Minimal SPIFFS (1.9 APP with OTA)
  * Compile the software
  *
+ * Warning: the web contents are build using a script that will not run from the Arduino IDE. 
+ * If you made changes to de html or js files you will need to make sure to include then manually or use PlatformIO to compile.
+ *
  */

software/NRG_itho_wifi/platformio.ini

@@ -15,7 +15,7 @@ default_envs =
 [env]
 ; Global data for all [env:***]
 build_flags =
-  -D VERSION=2.4.4-beta2
+  -D VERSION=2.4.4-beta3
 #upload_port = /dev/cu.usbserial-1420 #optional, only needed if PlatformIO autodetect is not working
 framework = arduino
 lib_ldf_mode = chain+
@@ -43,7 +43,7 @@ monitor_filters = esp32_exception_decoder
 extra_scripts = extra_script.py
 build_flags =
   -std=gnu++11
-  -Os  
+  -O0
   -DESP32
   ;-DESPRESSIF32_3_5_0_WIFI
   -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_NONE
@@ -72,6 +72,7 @@ build_flags =
   ${project_base.build_flags}
   ${env.build_flags}
   -DBETA
+  -DCVE
 board = esp32dev
 
 [env:beta_noncve]
@@ -80,6 +81,7 @@ build_flags =
   ${project_base.build_flags}
   ${env.build_flags}
   -DBETA
+  -DNON_CVE
 board = esp32dev
 
 [env:release_cve]
@@ -88,6 +90,7 @@ build_flags =
   ${project_base.build_flags}
   ${env.build_flags}
   -DSTABLE
+  -DCVE
 board = esp32dev
 
 [env:release_noncve]
@@ -96,6 +99,7 @@ build_flags =
   ${project_base.build_flags}
   ${env.build_flags}
   -DSTABLE
+  -DNON_CVE
 board = esp32dev
 
 [env:debug]

software/NRG_itho_wifi/src/notifyClients.cpp

@@ -44,8 +44,6 @@ void notifyClients(JsonObjectConst obj)
 void wsSendAll(void *arg, const char *message)
 {
   struct mg_mgr *mgr = (struct mg_mgr *)arg;
-  // Broadcast "hi" message to all connected websocket clients.
-  // Traverse over all connections
   for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next)
   {
     mg_ws_send(c, message, strlen(message), WEBSOCKET_OP_TEXT);

software/NRG_itho_wifi/src/sys_log.cpp

@@ -46,5 +46,7 @@ void sys_log(log_prio_level_t log_prio, const char *inputString, ...)
     return;
 
   input.code = log_prio;
-  xQueueSend(syslog_queue, (void *)&input, (TickType_t)100 == pdPASS);
+  // xQueueSendFromISR(syslog_queue, (void *)&input, (TickType_t)100 == pdPASS);
+  xQueueSend(syslog_queue, (void *)&input, (TickType_t)0);
+  // xQueueSendFromISR(syslog_queue, (void *)&input, NULL);
 }

software/NRG_itho_wifi/src/sys_log.h

@@ -22,7 +22,7 @@
 #include <FSFilePrint.h>
 #include <FS.h>
 #include <Syslog.h>
-#include <WifiUdp.h>
+#include "WiFiUdp.h"
 
 #ifdef ESPRESSIF32_3_5_0
 #include <LITTLEFS.h>

software/NRG_itho_wifi/src/task_init.cpp

@@ -13,7 +13,7 @@ void TaskInit(void *pvParameters)
 
   hardwareInit();
 
-  syslog_queue = xQueueCreate(20, sizeof(log_msg));
+  syslog_queue = xQueueCreate(30, sizeof(log_msg));
 
   if (i2c_sniffer_capable)
   {

software/NRG_itho_wifi/src/task_syscontrol.cpp

@@ -75,15 +75,14 @@ void work_i2c_queue()
         if (i2c_safe_guard_log)
         {
           i2c_safe_guard_log = false;
-          D_LOG("i2c_safe_guard blocked queue: start:%d > cur:%d < end:%d", i2c_safe_guard.start_close_time, cur_time, i2c_safe_guard.end_close_time);
-          log_mem_info(); //NOTE: Temp monitor get a sense of queue effect on mem
+          //D_LOG("i2c_safe_guard blocked queue: start:%d > cur:%d < end:%d", i2c_safe_guard.start_close_time, cur_time, i2c_safe_guard.end_close_time);
         }
         return;
       }
     }
     if (!i2c_safe_guard_log)
     {
-      D_LOG("i2c_safe_guard unblocked queue");
+      //D_LOG("i2c_safe_guard unblocked queue");
       i2c_safe_guard_log = true;
     }
     i2c_cmd_queue.front()(); //()() is there for a reason!

software/NRG_itho_wifi/src/task_web.cpp

@@ -23,8 +23,6 @@ bool webauth_ok = false;
 AsyncWebServer server(80);
 
 // locals
-Ticker DelayedReq;
-
 StaticTask_t xTaskWebBuffer;
 StackType_t xTaskWebStack[STACK_SIZE_LARGE];
 
@@ -92,7 +90,7 @@ void TaskWeb(void *pvParameters)
     yield();
     esp_task_wdt_reset();
 
-    TaskTimeout.once_ms(3000, []()
+    TaskTimeout.once_ms(10000, []()
                         { W_LOG("Warning: Task Web timed out!"); });
 
     execWebTasks();

software/NRG_itho_wifi/src/version.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#define FWVERSION "2.4.4-beta2"
+#define FWVERSION "2.4.4-beta3"