ajout de configuredByClient

cinosh07 · Mar 16, 2023 · 3c46645 · 3c46645
1 parent 3dc70f8
commit 3c46645
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Slider-Firmware/lib/slider/serial_messages.h b/Slider-Firmware/lib/slider/serial_messages.h
@@ -40,10 +40,14 @@ void displayEncoderReadyMessage(int b) {
 }
 
 
-void sendControllerReadyMessage() {
+void sendControllerReadyMessage(bool intervalMode) {
+    String controllerType = "Slider Controller ready !";
+    if (intervalMode) {
+        controllerType = "Intervalometer ready!";
+    }
     Serial.println("");
     Serial.println("**********************************");
-    Serial.println("Slider controller ready!");
+    Serial.println(controllerType);
     Serial.println("**********************************");
     Serial.println("");
 }

diff --git a/Slider-Firmware/lib/slider/websocket.h b/Slider-Firmware/lib/slider/websocket.h
@@ -52,7 +52,7 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
   if (type == WS_EVT_CONNECT)
   {
     sendWebsocketReadyMessage();
-    client->text("{\"COMMAND_STATUS\":" + (String)commandStatus + "}");
+    client->text("{\"COMMAND_STATUS\":" + (String)commandStatus + ", \"INTERVALOMETER_MODE\":"+config.intervalMode+"}");
     globalClient = client;
   }
   else if (type == WS_EVT_DISCONNECT)

diff --git a/Slider-Firmware/src/main.cpp b/Slider-Firmware/src/main.cpp
@@ -70,7 +70,7 @@ void setup()
       motorsBegin();
     }
 
-    sendControllerReadyMessage();
+    sendControllerReadyMessage(config.intervalMode);
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -70,7 +70,7 @@ void setup() @@
           motorsBegin();
         }
-        sendControllerReadyMessage();
+        sendControllerReadyMessage(config.intervalMode);
       }
     }
@@ Expand Down @@