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

Add some rounding

Browse Source
This commit is contained in:
Ben V. Brown
2022-01-05 21:00:14 +11:00
parent 26c7d0f2cb
commit 827308f691
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/Core/Threads/GUIThread.cpp
View File

@@ -226,12 +226,18 @@ static void gui_solderingTempAdjust() {
if ((PRESS_ACCEL_INTERVAL_MAX - autoRepeatAcceleration) < PRESS_ACCEL_INTERVAL_MIN) { if ((PRESS_ACCEL_INTERVAL_MAX - autoRepeatAcceleration) < PRESS_ACCEL_INTERVAL_MIN) {
autoRepeatAcceleration = PRESS_ACCEL_INTERVAL_MAX - PRESS_ACCEL_INTERVAL_MIN; autoRepeatAcceleration = PRESS_ACCEL_INTERVAL_MAX - PRESS_ACCEL_INTERVAL_MIN;
} }
// If buttons are flipped; flip the delta
if (getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)) { if (getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)) {
delta = -delta; delta = -delta;
} }
// constrain between 10-450 C
uint16_t newTemp = getSettingValue(SettingsOptions::SolderingTemp); // constrain between the set temp limits, i.e. 10-450 C
int16_t newTemp = getSettingValue(SettingsOptions::SolderingTemp);
newTemp += delta; newTemp += delta;
// Round to nearest increment of delta
delta = abs(delta);
newTemp = (newTemp / delta) * delta;
if (getSettingValue(SettingsOptions::TemperatureInF)) { if (getSettingValue(SettingsOptions::TemperatureInF)) {
if (newTemp > MAX_TEMP_F) if (newTemp > MAX_TEMP_F)
newTemp = MAX_TEMP_F; newTemp = MAX_TEMP_F;
@@ -243,7 +249,7 @@ static void gui_solderingTempAdjust() {
if (newTemp < MIN_TEMP_C) if (newTemp < MIN_TEMP_C)
newTemp = MIN_TEMP_C; newTemp = MIN_TEMP_C;
} }
setSettingValue(SettingsOptions::SolderingTemp, newTemp); 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