- reafctor

This commit is contained in:
2023-09-03 12:36:08 +02:00
parent b6764e54da
commit faaa3603a7
3 changed files with 18 additions and 25 deletions
+6 -15
View File
@@ -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;
};