Remove slam folder

TorturedEngineersDept · Jun 19, 2024 · 1995fd3 · 1995fd3
1 parent f47e817
commit 1995fd3
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 18 deletions.
diff --git a/esp32/lib/WifiSetup/MqttSetup.cpp b/esp32/lib/WifiSetup/MqttSetup.cpp
@@ -9,6 +9,10 @@ MqttSetup::MqttSetup(const char *server, int port, NTPClient &timeClient)
     : server(server), port(port), client(espClient), timeClient(timeClient)
 {
     client.setServer(server, port);
+}
+
+void MqttSetup::setClientID()
+{
     String tmp_id = "Bot-" + String(BotID);
     client_id = new char[tmp_id.length() + 1];
     strcpy(client_id, tmp_id.c_str());
@@ -19,6 +23,8 @@ void MqttSetup::connect(unsigned long timeout)
     unsigned long start = 0;
     while (!client.connected() && start < timeout)
     {
+        Serial.print("CLIENT ID:");
+        Serial.println(client_id);
         Serial.print("Attempting MQTT connection...");
         if (client.connect(client_id))
         {

diff --git a/esp32/lib/WifiSetup/MqttSetup.h b/esp32/lib/WifiSetup/MqttSetup.h
@@ -14,6 +14,7 @@ class MqttSetup
 public:
     MqttSetup(const char *server, int port, NTPClient &timeClient);
     void connect(unsigned long timeout = ULONG_MAX);
+    void setClientID();
 
     /**
      * Loop function that takes care of the sending of messages

diff --git a/esp32/lib/WifiSetup/WifiSetup.cpp b/esp32/lib/WifiSetup/WifiSetup.cpp
@@ -73,19 +73,21 @@ void WifiSetup::connect(unsigned long timeout)
     // Get the WiFi signal strength
     getStrength();
 
+    // Resolve RunID and BotID
+    if (!runIdResolved)
+    {
+        resolveId();
+        runIdResolved = true;
+    }
+
     // Ping the MQTT server to ensure it's reachable
     pingServer(mqtt.getServer());
 
     // Setup MQTT
+    mqtt.setClientID();
     mqtt.setCallback(callback);
     mqtt.connect(timeout - start);
 
-    if (!runIdResolved)
-    {
-        resolveId();
-        runIdResolved = true;
-    }
-
     // Setup NTP
     timeClient.begin();
 }

diff --git a/esp32/platformio.ini b/esp32/platformio.ini
@@ -37,13 +37,13 @@ test_ignore =
     test_serial
     test_battery
 
-[env:native]
-platform = native
-test_ignore = 
-    test_mpu6050
-    test_wifi
-build_flags = 
-    -I include
-    -D NATIVE
-lib_ignore = 
-    PidController
+; [env:native]
+; platform = native
+; test_ignore = 
+;     test_mpu6050
+;     test_wifi
+; build_flags = 
+;     -I include
+;     -D NATIVE
+; lib_ignore = 
+;     PidController
diff --git a/server/website/public/data/incidents/incident.jpg b/server/website/public/data/incidents/incident.jpg
diff --git a/server/website/public/data/map_processed/map.json b/server/website/public/data/map_processed/map.json
@@ -1,5 +1,5 @@
 {
-    "image": "map_processed/map.png",
+    "image": "map.png",
     "resolution": 0.05,
     "origin": [
         -2.09,
@@ -10,7 +10,7 @@
         {
             "x": -0.3,
             "y": -0.3,
-            "image": "data/incidents/incident1.jpg"
+            "image": "data/incidents/incident.jpg"
         },
         {
             "x": 3,