code cleaning

saleemhamo · Mar 29, 2024 · 905cdc3 · 905cdc3
1 parent 7d58313
commit 905cdc3
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 57 deletions.
diff --git a/include/main/MainSystem.h b/include/main/MainSystem.h
@@ -47,7 +47,6 @@ class MainSystem {
 
     std::atomic<bool> isTrafficLightRunningInNormalBehaviour;
 
-
     void onCarsMotionDetected();
 
     void onPedestriansMotionDetected();
@@ -60,13 +59,12 @@ class MainSystem {
 
     void runTrafficLightsNormalBehaviour();
 
-    void turnCarsGreen();
+    void turnCarsTrafficLightGreen();
 
-    void turnPedestriansGreen();
+    void turnPedestriansTrafficLightGreen();
 
-    void turnAllRed();
+    void turnAllTrafficLightsRed();
 
-//    void resetTrafficLightTimer();
 };
 
 #endif // MAINSYSTEM_H
diff --git a/src/main.cpp b/src/main.cpp
@@ -7,36 +7,33 @@
 #include "utils/Logger.h"
 #include <iostream>
 #include <string>
-#include <chrono>  // For std::chrono
-#include <thread>  // For std::this_thread
 
-void init();
+void initApplication();
 
-// void close();
+void closeApplication(MainSystem &mainSystem);
 
 int main() {
-    init();
+    initApplication();
 
     MainSystem mainSystem;
     mainSystem.initialize();
     mainSystem.runSystems();
 
-    // close();
+    closeApplication(mainSystem);
     return 0;
 }
 
 
-void init() {
+void initApplication() {
     try {
         Logger::init("app.log"); // Adjust the file name as needed
-//        Logger::logInfo("Application starting");
-        // The rest of your program
+        Logger::logInfo("Application starting");
     } catch (const std::exception &e) {
         std::cerr << "Failed to initialize logger: " << e.what() << std::endl;
     }
 }
 
-// void close(MainSystem mainSystem) {
-//     mainSystem.shutdown();
-//     Logger::close();
-// }
+void closeApplication(MainSystem &mainSystem) {
+    mainSystem.shutdown();
+    Logger::close();
+}
diff --git a/src/main/MainSystem.cpp b/src/main/MainSystem.cpp
@@ -1,4 +1,5 @@
 #include "main/MainSystem.h"
+#include "utils/Logger.h"
 
 MainSystem::MainSystem() : trafficLightState(OFF) {}
 
@@ -37,6 +38,7 @@ void MainSystem::shutdown() {
 }
 
 void MainSystem::onCarsMotionDetected() {
+    Logger::logInfo("Cars motion detected");
     std::cout << "Cars motion detected" << std::endl;
     if (trafficLightState != CARS_RED_PEDESTRIANS_GREEN) {
         return; // Do Nothing
@@ -45,7 +47,7 @@ void MainSystem::onCarsMotionDetected() {
     // State is CARS_RED_PEDESTRIANS_GREEN
     checkingSystem.disableSensing();
     disableTrafficLightsNormalBehaviour();
-    turnAllRed();
+    turnAllTrafficLightsRed();
     warningSystem.activate();
 
     // after 5 seconds
@@ -58,6 +60,7 @@ void MainSystem::onCarsMotionDetected() {
 }
 
 void MainSystem::onPedestriansMotionDetected() {
+    Logger::logInfo("Pedestrians motion detected");
     std::cout << "Pedestrians motion detected" << std::endl;
     if (trafficLightState != CARS_GREEN_PEDESTRIANS_RED) {
         return; // Do Nothing
@@ -66,7 +69,7 @@ void MainSystem::onPedestriansMotionDetected() {
     // State is CARS_GREEN_PEDESTRIANS_RED
     checkingSystem.disableSensing();
     disableTrafficLightsNormalBehaviour();
-    turnAllRed();
+    turnAllTrafficLightsRed();
     warningSystem.activate();
 
     // after 5 seconds
@@ -100,64 +103,42 @@ void MainSystem::disableTrafficLightsNormalBehaviour() {
     pedestriansTrafficLightTimer.stopTimer();
 }
 
-void MainSystem::turnCarsGreen() {
-    std::cout << "turnCarsGreen called" << std::endl;
+void MainSystem::turnCarsTrafficLightGreen() {
+    Logger::logInfo("turnCarsTrafficLightGreen called");
     if (!isTrafficLightRunningInNormalBehaviour) {
         return;
     }
     carsTrafficLight.turnGreen();
     pedestriansTrafficLight.turnRed();
     trafficLightState = CARS_GREEN_PEDESTRIANS_RED;
-    pedestriansTrafficLightTimer.setTimeout([this] { turnPedestriansGreen(); }, 5000);
-    std::cout << "turnCarsGreen finished" << std::endl;
+    pedestriansTrafficLightTimer.setTimeout([this] { turnPedestriansTrafficLightGreen(); }, 5000);
+    Logger::logInfo("turnCarsTrafficLightGreen finished");
 
 }
 
-void MainSystem::turnPedestriansGreen() {
-    std::cout << "turnPedestriansGreen called" << std::endl;
+void MainSystem::turnPedestriansTrafficLightGreen() {
+    Logger::logInfo("turnPedestriansTrafficLightGreen called");
     if (!isTrafficLightRunningInNormalBehaviour) {
         return;
     }
     carsTrafficLight.turnRed();
     pedestriansTrafficLight.turnGreen();
     trafficLightState = CARS_RED_PEDESTRIANS_GREEN;
-    carsTrafficLightTimer.setTimeout([this] { turnCarsGreen(); }, 5000);
-    std::cout << "turnPedestriansGreen finished" << std::endl;
+    carsTrafficLightTimer.setTimeout([this] { turnCarsTrafficLightGreen(); }, 5000);
+    Logger::logInfo("turnPedestriansTrafficLightGreen finished");
+
+
 }
 
-void MainSystem::turnAllRed() {
-    std::cout << "turnAllRed called" << std::endl;
+void MainSystem::turnAllTrafficLightsRed() {
+    Logger::logInfo("turnAllTrafficLightsRed called");
     carsTrafficLight.turnRed();
     pedestriansTrafficLight.turnRed();
     trafficLightState = OFF;
 }
 
 
 void MainSystem::runTrafficLightsNormalBehaviour() {
-    std::cout << "runTrafficLightsNormalBehaviour called" << std::endl;
-    turnCarsGreen();
-}
-
-
-// Set initial states
-// States:
-//      - CARS_RED_PED_GREEN
-//      - CARS_GREEN_PED_RED
-
-// Scenario #1 -> CARS_RED_PED_GREEN -> monitor road -> when needed, turn all red and fire alarm.
-// Scenario #2 -> CARS_RED_PED_GREEN -> timeout      -> change state
-// Scenario #3 -> CARS_GREEN_PED_RED -> monitor ped -> when needed, turn all red and fire alarm.
-// Scenario #4 -> CARS_GREEN_PED_RED -> button pressed -> monitor road and decide
-// Scenario #5 -> CARS_GREEN_PED_RED -> timeout      -> change state
-
-
-// set traffic lights
-// start detection
-
-
-// runTrafficLightsNormalBehaviour
-// run what to check based on state ->
-//                                      CARS_RED_PED_GREEN -> check road only
-//                                      CARS_GREEN_PED_RED -> check pedestrians
-
-// callback from road -> Scenario #1
+    Logger::logInfo("runTrafficLightsNormalBehaviour called");
+    turnCarsTrafficLightGreen();
+}