From 996390cccaf0030705b1a59c6f0a5126d41567b9 Mon Sep 17 00:00:00 2001
From: Alexander Klein <alex@kleiax.de>
Date: Wed, 26 Apr 2023 15:56:34 +0200
Subject: [PATCH] some menu improvements

---
 lib/MotorControl/motorControl.h                            | 2 +-
 src/SpecialMenus/GPS/menuGPS.cpp                           | 6 ++++++
 src/SpecialMenus/driveModi/Autopilot/menuAutopilot.cpp     | 4 ----
 src/SpecialMenus/driveModi/Autopilot/menuAutopilot.h       | 5 +----
 src/SpecialMenus/driveModi/CaptureRoute/menuCaptureRoute.h | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/MotorControl/motorControl.h b/lib/MotorControl/motorControl.h
index 4743261..287fbd9 100644
--- a/lib/MotorControl/motorControl.h
+++ b/lib/MotorControl/motorControl.h
@@ -21,7 +21,7 @@
 #define PWMRES 8
 #define POWERSTEPS 2       //  A total of 20 levels ( 100 / SPEED_STEPS ) * RUN_MOTOR_CONTROL_DELAY = 500ms
 #define PWMMIN 55
-#define PWMMAX 95         // Max 98% of 2^PWM_RES
+#define PWMMAX 80         // Max 98% of 2^PWM_RES
 
 /**
  * @brief A class which use PWM to control the power of DC Motor
diff --git a/src/SpecialMenus/GPS/menuGPS.cpp b/src/SpecialMenus/GPS/menuGPS.cpp
index 474739f..4713b6d 100644
--- a/src/SpecialMenus/GPS/menuGPS.cpp
+++ b/src/SpecialMenus/GPS/menuGPS.cpp
@@ -49,10 +49,16 @@ void MenuGPS::printPage() const {
             lineOne = "Time: ";
             lineTwo = "";
             if (fixType) {
+                if (gpsData->hour < 10)
+                    lineTwo.concat("0");
                 lineTwo.concat(gpsData->hour);
                 lineTwo.concat(":");
+                if (gpsData->min < 10)
+                    lineTwo.concat("0");
                 lineTwo.concat(gpsData->min);
                 lineTwo.concat(":");
+                if (gpsData->sec < 10)
+                    lineTwo.concat("0");
                 lineTwo.concat(gpsData->sec);
             } else
                 lineTwo = "00:00:00";
diff --git a/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.cpp b/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.cpp
index 30dc119..d7fa953 100644
--- a/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.cpp
+++ b/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.cpp
@@ -64,10 +64,6 @@ void MenuAutopilot::printMenu() {
 }
 
 void MenuAutopilot::update() {
-    if (millis() - this->lastMillis < this->minDelay)
-        return;
-    this->lastMillis = millis();
-
     if (!this->autopilot->shouldUpdate())
         return;
 
diff --git a/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.h b/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.h
index b06c788..af88ecb 100644
--- a/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.h
+++ b/src/SpecialMenus/driveModi/Autopilot/menuAutopilot.h
@@ -41,16 +41,13 @@ class MenuAutopilot : public MenuDriveMode {
         /**
          * @brief can be called to update shown data
          */
-        void update();
+        void update() override;
 
     private:
         void init();
 
         Autopilot* autopilot;
         RouteInfo routeInfo;
-
-        uint32_t lastMillis = 0;
-        uint16_t minDelay = 1500;
 };
 
 #endif // MENU_AUTOPILOT_DRIVE_H
diff --git a/src/SpecialMenus/driveModi/CaptureRoute/menuCaptureRoute.h b/src/SpecialMenus/driveModi/CaptureRoute/menuCaptureRoute.h
index 3aa441c..cf6b2f5 100644
--- a/src/SpecialMenus/driveModi/CaptureRoute/menuCaptureRoute.h
+++ b/src/SpecialMenus/driveModi/CaptureRoute/menuCaptureRoute.h
@@ -40,7 +40,7 @@ class MenuCaptureRoute : public MenuDriveMode {
         /**
          * @brief can be called to update shown data
          */
-        void update();
+        void update() override;
 
     private:
         void init();