From faaa3603a76ba091423154519c0cfcea7cd8fa65 Mon Sep 17 00:00:00 2001
From: Alexander Klein <alex@kleiax.de>
Date: Sun, 3 Sep 2023 12:36:08 +0200
Subject: [PATCH] - reafctor

---
 .../driveModi/Autopilot/menuAutopilot.cpp     | 19 +++++++++--------
 .../CalibrateCompass/menuCalibrateCompass.h   |  3 ++-
 src/driveModi/driveManager.h                  | 21 ++++++-------------
 3 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.cpp b/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.cpp
index 523e532..cb3bdd0 100644
--- a/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.cpp
+++ b/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.cpp
@@ -131,30 +131,31 @@ void MenuAutopilot::printPage() const {
         }
 
         case 4:
-            if (this->driveManager->getNavigation()->getCalcAzimuthState() == Navigation::CalcAzimuthState::Good
-                ||this->driveManager->getNavigation()->getCalcAzimuthState() == Navigation::CalcAzimuthState::Super)
+            
+            if (this->autopilot->getSensorData().getCalcAzimuth() == CalcAzimuth::CalcAzimuthState::Good
+                ||this->autopilot->getSensorData().getCalcAzimuth() == CalcAzimuth::CalcAzimuthState::Super)
             {
                 lineOne = "Calc Azi: ";
                 lineTwo = "State: ";
-                lineOne.concat(this->driveManager->getNavigation()->getCalcAzimuth());
-                switch (this->driveManager->getNavigation()->getCalcAzimuthState()) {
-                    case Navigation::CalcAzimuthState::Bad :
+                lineOne.concat(this->autopilot->getSensorData().getCalcAzimuth());
+                switch (this->autopilot->getSensorData().getCalcAzimuthState()) {
+                    case CalcAzimuth::CalcAzimuthState::Bad :
                         lineTwo.concat("Bad");
                         break;
                     
-                    case Navigation::CalcAzimuthState::Good :
+                    case CalcAzimuth::CalcAzimuthState::Good :
                         lineTwo.concat("Good");
                         break;
 
-                    case Navigation::CalcAzimuthState::Invalid :
+                    case CalcAzimuth::CalcAzimuthState::Invalid :
                         lineTwo.concat("Invalid");
                         break;
 
-                    case Navigation::CalcAzimuthState::Ok :
+                    case CalcAzimuth::CalcAzimuthState::Ok :
                         lineTwo.concat("Ok");
                         break;
 
-                    case Navigation::CalcAzimuthState::Super :
+                    case CalcAzimuth::CalcAzimuthState::Super :
                         lineTwo.concat("Super");
                         break;
 
diff --git a/src/SpecialMenus/driveModi/CalibrateCompass/menuCalibrateCompass.h b/src/SpecialMenus/driveModi/CalibrateCompass/menuCalibrateCompass.h
index f17438b..0eee4c2 100644
--- a/src/SpecialMenus/driveModi/CalibrateCompass/menuCalibrateCompass.h
+++ b/src/SpecialMenus/driveModi/CalibrateCompass/menuCalibrateCompass.h
@@ -13,6 +13,7 @@
 #define MENU_CALIBRATE_COMPASS_H
 
 #include "SpecialMenus/driveModi/menuDriveMode.h"
+#include ""
 #include "calibrateCompass.h"
 
 /**
@@ -44,7 +45,7 @@ class MenuCalibrateCompass : public MenuDriveMode {
         void runCommand() const override;
 
     private:
-        ManualControl* manualControl;
+        CalibrateCompassM* caliCompassMode;
         CalibrateCompass* caliCompass;
 };
 
diff --git a/src/driveModi/driveManager.h b/src/driveModi/driveManager.h
index 3841c75..c29bfcd 100644
--- a/src/driveModi/driveManager.h
+++ b/src/driveModi/driveManager.h
@@ -23,12 +23,12 @@
 #include "debugTimes.h"
 #include "controlPadInput.h"
 #include "component.h"
+#include "sensorData.h"
 
 // All Drive Modi
 #include "driveModi/Modi/ManualControl/manualControl.h"
 #include "driveModi/Modi/CaptureRoute/captureRoute.h"
 #include "driveModi/Modi/Autopilot/autopilot.h"
-#include "driveModi/Modi/ConsolControl/consolControl.h"
 #include "driveModi/Modi/TestMode/testMode.h"
 
 /**
@@ -40,7 +40,6 @@ enum class Modi {
     ManualControl,
     CaptureRoute,
     Autopilot,
-    ConsolControl,
     TestMode
 };
 
@@ -53,7 +52,8 @@ class DriveManager : public Component {
          * 
          * @param moveControl 
          */
-        DriveManager(MoveControl *moveControl, SPIClass *spiPort, const ControlPadInput *input, bool wifi = false);
+        DriveManager(MoveControl *moveControl, SensorData* sensorData, ControlPadInput *input, bool wifi = false);
+        DriveManager(DriveModiParams params, bool wifi = false);
 
         /**
          * @brief Destroy the Drive Manager object
@@ -61,14 +61,6 @@ class DriveManager : public Component {
          */
         ~DriveManager();
 
-        /**
-         * @brief Increment the DriveModi enum
-         * Than calls changeModus
-         * 
-         * @see Modi
-         */
-        void nextModus();
-
         /**
          * @brief Change the DriveModi to a specific value
          * 
@@ -106,14 +98,13 @@ class DriveManager : public Component {
         Modi getDriveModi() const { return this->currentModus; }
 
     private:
-        void run() override;
+        void run() override {};
+        void init(bool wifi);
 
         Modi currentModus = Modi::Off;
-        MoveControl *moveControl;
-        const ControlPadInput* input;
         DriveModi *currentModusPtr = nullptr;
         Navigation* navigation;
-        SPIClass* spiPort;
+        DriveModiParams driveModiParams;
 };