Enforce shutdown off for MHP30

Ralim · Jul 28, 2023 · 88651ca · 88651ca
1 parent 2d3d357
commit 88651ca
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/source/Core/BSP/MHP30/configuration.h b/source/Core/BSP/MHP30/configuration.h
@@ -29,9 +29,9 @@
  * How many seconds/minutes we wait until going to sleep/shutdown.
  * Values -> SLEEP_TIME * 10; i.e. 5*10 = 50 Seconds!
  */
-#define SLEEP_TIME    5  // x10 Seconds
-#define SHUTDOWN_TIME 10 // Minutes
-
+#define SLEEP_TIME        5 // x10 Seconds
+#define SHUTDOWN_TIME     0 // Minutes
+#define MAX_SHUTDOWN_TIME 0 // No shutdown support
 /**
  * Auto start off for safety.
  * Pissible values are:
@@ -164,13 +164,13 @@
 #define HARDWARE_MAX_WATTAGE_X10 650
 #define TIP_THERMAL_MASS         65 // TODO, needs refinement
 #define TIP_RESISTANCE           60 // x10 ohms, ~6 typical
-#endif /* MHP30 */
+#endif                              /* MHP30 */
 
 #ifdef ACCEL_EXITS_ON_MOVEMENT
 #define NO_SLEEP_MODE
 #endif
 
-#define FLASH_LOGOADDR (0x08000000 + (62 * 1024))
+#define FLASH_LOGOADDR      (0x08000000 + (62 * 1024))
 #define SETTINGS_START_PAGE (0x08000000 + (127 * 1024))
 
 #endif /* CONFIGURATION_H_ */
diff --git a/source/Core/BSP/Miniware/configuration.h b/source/Core/BSP/Miniware/configuration.h
@@ -31,6 +31,7 @@
  */
 #define SLEEP_TIME    5  // x10 Seconds
 #define SHUTDOWN_TIME 10 // Minutes
+#define MAX_SHUTDOWN_TIME 60 // Minutes
 
 /**
  * Auto start off for safety.

diff --git a/source/Core/BSP/Pinecil/configuration.h b/source/Core/BSP/Pinecil/configuration.h
@@ -31,6 +31,7 @@
  */
 #define SLEEP_TIME    5  // x10 Seconds
 #define SHUTDOWN_TIME 10 // Minutes
+#define MAX_SHUTDOWN_TIME 60 // Minutes
 
 /**
  * Auto start off for safety.

diff --git a/source/Core/BSP/Pinecilv2/configuration.h b/source/Core/BSP/Pinecilv2/configuration.h
@@ -31,6 +31,7 @@
  */
 #define SLEEP_TIME    5  // x10 Seconds
 #define SHUTDOWN_TIME 10 // Minutes
+#define MAX_SHUTDOWN_TIME 60 // Minutes
 
 /**
  * Auto start off for safety.

diff --git a/source/Core/BSP/Sequre_S60/configuration.h b/source/Core/BSP/Sequre_S60/configuration.h
@@ -38,8 +38,9 @@
  * How many seconds/minutes we wait until going to sleep/shutdown.
  * Values -> SLEEP_TIME * 10; i.e. 5*10 = 50 Seconds!
  */
-#define SLEEP_TIME    5  // x10 Seconds
-#define SHUTDOWN_TIME 10 // Minutes
+#define SLEEP_TIME        5  // x10 Seconds
+#define SHUTDOWN_TIME     10 // Minutes
+#define MAX_SHUTDOWN_TIME 60 // Minutes
 
 /**
  * Auto start off for safety.
@@ -163,7 +164,7 @@
 #define OLED_I2CBB2
 
 #define MODEL_HAS_DCDC // We dont have DC/DC but have reallly fast PWM that gets us roughly the same place
-#endif /* S60 */
+#endif                 /* S60 */
 
 #define FLASH_LOGOADDR      (0x08000000 + (62 * 1024))
 #define SETTINGS_START_PAGE (0x08000000 + (63 * 1024))

diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp
@@ -62,7 +62,7 @@ static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOp
     {0, 1, 1, ANIMATION_LOOP},                                             // AnimationLoop
     {0, settingOffSpeed_t::MAX_VALUE - 1, 1, ANIMATION_SPEED},             // AnimationSpeed
     {0, 3, 1, AUTO_START_MODE},                                            // AutoStartMode
-    {0, 60, 1, SHUTDOWN_TIME},                                             // ShutdownTime
+    {0, MAX_SHUTDOWN_TIME, 1, SHUTDOWN_TIME},                              // ShutdownTime
     {0, 1, 1, COOLING_TEMP_BLINK},                                         // CoolingTempBlink
     {0, 1, 1, DETAILED_IDLE},                                              // DetailedIDLE
     {0, 1, 1, DETAILED_SOLDERING},                                         // DetailedSoldering