aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBen V. Brown <[email protected]>2019-12-28 12:00:34 +1100
committerBen V. Brown <[email protected]>2019-12-28 12:00:34 +1100
commit255f7009f2853d952b3038397d02c68943383469 (patch)
treebb8a108a8c44b6f9f649f02e190cdd908532c23e
parentda882fe27afdebdd919f181986db21a095a2e8b4 (diff)
downloadIronOS-255f7009f2853d952b3038397d02c68943383469.tar.gz
IronOS-255f7009f2853d952b3038397d02c68943383469.zip
Display the warning
-rw-r--r--workspace/TS100/Core/Src/GUIThread.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/workspace/TS100/Core/Src/GUIThread.cpp b/workspace/TS100/Core/Src/GUIThread.cpp
index cc504c3e..a836b021 100644
--- a/workspace/TS100/Core/Src/GUIThread.cpp
+++ b/workspace/TS100/Core/Src/GUIThread.cpp
@@ -504,7 +504,7 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
OLED::print(SolderingAdvancedPowerPrompt); // Power:
OLED::printNumber(x10WattHistory.average() / 10, 2);
OLED::print(SymbolDot);
- OLED::printNumber(x10WattHistory.average()% 10, 1);
+ OLED::printNumber(x10WattHistory.average() % 10, 1);
OLED::print(SymbolWatts);
if (systemSettings.sensitivity && systemSettings.SleepTime) {
@@ -702,6 +702,17 @@ void startGUITask(void const *argument __unused) {
ticks = xTaskGetTickCount(); // make timeout now so we will exit
GUIDelay();
}
+
+ if (settingsWereReset) {
+ //Display alert settings were reset
+ OLED::setFont(1);
+ OLED::setCursor(0, 0);
+ OLED::print(SettingsResetMessage);
+ OLED::refresh();
+ waitForButtonPressOrTimeout(1000);
+
+ }
+
if (systemSettings.autoStartMode) {
// jump directly to the autostart mode
if (systemSettings.autoStartMode == 1)