Improvements and refactors after CR, add option to modify mdns name and simplify setup tool

components/SerialManager/SerialManager/SerialManager.cpp

@@ -4,8 +4,9 @@
 
 #define BUF_SIZE (1024)
 
-SerialManager::SerialManager(std::shared_ptr<CommandManager> commandManager, esp_timer_handle_t *timerHandle, std::shared_ptr<ProjectConfig> deviceConfig) 
-  : commandManager(commandManager), timerHandle(timerHandle), deviceConfig(deviceConfig) {
+SerialManager::SerialManager(std::shared_ptr<CommandManager> commandManager, esp_timer_handle_t *timerHandle, std::shared_ptr<ProjectConfig> deviceConfig)
+    : commandManager(commandManager), timerHandle(timerHandle), deviceConfig(deviceConfig)
+{
   this->data = static_cast<uint8_t *>(malloc(BUF_SIZE));
   this->temp_data = static_cast<uint8_t *>(malloc(256));
 }
@@ -40,47 +41,62 @@ void SerialManager::try_receive()
 
     // Notify main that a command was received during startup
     notify_startup_command_received();
-    
+
     const auto result = this->commandManager->executeFromJson(std::string_view(reinterpret_cast<const char *>(this->data)));
     const auto resultMessage = result.getResult();
     usb_serial_jtag_write_bytes(resultMessage.c_str(), resultMessage.length(), 1000 / 20);
   }
 }
 
+// Function to notify that a command was received during startup
+void SerialManager::notify_startup_command_received()
+{
+  setStartupCommandReceived(true);
+
+  // Cancel the startup timer if it's still running
+  if (timerHandle != nullptr)
+  {
+    esp_timer_stop(*timerHandle);
+    esp_timer_delete(*timerHandle);
+    timerHandle = nullptr;
+    ESP_LOGI("[MAIN]", "Startup timer cancelled, staying in heartbeat mode");
+  }
+}
+
 void SerialManager::send_heartbeat()
 {
   // Get the MAC address as unique identifier
   uint8_t mac[6];
   esp_read_mac(mac, ESP_MAC_WIFI_STA);
-  
+
   // Format as serial number string
   char serial_number[18];
-  sprintf(serial_number, "%02X%02X%02X%02X%02X%02X", 
+  sprintf(serial_number, "%02X%02X%02X%02X%02X%02X",
           mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-  
+
   // Create heartbeat JSON with serial number
   char heartbeat[128];
   sprintf(heartbeat, "{\"heartbeat\":\"openiris_setup_mode\",\"serial\":\"%s\"}\n", serial_number);
-  
+
   usb_serial_jtag_write_bytes(heartbeat, strlen(heartbeat), 1000 / 20);
 }
 
 bool SerialManager::should_send_heartbeat()
 {
   // Always send heartbeat during startup delay or if no WiFi configured
-  extern bool startupCommandReceived;
-  extern esp_timer_handle_t startupTimerHandle;
-  
+
   // If startup timer is still running, always send heartbeat
-  if (startupTimerHandle != nullptr) {
+  if (timerHandle != nullptr)
+  {
     return true;
   }
-  
+
   // If in heartbeat mode after startup, continue sending
-  if (startupCommandReceived) {
+  if (getStartupCommandReceived())
+  {
     return true;
   }
-  
+
   // Otherwise, only send if no WiFi credentials configured
   const auto wifiConfigs = deviceConfig->getWifiConfigs();
   return wifiConfigs.empty();
@@ -95,16 +111,16 @@ void HandleSerialManagerTask(void *pvParameters)
   while (true)
   {
     serialManager->try_receive();
-    
+
     // Send heartbeat every 2 seconds, but only if no WiFi credentials are set
     TickType_t currentTime = xTaskGetTickCount();
-    if ((currentTime - lastHeartbeat) >= heartbeatInterval) {
-      if (serialManager->should_send_heartbeat()) {
+    if ((currentTime - lastHeartbeat) >= heartbeatInterval)
+    {
+      if (serialManager->should_send_heartbeat())
+      {
         serialManager->send_heartbeat();
       }
       lastHeartbeat = currentTime;
     }
-    
-    vTaskDelay(pdMS_TO_TICKS(50)); // Small delay to prevent busy waiting
   }
 }

components/SerialManager/SerialManager/SerialManager.hpp

@@ -26,6 +26,7 @@ public:
   void try_receive();
   void send_heartbeat();
   bool should_send_heartbeat();
+  void notify_startup_command_received();
 
 private:
   std::shared_ptr<CommandManager> commandManager;