Merge branch 'main' of https://github.com/Chi-EEE/Car-Application

Chi-EEE · Mar 15, 2024 · ad876a6 · ad876a6
2 parents 4528846 + 86817fc
commit ad876a6
Showing 1 changed file with 21 additions and 12 deletions.
diff --git a/app/rpi/daemon/src/main.cpp b/app/rpi/daemon/src/main.cpp
@@ -101,25 +101,34 @@ class rpi_daemon : public daemon
         }
 
         std::chrono::time_point<std::chrono::steady_clock> now = std::chrono::steady_clock::now();
-        if (!this->car_system->isConnected() && now - this->last_connected >= this->connection_interval)
+        const bool CAN_CONNECT = !this->car_system->isConnected() && now - this->last_connected >= this->connection_interval;
+        if (CAN_CONNECT)
+        {
+            this->connect(now);
+        }
+        this->car_system->update();
+    }
+
+    inline void connect(std::chrono::time_point<std::chrono::steady_clock> &now)
+    {
+        if (!this->attempted_to_reconnect)
+        {
+            dlog::notice(fmt::format(R"(Going to repeatedly attempt to connect to the WS Server "{}" at {} second intervals.)", this->car_system->getConfiguration()->host, this->connection_interval.count()));
+        }
+        auto connection_result = this->car_system->tryConnect();
+        if (!connection_result.has_value())
         {
             if (!this->attempted_to_reconnect)
             {
                 this->attempted_to_reconnect = true;
-                dlog::notice(fmt::format(R"(Going to repeatedly attempt to connect to the WS Server "{}" at {} second intervals.)", this->car_system->getConfiguration()->host, this->connection_interval.count()));
-            }
-            auto connection_result = this->car_system->tryConnect();
-            if (!connection_result.has_value())
-            {
                 dlog::info(connection_result.error());
             }
-            else
-            {
-                dlog::info("Connected to the WS Server.");
-            }
-            this->last_connected = now;
         }
-        this->car_system->update();
+        else
+        {
+            dlog::info("Connected to the WS Server.");
+        }
+        this->last_connected = now;
     }
 
     void on_update() override