me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More settings rework

Browse Source
This commit is contained in:
Ben V. Brown
2023-07-19 23:13:13 +10:00
parent 5120235e2e
commit b38a5396f0
6 changed files with 149 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/Core/Src/settingsGUI.cpp
View File

@@ -440,6 +440,12 @@ const menuitem advancedMenu[] = {
/* clang-format on */
extern const menuitem *subSettingsMenus[] {
#if defined(POW_DC) || defined(POW_QC) || defined(POW_PD)
powerMenu,
#endif
solderingMenu, PowerSavingMenu, UIMenu, advancedMenu,
};
/* ^^^ !!!ENABLE CLANG-FORMAT back!!! ^^^ */
/**
@@ -460,10 +466,9 @@ static void printShortDescription(SettingsItemIndex settingsItemIndex, uint16_t
}
static int userConfirmation(const char *message) {
ScrollMessage scrollMessage;
TickType_t tickStart = xTaskGetTickCount();
for (;;) {
bool lcdRefresh = scrollMessage.drawUpdate(message, xTaskGetTickCount());
drawScrollingText(message, xTaskGetTickCount() - tickStart);
ButtonState buttons = getButtonState();
switch (buttons) {
@@ -481,10 +486,8 @@ static int userConfirmation(const char *message) {
return 0;
}
if (lcdRefresh) {
OLED::refresh();
osDelay(40);
}
OLED::refresh();
osDelay(40);
}
return 0;
}