From b165584b369915d36038b10a0350cdaf2495ea33 Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Tue, 9 Apr 2024 20:32:33 +1000 Subject: [PATCH] cleanup --- source/Core/Src/settingsGUI.cpp | 6 +++--- source/Core/Threads/UI/logic/Sleep.cpp | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/source/Core/Src/settingsGUI.cpp b/source/Core/Src/settingsGUI.cpp index 259bd42750..259c4286a6 100644 --- a/source/Core/Src/settingsGUI.cpp +++ b/source/Core/Src/settingsGUI.cpp @@ -116,7 +116,7 @@ static bool showHallEffect(void); // Menu functions -#if defined(POW_DC) || defined(POW_QC) +#if defined(POW_DC) || defined(POW_QC) || defined(POW_PD) static void displayPowerMenu(void); #endif /* POW_DC or POW_QC */ @@ -208,7 +208,7 @@ const menuitem rootSettingsMenu[] { * // Language * Exit */ -#if defined(POW_DC) || defined(POW_QC)|| defined(POW_PD) +#if defined(POW_DC) || defined(POW_QC) || defined(POW_PD) /* Power */ {0, nullptr, displayPowerMenu, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::NUM_ITEMS, 0}, #endif @@ -1003,7 +1003,7 @@ static void displayMenu(size_t index) { OLED::drawArea(OLED_WIDTH - SETTINGS_ICON_WIDTH - 2, 0, SETTINGS_ICON_WIDTH, SETTINGS_ICON_HEIGHT, (&SettingsMenuIcons[index][(SETTINGS_ICON_WIDTH * (SETTINGS_ICON_HEIGHT / 8)) * currentFrame])); } -#if defined(POW_DC) || defined(POW_QC) +#if defined(POW_DC) || defined(POW_QC) || defined(POW_PD) static void displayPowerMenu(void) { displayMenu(0); } #endif /* POW_DC or POW_QC */ diff --git a/source/Core/Threads/UI/logic/Sleep.cpp b/source/Core/Threads/UI/logic/Sleep.cpp index 9c86ead9ab..dad421ffde 100644 --- a/source/Core/Threads/UI/logic/Sleep.cpp +++ b/source/Core/Threads/UI/logic/Sleep.cpp @@ -32,7 +32,6 @@ OperatingMode gui_SolderingSleepingMode(const ButtonState buttons, guiContext *c ui_draw_soldering_detailed_sleep(tipTemp); } else { ui_draw_soldering_basic_sleep(tipTemp); - } if (!shouldBeSleeping()) {