From 9762aabb0085a4bfdfecacfb385584535f52e051 Mon Sep 17 00:00:00 2001 From: Alexander Klein Date: Sun, 8 Jan 2023 19:57:42 +0100 Subject: [PATCH] some fixes --- include/moveControlConfig.h | 4 ++-- lib/Menu/menu.cpp | 1 + .../driveModi/CaptureRoute/menuCaptureRoute.cpp | 4 +++- .../driveModi/ManualDrive/menuManualDrive.cpp | 8 ++++++++ src/SpecialMenus/driveModi/ManualDrive/menuManualDrive.h | 3 +++ 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/include/moveControlConfig.h b/include/moveControlConfig.h index dd323ec..4b7f01a 100644 --- a/include/moveControlConfig.h +++ b/include/moveControlConfig.h @@ -10,8 +10,8 @@ */ //Pin config //Left Motor - #define M_DIR_11 27 - #define M_DIR_12 12 + #define M_DIR_11 12 + #define M_DIR_12 27 #define M_PWM_1 13 #define M_ENCODE_1A 33 #define M_ENCODE_1B 32 diff --git a/lib/Menu/menu.cpp b/lib/Menu/menu.cpp index afd2c7e..33c30e0 100644 --- a/lib/Menu/menu.cpp +++ b/lib/Menu/menu.cpp @@ -44,6 +44,7 @@ void Menu::printMenu() { lineTwo.concat((*this->entrys.begin())->getName()); this->inSubmenu = false; + this->print(lineOne, lineTwo); } void Menu::update() { diff --git a/src/SpecialMenus/driveModi/CaptureRoute/menuCaptureRoute.cpp b/src/SpecialMenus/driveModi/CaptureRoute/menuCaptureRoute.cpp index 35c39b8..74d3239 100644 --- a/src/SpecialMenus/driveModi/CaptureRoute/menuCaptureRoute.cpp +++ b/src/SpecialMenus/driveModi/CaptureRoute/menuCaptureRoute.cpp @@ -19,7 +19,9 @@ void MenuCaptureRoute::printMenu() { String lineOne = "Points: "; String lineTwo = "You can drive."; - lineTwo.concat(this->routeInfo.totalPoints); + lineOne.concat(this->routeInfo.totalPoints); + + this->print(lineOne, lineTwo); } void MenuCaptureRoute::update() { diff --git a/src/SpecialMenus/driveModi/ManualDrive/menuManualDrive.cpp b/src/SpecialMenus/driveModi/ManualDrive/menuManualDrive.cpp index 860c1d7..32cf837 100644 --- a/src/SpecialMenus/driveModi/ManualDrive/menuManualDrive.cpp +++ b/src/SpecialMenus/driveModi/ManualDrive/menuManualDrive.cpp @@ -11,5 +11,13 @@ #include "menuManualDrive.h" void MenuManualControl::printMenu() { + if (this->firstPrint) + this->init(); + this->print("Now you can", "drive. :)"); } + +void MenuManualControl::init() { + this->firstPrint = false; + this->driveManager->changeModus(Modi::ManualControl); +} diff --git a/src/SpecialMenus/driveModi/ManualDrive/menuManualDrive.h b/src/SpecialMenus/driveModi/ManualDrive/menuManualDrive.h index fa7631b..6ab8ece 100644 --- a/src/SpecialMenus/driveModi/ManualDrive/menuManualDrive.h +++ b/src/SpecialMenus/driveModi/ManualDrive/menuManualDrive.h @@ -36,6 +36,9 @@ class MenuManualControl : public MenuDriveMode { * Changes the DriveModi to Autopilot if it is the first time called. */ void printMenu(); + + private: + void init(); }; #endif // MENU_MANUAL_DRIVE_H