kleiax/Bachelorarbeit-Rover
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

- reafctor

Browse Source
This commit is contained in:
kleiax
2023-09-03 12:36:08 +02:00
parent b6764e54da
commit faaa3603a7
3 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SpecialMenus/driveModi/Autopilot/menuAutopilot.cpp
+10 -9
View File
@@ -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;
src/SpecialMenus/driveModi/CalibrateCompass/menuCalibrateCompass.h
+2 -1
View File
@@ -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;
};