sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Clean up soldering temp adjust button handling

Browse Source
This commit is contained in:
Ben V. Brown
2022-01-05 20:41:38 +11:00
parent 8c25937f20
commit 26c7d0f2cb
2 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/Core/Src/Settings.cpp
View File

@@ -29,7 +29,7 @@ typedef struct {
uint16_t versionMarker; uint16_t versionMarker;
uint16_t length; // Length of valid bytes following uint16_t length; // Length of valid bytes following
uint16_t settingsValues[SettingsOptionsLength]; uint16_t settingsValues[SettingsOptionsLength];
// used to make this nicely "good enough" aligned to 32 butes to make driver code trivial // used to make this nicely "good enough" aligned to 32 bytes to make driver code trivial
uint32_t padding; uint32_t padding;
} systemSettingsType; } systemSettingsType;

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

@@ -202,36 +202,23 @@ static void gui_solderingTempAdjust() {
break; break;
case BUTTON_B_LONG: case BUTTON_B_LONG:
if (xTaskGetTickCount() - autoRepeatTimer + autoRepeatAcceleration > PRESS_ACCEL_INTERVAL_MAX) { if (xTaskGetTickCount() - autoRepeatTimer + autoRepeatAcceleration > PRESS_ACCEL_INTERVAL_MAX) {
if (getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)) { delta = -getSettingValue(SettingsOptions::TempChangeLongStep);
delta = getSettingValue(SettingsOptions::TempChangeLongStep);
} else
delta = -getSettingValue(SettingsOptions::TempChangeLongStep);
autoRepeatTimer = xTaskGetTickCount(); autoRepeatTimer = xTaskGetTickCount();
autoRepeatAcceleration += PRESS_ACCEL_STEP; autoRepeatAcceleration += PRESS_ACCEL_STEP;
} }
break; break;
case BUTTON_B_SHORT: case BUTTON_B_SHORT:
if (getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)) { delta = -getSettingValue(SettingsOptions::TempChangeShortStep);
delta = getSettingValue(SettingsOptions::TempChangeShortStep);
} else
delta = -getSettingValue(SettingsOptions::TempChangeShortStep);
break; break;
case BUTTON_F_LONG: case BUTTON_F_LONG:
if (xTaskGetTickCount() - autoRepeatTimer + autoRepeatAcceleration > PRESS_ACCEL_INTERVAL_MAX) { if (xTaskGetTickCount() - autoRepeatTimer + autoRepeatAcceleration > PRESS_ACCEL_INTERVAL_MAX) {
if (getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)) { delta = getSettingValue(SettingsOptions::TempChangeLongStep);
delta = -getSettingValue(SettingsOptions::TempChangeLongStep);
} else
delta = getSettingValue(SettingsOptions::TempChangeLongStep);
autoRepeatTimer = xTaskGetTickCount(); autoRepeatTimer = xTaskGetTickCount();
autoRepeatAcceleration += PRESS_ACCEL_STEP; autoRepeatAcceleration += PRESS_ACCEL_STEP;
} }
break; break;
case BUTTON_F_SHORT: case BUTTON_F_SHORT:
if (getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)) { delta = getSettingValue(SettingsOptions::TempChangeShortStep);
delta = -getSettingValue(SettingsOptions::TempChangeShortStep);
} else
delta = getSettingValue(SettingsOptions::TempChangeShortStep);
break; break;
default: default:
break; break;
@@ -239,6 +226,9 @@ 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 (getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)) {
delta = -delta;
}
// constrain between 10-450 C // constrain between 10-450 C
uint16_t newTemp = getSettingValue(SettingsOptions::SolderingTemp); uint16_t newTemp = getSettingValue(SettingsOptions::SolderingTemp);
newTemp += delta; newTemp += delta;