aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBen V. Brown <[email protected]>2021-09-15 19:24:19 +1000
committerBen V. Brown <[email protected]>2021-09-15 19:24:19 +1000
commitebde786ca1499cdfa3fe1bb92e4d5e199a09bdee (patch)
treeeeac2ab72a1a4e0046de224cc940ed8ccfaa6e40
parentbfca4c93368400a534d217acb2985b6e8fb64215 (diff)
downloadIronOS-ebde786ca1499cdfa3fe1bb92e4d5e199a09bdee.tar.gz
IronOS-ebde786ca1499cdfa3fe1bb92e4d5e199a09bdee.zip
Bugfixes for settings menu
-rw-r--r--source/Core/Src/Settings.cpp2
-rw-r--r--source/Core/Src/gui.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp
index fddc3de6..b838ba76 100644
--- a/source/Core/Src/Settings.cpp
+++ b/source/Core/Src/Settings.cpp
@@ -144,7 +144,7 @@ bool nextSettingValue(const enum SettingsOptions option) {
} else {
systemSettings.settingsValues[(int)option] += constants.increment;
}
- return (constants.max - systemSettings.settingsValues[(int)option]) < constants.increment;
+ return (constants.max - systemSettings.settingsValues[(int)option]) <= constants.increment;
}
bool prevSettingValue(const enum SettingsOptions option) {
diff --git a/source/Core/Src/gui.cpp b/source/Core/Src/gui.cpp
index c4ffa8c3..f9855d4d 100644
--- a/source/Core/Src/gui.cpp
+++ b/source/Core/Src/gui.cpp
@@ -409,7 +409,7 @@ static bool settings_displayShutdownTime(void) {
return false;
}
static bool settings_setTempF(void) {
- nextSettingValue(SettingsOptions::TemperatureInF);
+ bool res = nextSettingValue(SettingsOptions::TemperatureInF);
uint16_t BoostTemp = getSettingValue(SettingsOptions::BoostTemp);
uint16_t SolderingTemp = getSettingValue(SettingsOptions::SolderingTemp);
uint16_t SleepTemp = getSettingValue(SettingsOptions::SleepTemp);
@@ -438,7 +438,7 @@ static bool settings_setTempF(void) {
setSettingValue(SettingsOptions::SolderingTemp, SolderingTemp);
setSettingValue(SettingsOptions::SleepTemp, SleepTemp);
- return false;
+ return res;
}
static bool settings_displayTempF(void) {