updated and fixed charts

RotaxMonitor/src/main.cpp

@@ -52,7 +52,7 @@ void setup()
     IPAddress gateway(10, 11, 12, 1);
     IPAddress subnet(255, 255, 255, 0);
     WiFi.softAPConfig(local_IP, gateway, subnet);
-    WiFi.setTxPower(WIFI_POWER_5dBm); // reduce wifi power
+    WiFi.setTxPower(WIFI_POWER_13dBm); // reduce wifi power
     if (WiFi.softAP(WIFI_SSID, WIFI_PASSWORD))
     {
         LOG_INFO("WiFi AP Mode Started");
@@ -184,7 +184,7 @@ void loop()
         .rt_queue = nullptr,
         .dev = dev};
 
-    auto task_A = rtIgnitionTask(taskA_params, 4096, 256, CORE_1, fs_mutex);
+    auto task_A = rtIgnitionTask(taskA_params, 4096, 256, CORE_0, fs_mutex);
     delay(50);
     auto task_B = rtIgnitionTask(taskB_params, 4096, 256, CORE_1, fs_mutex);
 
@@ -211,34 +211,38 @@ void loop()
     led.setStatus(RGBled::LedStatus::OK);
 
     AstroWebServer webPage(80, LittleFS); // Initialize webserver and Websocket
-
-    task_A.onMessage([&webPage](ignitionBoxStatusFiltered sts){
-        ArduinoJson::JsonDocument doc;
-        doc["box_a"] = sts.toJson();
-        doc["box_b"] = ArduinoJson::JsonDocument();
-        webPage.sendWsData(doc.as<String>());
+    ArduinoJson::JsonDocument json_data;
+    bool data_a, data_b;
+    task_A.onMessage([&webPage, &json_data, &data_a](ignitionBoxStatusFiltered sts){
+        json_data["box_a"] = sts.toJson();
+        data_a = true;
     });
 
-    task_B.onMessage([&webPage](ignitionBoxStatusFiltered sts){
-        ArduinoJson::JsonDocument doc;
-        doc["box_a"] = ArduinoJson::JsonDocument();
-        doc["box_b"] = sts.toJson();
-        webPage.sendWsData(doc.as<String>());
+    task_B.onMessage([&webPage, &json_data, &data_b](ignitionBoxStatusFiltered sts){
+        json_data["box_b"] = sts.toJson();
+        data_b = true;
     });
 
-    task_A.enableSave(true, "ignitionA_test.csv");
-    task_B.enableSave(true, "ignitionB_test.csv");
+    // task_A.enableSave(true, "ignitionA_test.csv");
+    // task_B.enableSave(true, "ignitionB_test.csv");
 
-    uint32_t last_loop = millis();
+    uint32_t monitor_loop = millis();
+    uint32_t data_loop = monitor_loop;
     //////////////// INNER LOOP /////////////////////
     while (running)
     {
-        if ((millis() - last_loop) > 2000)
+        uint32_t this_loop = millis();
+        if (this_loop - monitor_loop > 2000)
         {
             clearScreen();
             printRunningTasksMod(Serial);
-            delay(100);
-            last_loop = millis();
+            monitor_loop = millis();
+        }
+        if ((data_a && data_b) || (this_loop - data_loop > 500)) {
+            webPage.sendWsData(json_data.as<String>());
+            json_data.clear();
+            data_a = data_b = false;
+            data_loop = millis();
         }
     } //////////////// INNER LOOP /////////////////////
 

RotaxMonitor/src/tasks.cpp

@@ -360,7 +360,7 @@ void rtIgnitionTask::run()
         m_info_filtered.update(m_last_status);
         (*m_active_history)[m_counter_status] = m_last_status;
 
-        if (m_on_message_cb && m_counter_status % 10)
+        if (m_on_message_cb && m_counter_status % 10 == 0)
         {
             m_on_message_cb(m_info_filtered);
         }

RotaxMonitor/src/webserver.cpp

@@ -1,10 +1,19 @@
 #include <webserver.h>
 #include <ArduinoJson.h>
 
-static const std::map<const std::string, AstroWebServer::c_commandEnum> s_webserverCommands = {
+static std::map<const std::string, AstroWebServer::c_commandEnum> s_webserverCommands = {
     {"setTime", AstroWebServer::SET_TIME},
 };
 
+void on_ping(TimerHandle_t xTimer)
+{
+    if (!xTimer)
+        return;
+    auto ws = (AsyncWebSocket *)pvTimerGetTimerID(xTimer);
+    ws->pingAll();
+    ws->cleanupClients();
+}
+
 AstroWebServer::AstroWebServer(const uint8_t port, fs::FS &filesystem) : m_port(port), m_webserver(AsyncWebServer(port)), m_websocket(AsyncWebSocket("/ws")), m_filesystem(filesystem)
 {
     LOG_DEBUG("Initializing Web Server");
@@ -20,11 +29,15 @@ AstroWebServer::AstroWebServer(const uint8_t port, fs::FS &filesystem) : m_port(
                    { onUploadHandler(request, filename, index, data, len, final); });
 
     m_webserver.begin();
+    m_websocket.enable(true);
+
+    m_pingTimer = xTimerCreate("wsPingTimer", pdMS_TO_TICKS(2000), pdTRUE, (void *)&m_websocket, on_ping);
     LOG_DEBUG("Webserver Init OK");
 }
 
 AstroWebServer::~AstroWebServer()
 {
+    xTimerDelete(m_pingTimer, pdMS_TO_TICKS(10));
     m_webserver.removeHandler(&m_websocket);
     m_webserver.end();
 }
@@ -47,6 +60,9 @@ void AstroWebServer::onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *cli
     case WS_EVT_DISCONNECT:
         LOG_DEBUG("WS client IP[", client->remoteIP().toString().c_str(), "]-ID[", client->id(), "] DISCONNECTED");
         break;
+    case WS_EVT_PONG:
+        LOG_DEBUG("WS client IP[", client->remoteIP().toString().c_str(), "]-ID[", client->id(), "] PONG");
+        break;
     case WS_EVT_DATA:
     {
         AwsFrameInfo *info = (AwsFrameInfo *)arg;

RotaxMonitor/src/webserver.h

@@ -38,6 +38,7 @@ private:
     AsyncWebSocket m_websocket;
     bool m_uploadFailed = false;
     fs::File m_uploadFile;
+    TimerHandle_t m_pingTimer = NULL;
 
 public:
     enum c_commandEnum