Merge branch 'master' into alpine

source/Core/BSP/Miniware/configuration.h

@@ -56,7 +56,7 @@
  * OLED Orientation
  *
  */
-#define ORIENTATION_MODE           0 // 0: Right 1:Left 2:Automatic - Default right
+#define ORIENTATION_MODE           2 // 0: Right 1:Left 2:Automatic - Default Automatic
 #define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperature change
 
 /**

source/Core/BSP/Pine64/configuration.h

@@ -56,7 +56,7 @@
  * OLED Orientation
  *
  */
-#define ORIENTATION_MODE           0 // 0: Right 1:Left 2:Automatic - Default right
+#define ORIENTATION_MODE           2 // 0: Right 1:Left 2:Automatic - Default Automatic
 #define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperature change
 
 /**

source/Core/Src/gui.cpp

@@ -92,39 +92,45 @@ static bool settings_enterAdvancedMenu(void);
  *
  * Power Menu
  *  Power Source
+ *  -Minimum Voltage
+ *  QC Voltage
+ *  PD Timeout
  *
  * Soldering
- * 	Boost Mode Enabled
  * 	Boost Mode Temp
  * 	Auto Start
  *  Temp change short step
  *  Temp change long step
  *	Locking Mode
-
  *
  * Power Saving
- * 	Sleep Temp
- * 	Sleep Time
- * 	Shutdown Time
  * 	Motion Sensitivity
+ * 	-Sleep Temp
+ * 	-Sleep Time
+ * 	-Shutdown Time
  *
  * UI
  *  // Language
- *  Scrolling Speed
  *  Temperature Unit
  *  Display orientation
  *  Cooldown blink
+ *  Scrolling Speed
  *  Reverse Temp change buttons + -
- *
+ *  Animation Speed
- * Advanced
+ *  -Animation Loop
- *  Enable Power Limit
+ *  OLED Brightnes
- *  Power Limit
+ *  Invert Screen
  *  Detailed IDLE
  *  Detailed Soldering
- *  Logo Time
+ *
+ * Advanced
+ *  Power Limit
+ *  Factory Reset
  *  Calibrate Temperature
  *  Calibrate Input V
- *  Reset Settings
+ *  Power Pulse
+ *  -Power Pulse Delay
+ *  -Power Pulse duration
  *
  */
 const menuitem rootSettingsMenu[] {
@@ -154,6 +160,9 @@ const menuitem rootSettingsMenu[] {
 const menuitem powerMenu[] = {
 /*
  *  Power Source
+ *  -Minimum Voltage
+ *  QC Voltage
+ *  PD Timeout
  */
 #ifdef POW_DC
     {SETTINGS_DESC(SettingsItemIndex::DCInCutoff), nullptr, settings_displayInputVRange, nullptr, SettingsOptions::MinDCVoltageCells},                     /*Voltage input*/
@@ -170,11 +179,11 @@ const menuitem powerMenu[] = {
 #endif
 const menuitem solderingMenu[] = {
     /*
-     * Boost Mode Enabled
+     * 	Boost Temp
-     * 	Boost Mode Temp
      * 	Auto Start
      *  Temp change short step
      *  Temp change long step
+     *	Locking Mode
      */
     {SETTINGS_DESC(SettingsItemIndex::BoostTemperature), settings_setBoostTemp, settings_displayBoostTemp, nullptr, SettingsOptions::SettingsOptionsLength}, /*Boost Temp*/
     {SETTINGS_DESC(SettingsItemIndex::AutoStart), nullptr, settings_displayAutomaticStartMode, nullptr, SettingsOptions::AutoStartMode},                     /*Auto start*/
@@ -183,14 +192,36 @@ const menuitem solderingMenu[] = {
     {SETTINGS_DESC(SettingsItemIndex::LockingMode), nullptr, settings_displayLockingMode, nullptr, SettingsOptions::LockingMode},                            /*Locking Mode*/
     {0, nullptr, nullptr, nullptr, SettingsOptions::SettingsOptionsLength}                                                                                   // end of menu marker. DO NOT REMOVE
 };
+const menuitem PowerSavingMenu[] = {
+/*
+ * 	Motion Sensitivity
+ * 	-Sleep Temp
+ * 	-Sleep Time
+ * 	-Shutdown Time
+ */
+#ifndef NO_SLEEP_MODE
+    {SETTINGS_DESC(SettingsItemIndex::MotionSensitivity), nullptr, settings_displaySensitivity, nullptr, SettingsOptions::Sensitivity},                                        /* Motion Sensitivity*/
+    {SETTINGS_DESC(SettingsItemIndex::SleepTemperature), settings_setSleepTemp, settings_displaySleepTemp, settings_showSleepOptions, SettingsOptions::SettingsOptionsLength}, /*Sleep Temp*/
+    {SETTINGS_DESC(SettingsItemIndex::SleepTimeout), nullptr, settings_displaySleepTime, settings_showSleepOptions, SettingsOptions::SleepTime},                               /*Sleep Time*/
+    {SETTINGS_DESC(SettingsItemIndex::ShutdownTimeout), nullptr, settings_displayShutdownTime, settings_showSleepOptions, SettingsOptions::ShutdownTime},                      /*Shutdown Time*/
+#endif
+#ifdef HALL_SENSOR
+    {SETTINGS_DESC(SettingsItemIndex::HallEffSensitivity), nullptr, settings_displayHallEffect, nullptr, SettingsOptions::HallEffectSensitivity}, /* HallEffect Sensitivity*/
+#endif
+    {0, nullptr, nullptr, nullptr, SettingsOptions::SettingsOptionsLength} // end of menu marker. DO NOT REMOVE
+};
 const menuitem UIMenu[] = {
     /*
-     // Language
+     *  // Language
-     *  Scrolling Speed
      *  Temperature Unit
      *  Display orientation
      *  Cooldown blink
+     *  Scrolling Speed
      *  Reverse Temp change buttons + -
+     *  Animation Speed
+     *  -Animation Loop
+     *  OLED Brightnes
+     *  Invert Screen
      *  Detailed IDLE
      *  Detailed Soldering
      */
@@ -211,36 +242,16 @@ const menuitem UIMenu[] = {
     {SETTINGS_DESC(SettingsItemIndex::AdvancedSoldering), nullptr, settings_displayAdvancedSolderingScreens, nullptr, SettingsOptions::DetailedSoldering},  /*Advanced soldering screen*/
     {0, nullptr, nullptr, nullptr, SettingsOptions::SettingsOptionsLength}                                                                                  // end of menu marker. DO NOT REMOVE
 };
-const menuitem PowerSavingMenu[] = {
-/*
- *  Motion Sensitivity
- *  Sleep Temp
- * 	Sleep Time
- * 	Shutdown Time
- */
-#ifndef NO_SLEEP_MODE
-    {SETTINGS_DESC(SettingsItemIndex::MotionSensitivity), nullptr, settings_displaySensitivity, nullptr, SettingsOptions::Sensitivity},                                        /* Motion Sensitivity*/
-    {SETTINGS_DESC(SettingsItemIndex::SleepTemperature), settings_setSleepTemp, settings_displaySleepTemp, settings_showSleepOptions, SettingsOptions::SettingsOptionsLength}, /*Sleep Temp*/
-    {SETTINGS_DESC(SettingsItemIndex::SleepTimeout), nullptr, settings_displaySleepTime, settings_showSleepOptions, SettingsOptions::SleepTime},                               /*Sleep Time*/
-    {SETTINGS_DESC(SettingsItemIndex::ShutdownTimeout), nullptr, settings_displayShutdownTime, settings_showSleepOptions, SettingsOptions::ShutdownTime},                      /*Shutdown Time*/
-#endif
-#ifdef HALL_SENSOR
-    {SETTINGS_DESC(SettingsItemIndex::HallEffSensitivity), nullptr, settings_displayHallEffect, nullptr, SettingsOptions::HallEffectSensitivity}, /* HallEffect Sensitivity*/
-#endif
-    {0, nullptr, nullptr, nullptr, SettingsOptions::SettingsOptionsLength} // end of menu marker. DO NOT REMOVE
-};
 const menuitem advancedMenu[] = {
 
     /*
-     *  Power limit
+     *  Power Limit
+     *  Factory Reset
      *  Calibrate Temperature
      *  Calibrate Input V
-     *  Reset Settings
      *  Power Pulse
-     *  Animation Loop
+     *  -Power Pulse Delay
-     *  Animation Speed
+     *  -Power Pulse duration
-     *  Power Pulse Wait
-     *  Power Pulse Duration
      */
     {SETTINGS_DESC(SettingsItemIndex::PowerLimit), nullptr, settings_displayPowerLimit, nullptr, SettingsOptions::PowerLimit},                                        /*Power limit*/
     {SETTINGS_DESC(SettingsItemIndex::SettingsReset), settings_setResetSettings, settings_displayResetSettings, nullptr, SettingsOptions::SettingsOptionsLength},     /*Resets settings*/