compilation works again

This commit is contained in:
2023-09-04 13:30:34 +02:00
parent 5f650982a7
commit 6a76470f45
23 changed files with 285 additions and 321 deletions
+6 -9
View File
@@ -31,7 +31,6 @@
#include "network.h"
#include "debugMqtt.h"
#include "battery.h"
#include "sensors.h"
#include "sensorData.h"
#include "debugTimes.h"
#include "controlPad.h"
@@ -57,7 +56,6 @@ OutputBuf* outputBuf;
DebugMqtt* debugMqtt = nullptr;
Battery* mainBattery;
SPIClass* spiPort;
Sensors* sensors;
SensorData* sensorData;
ControlPad* controlPad;
@@ -119,11 +117,10 @@ void setup() {
std::cout << "Build timestamp: " << BUILD_TIMESTAMP << std::endl;
std::cout << "All actions from the main program run on Core -> " << xPortGetCoreID() << std::endl;
sensors = new Sensors();
sensors->enableGnss(spiPort, PinNumbers::gnssSpiCs);
sensors->enableCompass();
sensorData = sensors->getSensorData();
driveManager = new DriveManager(&moveController, sensorData, controlPad->getControlPadDataPtr(), wifiIsActive);
sensorData = new SensorData();
sensorData->enableGnss(spiPort, PinNumbers::gnssSpiCs);
sensorData->enableRealCompass();
driveManager = new DriveManager(&moveController, sensorData, controlPad->getControlPadDataPtr());
outputBuf->activateMqtt(true);
@@ -150,7 +147,7 @@ void loop() {
#endif //MQTT
wifiTime.stopConsol("WiFi-Time", 10);
}
sensors->loop();
sensorData->loop();
driveManager->loop();
controlPad->loop();
main_m->update();
@@ -225,7 +222,7 @@ void makeMenu() {
MenuAutopilot* auto_m = new MenuAutopilot(driveManager);
MenuTestMode* testM_m = new MenuTestMode(driveManager);
MenuCalibrateCompass* comp_m = new MenuCalibrateCompass(driveManager);
MenuGPS* gps_m = new MenuGPS(driveManager);
MenuGPS* gps_m = new MenuGPS(sensorData);
MenuSysteminformation* sys_m = new MenuSysteminformation(mainBattery);
MenuRoute* rout_m = new MenuRoute(driveManager->getNavigation()->getRoute());