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

Update TemperatureAdjust.cpp

Browse Source
This commit is contained in:
Ben V. Brown
2023-07-11 23:59:54 +10:00
parent 5303d27f96
commit 0ec45f29a4
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
source/Core/Threads/OperatingModes/TemperatureAdjust.cpp
View File

@@ -1,17 +1,17 @@
#include "OperatingModes.h" #include "OperatingModes.h"
OperatingMode gui_solderingTempAdjust(const ButtonState buttons, guiContext *cxt) { OperatingMode gui_solderingTempAdjust(const ButtonState buttons, guiContext *cxt) {
currentTempTargetDegC = 0; // Turn off heater while adjusting temp currentTempTargetDegC = 0; // Turn off heater while adjusting temp
uint16_t *buttonLockout = &(cxt->scratch_state.state1); uint16_t *waitForRelease = &(cxt->scratch_state.state1);
uint32_t *lastButtonTime = &(cxt->scratch_state.state3); uint32_t *autoRepeatTimer = &(cxt->scratch_state.state3);
uint16_t *buttonAccel = &(cxt->scratch_state.state2); uint16_t *autoRepeatAcceleration = &(cxt->scratch_state.state2);
if (*buttonLockout == 0) { if (*waitForRelease == 0) {
// When we first enter we wait for the user to release buttons before enabling changes // When we first enter we wait for the user to release buttons before enabling changes
if (buttons != BUTTON_NONE) { if (buttons != BUTTON_NONE) {
return OperatingMode::TemperatureAdjust; return OperatingMode::TemperatureAdjust;
} }
(*buttonLockout)++; (*waitForRelease)++;
} }
OLED::setCursor(0, 0); OLED::setCursor(0, 0);
@@ -20,26 +20,26 @@ OperatingMode gui_solderingTempAdjust(const ButtonState buttons, guiContext *cxt
switch (buttons) { switch (buttons) {
case BUTTON_NONE: case BUTTON_NONE:
// stay // stay
(*buttonAccel) = 0; (*autoRepeatAcceleration) = 0;
break; break;
case BUTTON_BOTH: case BUTTON_BOTH:
// exit // exit
return cxt->previousMode; return cxt->previousMode;
case BUTTON_B_LONG: case BUTTON_B_LONG:
if (xTaskGetTickCount() - (*lastButtonTime) + (*buttonAccel) > PRESS_ACCEL_INTERVAL_MAX) { if (xTaskGetTickCount() - (*autoRepeatTimer) + (*autoRepeatAcceleration) > PRESS_ACCEL_INTERVAL_MAX) {
delta = -getSettingValue(SettingsOptions::TempChangeLongStep); delta = -getSettingValue(SettingsOptions::TempChangeLongStep);
(*lastButtonTime) = xTaskGetTickCount(); (*autoRepeatTimer) = xTaskGetTickCount();
(*buttonAccel) += PRESS_ACCEL_STEP; (*autoRepeatAcceleration) += PRESS_ACCEL_STEP;
} }
break; break;
case BUTTON_B_SHORT: case BUTTON_B_SHORT:
delta = -getSettingValue(SettingsOptions::TempChangeShortStep); delta = -getSettingValue(SettingsOptions::TempChangeShortStep);
break; break;
case BUTTON_F_LONG: case BUTTON_F_LONG:
if (xTaskGetTickCount() - (*lastButtonTime) + (*buttonAccel) > PRESS_ACCEL_INTERVAL_MAX) { if (xTaskGetTickCount() - (*autoRepeatTimer) + (*autoRepeatAcceleration) > PRESS_ACCEL_INTERVAL_MAX) {
delta = getSettingValue(SettingsOptions::TempChangeLongStep); delta = getSettingValue(SettingsOptions::TempChangeLongStep);
(*lastButtonTime) = xTaskGetTickCount(); (*autoRepeatTimer) = xTaskGetTickCount();
(*buttonAccel) += PRESS_ACCEL_STEP; (*autoRepeatAcceleration) += PRESS_ACCEL_STEP;
} }
break; break;
case BUTTON_F_SHORT: case BUTTON_F_SHORT:
@@ -48,8 +48,8 @@ OperatingMode gui_solderingTempAdjust(const ButtonState buttons, guiContext *cxt
default: default:
break; break;
} }
if ((PRESS_ACCEL_INTERVAL_MAX - (*buttonAccel)) < PRESS_ACCEL_INTERVAL_MIN) { if ((PRESS_ACCEL_INTERVAL_MAX - (*autoRepeatAcceleration)) < PRESS_ACCEL_INTERVAL_MIN) {
(*buttonAccel) = 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 buttons are flipped; flip the delta
if (getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)) { if (getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)) {