From 5fe7edf35379af63cb79b08b05f1d597a016a221 Mon Sep 17 00:00:00 2001 From: Alexander Klein Date: Sat, 18 Feb 2023 13:31:19 +0100 Subject: [PATCH] fix some refactor issues --- platformio.ini | 2 +- src/driveModi/Modi/TestMode/testMode.h | 4 +-- src/main.cpp | 39 +++++++++++++------------- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/platformio.ini b/platformio.ini index b1ec0e5..83da049 100644 --- a/platformio.ini +++ b/platformio.ini @@ -27,7 +27,7 @@ lib_deps = marian-craciunescu/ESP32Ping@^1.7 bblanchon/ArduinoJson@^6.20.0 mprograms/QMC5883LCompass@^1.1.1 - https://git.kleiax.de/PlatformIO-Libs/Menu.git + https://git.kleiax.de/PlatformIO-Libs/Menu.git#v1.0 upload_port = COM3 [env:release] diff --git a/src/driveModi/Modi/TestMode/testMode.h b/src/driveModi/Modi/TestMode/testMode.h index 9fad2b4..27c9d8d 100644 --- a/src/driveModi/Modi/TestMode/testMode.h +++ b/src/driveModi/Modi/TestMode/testMode.h @@ -121,8 +121,8 @@ class TestMode : public DriveModi { */ bool getBusy() const { return this->busy; } Maneuver getManeuver() const { return this->maneuver; } - Speedometer* getSpeedometerLeft() { this->moveControl->getSpeedometerLeft(); } - Speedometer* getSpeedometerRight() { this->moveControl->getSpeedometerRight(); } + Speedometer* getSpeedometerLeft() { return this->moveControl->getSpeedometerLeft(); } + Speedometer* getSpeedometerRight() { return this->moveControl->getSpeedometerRight(); } private: bool engineInit(int16_t powerPercentage, int16_t seconds); diff --git a/src/main.cpp b/src/main.cpp index 3f28aa4..1680c9a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -27,7 +27,7 @@ #include "driveModi/driveManager.h" #include "OutputBuf/outputBuf.h" -#include "displayWrapper.h" +#include "LcdWrapper.h" #include "moveControl.h" #include "network.h" #include "debugMqtt.h" @@ -44,7 +44,6 @@ #include "SpecialMenus/PID/menuPidSettings.h" #include "SpecialMenus/Route/menuRoute.h" #include "SpecialMenus/GPS/menuGPS.h" -#include "SpecialMenus/Test/menuTest.h" MoveControl moveController; DriveManager* driveManager; @@ -279,16 +278,16 @@ void makeMenu() { // Set Menus on LCD main_m->setLcd(lcdWrapper); mode_m->setLcd(lcdWrapper); - pid_m->setLcd(LcdWrapper); - pidl_m->setLcd(LcdWrapper); - pidr_m->setLcd(LcdWrapper); - man_m->setLcd(LcdWrapper); - cap_m->setLcd(LcdWrapper); - auto_m->setLcd(LcdWrapper); - testM_m->setLcd(LcdWrapper); - gps_m->setLcd(LcdWrapper); - sys_m->setLcd(LcdWrapper); - rout_m->setLcd(LcdWrapper); + pid_m->setLcd(lcdWrapper); + pidl_m->setLcd(lcdWrapper); + pidr_m->setLcd(lcdWrapper); + man_m->setLcd(lcdWrapper); + cap_m->setLcd(lcdWrapper); + auto_m->setLcd(lcdWrapper); + testM_m->setLcd(lcdWrapper); + gps_m->setLcd(lcdWrapper); + sys_m->setLcd(lcdWrapper); + rout_m->setLcd(lcdWrapper); // Entry for the main menu @@ -338,17 +337,17 @@ void makeMenu() { } void restart(void) { - LcdWrapper->clear(); - LcdWrapper->setCursor(0, 0); - LcdWrapper->print("Rebooting ..."); + lcdWrapper->clear(); + lcdWrapper->setCursor(0, 0); + lcdWrapper->print("Rebooting ..."); ESP.restart(); } void disconnectController(void) { disconnectPs3 = true; - LcdWrapper->clear(); - LcdWrapper->setCursor(0, 0); - LcdWrapper->print("Controller is"); - LcdWrapper->setCursor(0, 1); - LcdWrapper->print("disconnected."); + lcdWrapper->clear(); + lcdWrapper->setCursor(0, 0); + lcdWrapper->print("Controller is"); + lcdWrapper->setCursor(0, 1); + lcdWrapper->print("disconnected."); }