fix bug in route add akku menu begin with akkuread

src/main.cpp

@@ -6,19 +6,18 @@
 
 #include "config.h"
 
-
-#include "driveModi/Modi/ManualControl/manualControl.h"
 #include "driveModi/driveManager.h"
 #include "moveControl.h"
 #include "network.h"
 
 #include "menu.h"
 #include "menuAction.h"
-#include "SpecialMenus/PID/menuPidSettings.h"
 #include "SpecialMenus/driveModi/ManualDrive/menuManualDrive.h"
 #include "SpecialMenus/driveModi/CaptureRoute/menuCaptureRoute.h"
 #include "SpecialMenus/driveModi/Autopilot/menuAutopilot.h"
+#include "SpecialMenus/PID/menuPidSettings.h"
 #include "SpecialMenus/GPS/menuGPS.h"
+#include "SpecialMenus/Akku/menuAkku.h"
 
 MoveControl moveController;
 DriveManager driveManager(&moveController);
@@ -69,6 +68,7 @@ void setup() {
     MenuCaptureRoute* cap_m = new MenuCaptureRoute(&driveManager);
     MenuAutopilot* auto_m = new MenuAutopilot(&driveManager);
     MenuGPS* gps_m = new MenuGPS(driveManager.getNavigation()->getGPS());
+    MenuAkku* akku_m = new MenuAkku();
 
     // Set Menus on LCD
     main_m->setLcd(lcd);
@@ -80,6 +80,7 @@ void setup() {
     cap_m->setLcd(lcd);
     auto_m->setLcd(lcd);
     gps_m->setLcd(lcd);
+    akku_m->setLcd(lcd);
 
 
     // Entry for the main menu
@@ -87,9 +88,11 @@ void setup() {
     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("Akku", akku_m);
     main_m->addEntry(mode_e);
     main_m->addEntry(gps_e);
     main_m->addEntry(pid_e);
+    main_m->addEntry(akku_e);
     main_m->addEntry(restart_e);
 
     // Entry for the mode Menu
@@ -100,8 +103,8 @@ void setup() {
     MenuAction* testMode_e = new MenuAction("Test Mode", dummy);
     mode_m->addEntry(autopilot_e);
     mode_m->addEntry(captureRoute_e);
-    mode_m->addEntry(consolControl_e);
     mode_m->addEntry(manualControl_e);
+    mode_m->addEntry(consolControl_e);
     mode_m->addEntry(testMode_e);
 
     // Entry for the PID Menu
@@ -143,9 +146,7 @@ void callbackControllerAction() {
         else if (Ps3.data.button.circle)
             main_m->yes();
         else if (Ps3.data.button.cross)
-            main_m->no();   
-        else if (Ps3.data.button.ps)
-            controllerPrintBattery();
+            main_m->no();
 
         isDelayReached(true);        
     }
@@ -162,26 +163,9 @@ void callbackControllerConnect() {
     main_m->printMenu();
 }
 
-void controllerPrintBattery() {
-    static uint8_t controller_battery = -1;
-    if( controller_battery != Ps3.data.status.battery ){
-        controller_battery = Ps3.data.status.battery;
-    }
-
-    Serial.print("The controller battery is ");
-    if( controller_battery == ps3_status_battery_charging )      printf("charging\n");
-    else if( controller_battery == ps3_status_battery_full )     printf("FULL\n");
-    else if( controller_battery == ps3_status_battery_high )     printf("HIGH\n");
-    else if( controller_battery == ps3_status_battery_low)       printf("LOW\n");
-    else if( controller_battery == ps3_status_battery_dying )    printf("DYING\n");
-    else if( controller_battery == ps3_status_battery_shutdown ) printf("SHUTDOWN\n");
-    else printf("UNDEFINED\n");
-}
-
 void i2cScanner() {
     std::cout << "\nI2C Scanner" << std::endl;
 
-
     byte error, address;
     int nDevices;
     Serial.println("Scanning...");
@@ -211,4 +195,4 @@ void i2cScanner() {
 
 void restart() {
     ESP.restart();
-}
+}