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

moved battery information in systeminformation

Browse Source
This commit is contained in:
kleiax
2022-12-28 14:57:31 +01:00
parent 7f1ffc874f
commit 35f1059562
5 changed files with 39 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+1 -6
View File
@@ -41,7 +41,6 @@
#include "SpecialMenus/driveModi/TestMode/menuTestMode.h"
#include "SpecialMenus/PID/menuPidSettings.h"
#include "SpecialMenus/GPS/menuGPS.h"
#include "SpecialMenus/Akku/menuAkku.h"
#include "SpecialMenus/Systeminformation/menuSysteminformation.h"
MoveControl moveController;
@@ -281,8 +280,7 @@ void makeMenu() {
MenuAutopilot* auto_m = new MenuAutopilot(driveManager);
MenuTestMode* test_m = new MenuTestMode(driveManager);
MenuGPS* gps_m = new MenuGPS(driveManager);
MenuAkku* akku_m = new MenuAkku(mainBattery, gamepad);
MenuSysteminformation* sys_m = new MenuSysteminformation();
MenuSysteminformation* sys_m = new MenuSysteminformation(mainBattery, gamepad);
// Set Menus on LCD
main_m->setLcd(lcd);
@@ -295,7 +293,6 @@ void makeMenu() {
auto_m->setLcd(lcd);
test_m->setLcd(lcd);
gps_m->setLcd(lcd);
akku_m->setLcd(lcd);
sys_m->setLcd(lcd);
@@ -304,13 +301,11 @@ void makeMenu() {
MenuAction* gps_e = new MenuAction("GPS", gps_m);
MenuAction* pid_e = new MenuAction("PID", pid_m);
MenuAction* restart_e = new MenuAction("Restart", restart);
MenuAction* akku_e = new MenuAction("Battery", akku_m);
MenuAction* contr_e = new MenuAction("Remove PS3", disconnectController);
MenuAction* sys_e = new MenuAction("Systeminfo", sys_m);
main_m->addEntry(mode_e);
main_m->addEntry(gps_e);
main_m->addEntry(pid_e);
main_m->addEntry(akku_e);
main_m->addEntry(sys_e);
main_m->addEntry(contr_e);
main_m->addEntry(restart_e);