Initial commit

include/GatewayClient.h

@@ -10,6 +10,8 @@
 #include <string_view>
 #include <unordered_map>
 
+#include <freertos/task.h>
+
 namespace OpenShock {
   class GatewayClient {
     DISABLE_COPY(GatewayClient);
@@ -27,14 +29,14 @@ namespace OpenShock {
     bool sendMessageTXT(std::string_view data);
     bool sendMessageBIN(const uint8_t* data, std::size_t length);
 
-    bool loop();
-
   private:
+    void _loop();
     void _setState(GatewayClientState state);
     void _sendBootStatus();
     void _handleEvent(WStype_t type, uint8_t* payload, std::size_t length);
 
     WebSocketsClient m_webSocket;
     GatewayClientState m_state;
+    TaskHandle_t m_loopTask;
   };
 }  // namespace OpenShock

include/GatewayConnectionManager.h

@@ -17,6 +17,4 @@ namespace OpenShock::GatewayConnectionManager {
 
   bool SendMessageTXT(std::string_view data);
   bool SendMessageBIN(const uint8_t* data, std::size_t length);
-
-  void Update();
 }  // namespace OpenShock::GatewayConnectionManager

src/GatewayClient.cpp

@@ -1,3 +1,5 @@
+#include <freertos/FreeRTOS.h>
+
 #include "GatewayClient.h"
 
 const char* const TAG = "GatewayClient";
@@ -11,6 +13,8 @@ const char* const TAG = "GatewayClient";
 #include "serialization/WSGateway.h"
 #include "Time.h"
 #include "util/CertificateUtils.h"
+#include "util/FnProxy.h"
+#include "util/TaskUtils.h"
 #include "VisualStateManager.h"
 
 using namespace OpenShock;
@@ -20,6 +24,7 @@ static bool s_bootStatusSent = false;
 GatewayClient::GatewayClient(const std::string& authToken)
   : m_webSocket()
   , m_state(GatewayClientState::Disconnected)
+  , m_loopTask(nullptr)
 {
   OS_LOGD(TAG, "Creating GatewayClient");
 
@@ -36,6 +41,9 @@ GatewayClient::~GatewayClient()
   _setState(GatewayClientState::Disconnected);
 
   OS_LOGD(TAG, "Destroying GatewayClient");
+  if (m_loopTask != nullptr) {
+    vTaskDelete(m_loopTask);
+  }
   m_webSocket.disconnect();
 }
 
@@ -45,6 +53,17 @@ void GatewayClient::connect(const char* lcgFqdn)
     return;
   }
 
+  if (m_loopTask != nullptr) {
+    vTaskDelete(m_loopTask);
+  }
+
+  esp_err_t err;
+  err = TaskUtils::TaskCreateExpensive(&Util::FnProxy<&GatewayClient::_loop>, "GatewayClientLoop", 8192, this, 1, &m_loopTask); // TODO: Profile stack size
+  if (err != ESP_OK) {
+    OS_LOGE(TAG, "Failed to create GatewayClient loop task: %s", esp_err_to_name(err));
+    return;
+  }
+
   _setState(GatewayClientState::Connecting);
 
 //
@@ -91,21 +110,15 @@ bool GatewayClient::sendMessageBIN(const uint8_t* data, std::size_t length)
   return m_webSocket.sendBIN(data, length);
 }
 
-bool GatewayClient::loop()
+void GatewayClient::_loop()
 {
-  if (m_state == GatewayClientState::Disconnected) {
-    return false;
-  }
-
-  m_webSocket.loop();
-
-  // We are still in the process of connecting or disconnecting
-  if (m_state != GatewayClientState::Connected) {
-    // return true to indicate that we are still busy
-    return true;
+  while (m_state != GatewayClientState::Disconnected) {
+    m_webSocket.loop();
+    vTaskDelay(pdMS_TO_TICKS(10));  // 100 Hz update rate
   }
 
-  return true;
+  m_loopTask = nullptr;  // Clear the task handle
+  vTaskDelete(nullptr);  // Delete the task
 }
 
 void GatewayClient::_setState(GatewayClientState state)

src/main.cpp

@@ -111,20 +111,8 @@ void setup()
   }
 }
 
-void main_app(void* arg)
-{
-  while (true) {
-    OpenShock::GatewayConnectionManager::Update();
-
-    vTaskDelay(5);  // 5 ticks update interval
-  }
-}
-
 void loop()
 {
-  // Start the main task
-  OpenShock::TaskUtils::TaskCreateExpensive(main_app, "main_app", 8192, nullptr, 1, nullptr);  // PROFILED: 6KB stack usage
-
   // Kill the loop task (Arduino is stinky)
   vTaskDelete(nullptr);
 }