From 56f506e1b5cf854bcdc3c5860ffb9c0d79702628 Mon Sep 17 00:00:00 2001 From: Alexander Klein Date: Wed, 24 May 2023 13:49:14 +0200 Subject: [PATCH] added increase and decrease for min distance to autopilot menu --- .../driveModi/Autopilot/menuAutopilot.cpp | 28 +++++++++++++++++-- .../driveModi/Autopilot/menuAutopilot.h | 1 + 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.cpp b/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.cpp index 759fdfa..31f48c7 100644 --- a/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.cpp +++ b/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.cpp @@ -153,6 +153,20 @@ void MenuAutopilot::printPage() const { lineTwo = "deactivated"; break; + case 8: + lineOne = "MinDisToPoint:"; + lineTwo = ""; + lineTwo.concat(this->minDistance); + lineTwo.concat(" - Increase"); + break; + + case 9: + lineOne = "MinDisToPoint:"; + lineTwo = ""; + lineTwo.concat(this->minDistance); + lineTwo.concat(" - Decrease"); + break; + default: this->printDefault(); return; @@ -162,7 +176,7 @@ void MenuAutopilot::printPage() const { } void MenuAutopilot::runCommand() const { - switch (this->getCountPages()) { + switch (this->getCurrentPage()) { case 6: this->autopilot->restart(); break; @@ -176,6 +190,14 @@ void MenuAutopilot::runCommand() const { this->driveManager->getNavigation()->freezeTargetPoint(); } break; + + case 8: + this->minDistance = this->driveManager->getNavigation()->increaseMinDistanceToReachPoint(); + break; + + case 9: + this->minDistance = this->driveManager->getNavigation()->decreaseMinDistanceToReachPoint(); + break; default: break; @@ -191,8 +213,10 @@ void MenuAutopilot::update() { } void MenuAutopilot::init() { - this->setCountPages(8); + this->setCountPages(10); this->driveManager->changeModus(Modi::Autopilot); this->autopilot = (Autopilot*) this->driveManager->getDriveModiPtr(); this->routeInfo = this->autopilot->getRouteInfo(); + this->driveManager->getNavigation()->increaseMinDistanceToReachPoint(); + this->minDistance = this->driveManager->getNavigation()->decreaseMinDistanceToReachPoint(); } diff --git a/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.h b/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.h index 7783f64..d528a48 100644 --- a/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.h +++ b/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.h @@ -48,6 +48,7 @@ class MenuAutopilot : public MenuDriveMode { void init() override; bool mutable targetFreezed = false; + double mutable minDistance; Autopilot* autopilot; RouteInfo routeInfo;