calc Azimuth finished

This commit is contained in:
2023-08-09 15:34:03 +02:00
parent cf111426bd
commit 98f3cb93f0
6 changed files with 7 additions and 13 deletions
View File
+2 -2
View File
@@ -1,9 +1,9 @@
// AUTO GENERATED FILE, DO NOT EDIT // AUTO GENERATED FILE, DO NOT EDIT
#ifndef VERSION #ifndef VERSION
#define VERSION "0.8.21" #define VERSION "0.8.27"
#endif #endif
#ifndef BUILD_TIMESTAMP #ifndef BUILD_TIMESTAMP
#define BUILD_TIMESTAMP "2023-08-08 22:55:37.389313" #define BUILD_TIMESTAMP "2023-08-09 10:33:06.900861"
#endif #endif
+2
View File
@@ -126,6 +126,7 @@ void Navigation::drivingDirectionChange() {
if (tmp.isInit() && tmp.isValid()) { if (tmp.isInit() && tmp.isValid()) {
this->directionChangeMode = true; this->directionChangeMode = true;
this->lastPointDrivingDirectionChange = tmp; this->lastPointDrivingDirectionChange = tmp;
this->calcAzimuthState = CalcAzimuthState::Invalid;
} }
} }
@@ -200,6 +201,7 @@ void Navigation::updateMagneticDeclination() {
|| this->lastPointDrivingDirectionChange.distanceTo(this->currentPosition) < 1.0) || this->lastPointDrivingDirectionChange.distanceTo(this->currentPosition) < 1.0)
{ {
this->calcAzimuthState = CalcAzimuthState::Invalid; this->calcAzimuthState = CalcAzimuthState::Invalid;
this->calcAzimuth = 999;
return; return;
} }
+1 -1
View File
@@ -29,8 +29,8 @@ void DirectionChangeSignal::action() {
Autopilot::Autopilot(MoveControl* moveControl, const ControlPadInput *input, Navigation* navigation) Autopilot::Autopilot(MoveControl* moveControl, const ControlPadInput *input, Navigation* navigation)
: ManualControl(moveControl, input) { : ManualControl(moveControl, input) {
this->setInputMode(ManualControl::InputMode::Digital); this->setInputMode(ManualControl::InputMode::Digital);
this->setDirectionChangeCallback(this->directionChangeSignal);
this->directionChangeSignal = new DirectionChangeSignal(navigation); this->directionChangeSignal = new DirectionChangeSignal(navigation);
this->setDirectionChangeCallback(this->directionChangeSignal);
this->navigation = navigation; this->navigation = navigation;
this->init(); this->init();
} }
+1 -9
View File
@@ -76,15 +76,6 @@ class Autopilot : public ManualControl {
*/ */
void loop(); void loop();
/**
* @brief Manges the autopilot
*
* If the first Point is near to current location you can turn
* the autopilot on.
* Gets the course correction and decide what to do.
*/
void runAutopilot();
void restart(); void restart();
/** /**
@@ -120,6 +111,7 @@ class Autopilot : public ManualControl {
void init(); void init();
void drive(); void drive();
void rotate(); void rotate();
void runAutopilot();
void checkButtonInput(); void checkButtonInput();
void askNavigationForOrder(); void askNavigationForOrder();
void selfDriving(); void selfDriving();
+1 -1
View File
@@ -1 +1 @@
0.8.21 0.8.27