sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Turn off power menu if no options

Browse Source
This commit is contained in:
Ben V. Brown
2021-05-04 19:05:20 +10:00
parent b10a65dd74
commit a3b37fabf6
1 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
source/Core/Src/gui.cpp
View File

@@ -83,8 +83,11 @@ static bool settings_displayHallEffect(void);
static bool settings_setHallEffect(void); static bool settings_setHallEffect(void);
#endif #endif
// Menu functions // Menu functions
#if defined(POW_DC) || defined(POW_QC)
static bool settings_displayPowerMenu(void); static bool settings_displayPowerMenu(void);
static bool settings_enterPowerMenu(void); static bool settings_enterPowerMenu(void);
#endif
static bool settings_displaySolderingMenu(void); static bool settings_displaySolderingMenu(void);
static bool settings_enterSolderingMenu(void); static bool settings_enterSolderingMenu(void);
static bool settings_displayPowerSavingMenu(void); static bool settings_displayPowerSavingMenu(void);
@@ -133,24 +136,30 @@ static bool settings_enterAdvancedMenu(void);
* Reset Settings * Reset Settings
* *
*/ */
const menuitem rootSettingsMenu[]{ const menuitem rootSettingsMenu[] {
/* /*
* Power Menu * Power Menu
* Soldering Menu * Soldering Menu
* Power Saving Menu * Power Saving Menu
* UI Menu * UI Menu
* Advanced Menu * Advanced Menu
* Exit * Exit
*/ */
{0, settings_enterPowerMenu, settings_displayPowerMenu}, /*Power*/
{0, settings_enterSolderingMenu, settings_displaySolderingMenu}, /*Soldering*/ #if defined(POW_DC) || defined(POW_QC)
{0, settings_enterPowerSavingMenu, settings_displayPowerSavingMenu}, /*Sleep Options Menu*/ {0, settings_enterPowerMenu, settings_displayPowerMenu}, /*Power*/
{0, settings_enterUIMenu, settings_displayUIMenu}, /*UI Menu*/ #endif
{0, settings_enterAdvancedMenu, settings_displayAdvancedMenu}, /*Advanced Menu*/ {0, settings_enterSolderingMenu, settings_displaySolderingMenu}, /*Soldering*/
{0, settings_setLanguageSwitch, settings_displayLanguageSwitch}, /*Language Switch*/ {0, settings_enterPowerSavingMenu, settings_displayPowerSavingMenu}, /*Sleep Options Menu*/
{0, nullptr, nullptr} // end of menu marker. DO NOT REMOVE {0, settings_enterUIMenu, settings_displayUIMenu}, /*UI Menu*/
{0, settings_enterAdvancedMenu, settings_displayAdvancedMenu}, /*Advanced Menu*/
{0, settings_setLanguageSwitch, settings_displayLanguageSwitch}, /*Language Switch*/
{
0, nullptr, nullptr
} // end of menu marker. DO NOT REMOVE
}; };
#if defined(POW_DC) || defined(POW_QC)
const menuitem powerMenu[] = { const menuitem powerMenu[] = {
/* /*
* Power Source * Power Source
@@ -164,6 +173,7 @@ const menuitem powerMenu[] = {
#endif #endif
{0, nullptr, nullptr} // end of menu marker. DO NOT REMOVE {0, nullptr, nullptr} // end of menu marker. DO NOT REMOVE
}; };
#endif
const menuitem solderingMenu[] = { const menuitem solderingMenu[] = {
/* /*
* Boost Mode Enabled * Boost Mode Enabled
@@ -1039,6 +1049,8 @@ static bool settings_displayCalibrateVIN(void) {
printShortDescription(SettingsItemIndex::VoltageCalibration, 5); printShortDescription(SettingsItemIndex::VoltageCalibration, 5);
return false; return false;
} }
#if defined(POW_DC) || defined(POW_QC)
static bool settings_displayPowerMenu(void) { static bool settings_displayPowerMenu(void) {
displayMenu(0); displayMenu(0);
return false; return false;
@@ -1047,6 +1059,7 @@ static bool settings_enterPowerMenu(void) {
gui_Menu(powerMenu); gui_Menu(powerMenu);
return false; return false;
} }
#endif
static bool settings_displaySolderingMenu(void) { static bool settings_displaySolderingMenu(void) {
displayMenu(1); displayMenu(1);
return false; return false;