1
0
forked from me/IronOS

Update GUIThread.cpp

This commit is contained in:
Ben V. Brown
2022-01-05 21:04:33 +11:00
parent 827308f691
commit 52f0d5242a

View File

@@ -230,27 +230,27 @@ static void gui_solderingTempAdjust() {
if (getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)) { if (getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)) {
delta = -delta; delta = -delta;
} }
if (delta != 0) {
// constrain between the set temp limits, i.e. 10-450 C
int16_t newTemp = getSettingValue(SettingsOptions::SolderingTemp);
newTemp += delta;
// Round to nearest increment of delta
delta = abs(delta);
newTemp = (newTemp / delta) * delta;
// constrain between the set temp limits, i.e. 10-450 C if (getSettingValue(SettingsOptions::TemperatureInF)) {
int16_t newTemp = getSettingValue(SettingsOptions::SolderingTemp); if (newTemp > MAX_TEMP_F)
newTemp += delta; newTemp = MAX_TEMP_F;
// Round to nearest increment of delta if (newTemp < MIN_TEMP_F)
delta = abs(delta); newTemp = MIN_TEMP_F;
newTemp = (newTemp / delta) * delta; } else {
if (newTemp > MAX_TEMP_C)
if (getSettingValue(SettingsOptions::TemperatureInF)) { newTemp = MAX_TEMP_C;
if (newTemp > MAX_TEMP_F) if (newTemp < MIN_TEMP_C)
newTemp = MAX_TEMP_F; newTemp = MIN_TEMP_C;
if (newTemp < MIN_TEMP_F) }
newTemp = MIN_TEMP_F; setSettingValue(SettingsOptions::SolderingTemp, (uint16_t)newTemp);
} else {
if (newTemp > MAX_TEMP_C)
newTemp = MAX_TEMP_C;
if (newTemp < MIN_TEMP_C)
newTemp = MIN_TEMP_C;
} }
setSettingValue(SettingsOptions::SolderingTemp, (uint16_t)newTemp);
if (xTaskGetTickCount() - lastChange > (TICKS_SECOND * 2)) if (xTaskGetTickCount() - lastChange > (TICKS_SECOND * 2))
return; // exit if user just doesn't press anything for a bit return; // exit if user just doesn't press anything for a bit