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

remove inheritance from menuTestMode

Browse Source
This commit is contained in:
kleiax
2023-05-11 11:04:55 +02:00
parent f2b63f1ce6
commit 2850b5084d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SpecialMenus/driveModi/ManualDrive/menuManualDrive.cpp
+1 -1
View File
@@ -21,7 +21,7 @@ void MenuManualControl::printPage() const {
lineOne = "-Ready to drive-"; lineOne = "-Ready to drive-";
break; break;
case 0: case 1:
lineOne = "Speed:"; lineOne = "Speed:";
lineTwo = "Warp 3"; lineTwo = "Warp 3";
break; break;
src/SpecialMenus/driveModi/TestMode/menuTestMode.cpp
+2 -3
View File
@@ -10,9 +10,8 @@
*/ */
#include "menuTestMode.h" #include "menuTestMode.h"
MenuTestMode::MenuTestMode(DriveManager* driveManager) MenuTestMode::MenuTestMode(DriveManager* driveManager) {
: MenuDriveMode(driveManager) { this->driveManager = driveManager;
} }
MenuTestMode::~MenuTestMode() { MenuTestMode::~MenuTestMode() {
src/SpecialMenus/driveModi/TestMode/menuTestMode.h
+2 -1
View File
@@ -22,7 +22,7 @@
* @brief Interact with the TestMode * @brief Interact with the TestMode
* *
*/ */
class MenuTestMode : public MenuDriveMode { class MenuTestMode : public MenuControl {
public: public:
/** /**
* @brief Construct a new Menu Test Mode object * @brief Construct a new Menu Test Mode object
@@ -69,6 +69,7 @@ class MenuTestMode : public MenuDriveMode {
void init(); void init();
bool checkInput(); bool checkInput();
DriveManager* driveManager;
TestMode* testMode; TestMode* testMode;
Menu* mainMenu; Menu* mainMenu;