* Starting GUI render refactor to be more immediate mode Update TemperatureAdjust.cpp . Cleanup Soldering Sleep SolderingProfiles Soldering Rework Rough pass GUI Temp Adjust Cleanup old OperatingMode Debug Menu * Update TemperatureAdjust.cpp * Roughing some transition work * Fixup! Hook in the init starter helper * Better home screen button handler * FIXUP! Fix typo's . * Update SettingsMenu.cpp * More settings rework * More settings rendering * Fixup * Transitions Update SolderingProfile.cpp Hook in transistions * Update TemperatureAdjust.cpp * Update push.yml * Add auto-repeat to settings menu * Miniware: Use IT for I2C writes * Update USBPDDebug_HUSB238.cpp * Force write screen on side animation cancel . * Refactor moving down the settings list * Update settingsGUI.cpp * Update I2C_Wrapper.cpp * Update OLED.cpp * Rework button handling * Fix PD debug at boot * Fixup not showing right menu options * silence some warnings * Style cleanup * Fkit use bit-bang I2C for Miniware * Update GUIRendering.md * Fixup transition on enter soldering mode * Save Settings * Fixes for some animations not running Dont bail on animations if keypress is still held * Fixup settings acceleration * OLED Up animation * Link up/down on debug meny * Make all accelerometers I2C bus aware Update accelerometers_common.h * Make I2C mag optional * Miniware -> Only Bit-Bang I2C * Fixup for scrollbar FIXUP! Debug menu returns to home screen FIXUP! Up oled animation Fix temp exit * Settings menu -> Both buttons return a menu layer * Merge fixup * Update BMA223.cpp * Re-Enable OLED sleep * Save Setting on temp adjust exit * WiP on startup mode * Some autostart working * Add hibernation mode & more autostart fixes * If cant CJC; go to startup * Hibernate in sleep * Cleanup scroll indicator * FIXUP! Ensure startup warnings are linked in * FIXUP! Ensure we render out temp change before timing out * Ensure 100ms delay between CJC samples * Fix not re-calculating menu length on entering menu * Implement NegotiationinProgress for USB-PD * Mask heating until PD finishes negotiation * Fixup staying in hibernate correctly * Warning timeout * Show reset settings warning * Correctly compensate help text start time * Update GUIThread.cpp * Update USBPD.cpp * . * Fixup sleep time * Update printSleepCountdown.cpp * replacing countdown with big plus while in boost mode * bringing back the + 1 since it was missing when not in boost mode * Bail on USB-PD check after 3 seconds incase of DC source * Fix hibernate * Update PIDThread.cpp * did center plus symbol (boost mode) * Big refactor to not make settings increment handler handle the "is last item" return * Fixup boot logo * Fix flashing * Fixup recalculate the menu length on long hold * Fixup missing menu entries * Fix junk left on screen after user confirmation * Re-order button handler to use custom, then default order to allow setting associated setting * Attach setting for settings using custom handler * Fix swap +/- keys * Fix boost temp * Implement last menu option for Language selector * Wait for init before CJC runs * Check last setting via increment value * Update BSP.cpp * removed = from >= Otherwise incrementing would stop and the scroll bar would already flash at the second to last value. * (Hacky) Fix for Settings reset --------- Co-authored-by: discip <53649486+discip@users.noreply.github.com>
176 lines
5.4 KiB
C++
176 lines
5.4 KiB
C++
|
|
#include "OperatingModes.h"
|
|
#include "SolderingCommon.h"
|
|
// State 1 = button locking
|
|
// State 2 = boost mode
|
|
// State 3 = buzzer timer
|
|
|
|
OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt) {
|
|
if (cxt->scratch_state.state1 == 1) {
|
|
// Buttons are currently locked
|
|
if (buttons == BUTTON_F_LONG) {
|
|
if (getSettingValue(SettingsOptions::BoostTemp) && (getSettingValue(SettingsOptions::LockingMode) == 1)) {
|
|
cxt->scratch_state.state2 = 1;
|
|
}
|
|
} else if (buttons == BUTTON_BOTH_LONG) {
|
|
// Unlocking
|
|
if (warnUser(translatedString(Tr->UnlockingKeysString), buttons)) {
|
|
cxt->scratch_state.state1 = 0;
|
|
}
|
|
} else if (buttons != BUTTON_NONE) {
|
|
// Do nothing and display a lock warning
|
|
warnUser(translatedString(Tr->WarningKeysLockedString), buttons);
|
|
}
|
|
return OperatingMode::Soldering;
|
|
}
|
|
// otherwise we are unlocked
|
|
switch (buttons) {
|
|
case BUTTON_NONE:
|
|
cxt->scratch_state.state2 = 0;
|
|
break;
|
|
case BUTTON_BOTH:
|
|
/*Fall through*/
|
|
case BUTTON_B_LONG:
|
|
cxt->transitionMode = TransitionAnimation::Right;
|
|
return OperatingMode::HomeScreen;
|
|
case BUTTON_F_LONG:
|
|
// if boost mode is enabled turn it on
|
|
if (getSettingValue(SettingsOptions::BoostTemp)) {
|
|
cxt->scratch_state.state2 = 1;
|
|
}
|
|
break;
|
|
case BUTTON_F_SHORT:
|
|
case BUTTON_B_SHORT:
|
|
cxt->transitionMode = TransitionAnimation::Left;
|
|
return OperatingMode::TemperatureAdjust;
|
|
case BUTTON_BOTH_LONG:
|
|
if (getSettingValue(SettingsOptions::LockingMode) != 0) {
|
|
// Lock buttons
|
|
if (warnUser(translatedString(Tr->LockingKeysString), buttons)) {
|
|
cxt->scratch_state.state1 = 1;
|
|
}
|
|
}
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
return OperatingMode::Soldering;
|
|
}
|
|
OperatingMode gui_solderingMode(const ButtonState buttons, guiContext *cxt) {
|
|
/*
|
|
* * Soldering (gui_solderingMode)
|
|
* -> Main loop where we draw temp, and animations
|
|
* --> User presses buttons and they goto the temperature adjust screen
|
|
* ---> Display the current setpoint temperature
|
|
* ---> Use buttons to change forward and back on temperature
|
|
* ---> Both buttons or timeout for exiting
|
|
* --> Long hold front button to enter boost mode
|
|
* ---> Just temporarily sets the system into the alternate temperature for
|
|
* PID control
|
|
* --> Long hold back button to exit
|
|
* --> Double button to exit
|
|
* --> Long hold double button to toggle key lock
|
|
*/
|
|
|
|
// Update the setpoints for the temperature
|
|
if (cxt->scratch_state.state2) {
|
|
if (getSettingValue(SettingsOptions::TemperatureInF)) {
|
|
currentTempTargetDegC = TipThermoModel::convertFtoC(getSettingValue(SettingsOptions::BoostTemp));
|
|
} else {
|
|
currentTempTargetDegC = (getSettingValue(SettingsOptions::BoostTemp));
|
|
}
|
|
} else {
|
|
if (getSettingValue(SettingsOptions::TemperatureInF)) {
|
|
currentTempTargetDegC = TipThermoModel::convertFtoC(getSettingValue(SettingsOptions::SolderingTemp));
|
|
} else {
|
|
currentTempTargetDegC = (getSettingValue(SettingsOptions::SolderingTemp));
|
|
}
|
|
}
|
|
|
|
// Update status
|
|
int error = currentTempTargetDegC - TipThermoModel::getTipInC();
|
|
if (error >= -10 && error <= 10) {
|
|
// converged
|
|
if (!cxt->scratch_state.state5) {
|
|
setBuzzer(true);
|
|
cxt->scratch_state.state3 = xTaskGetTickCount() + TICKS_SECOND / 3;
|
|
cxt->scratch_state.state5 = true;
|
|
}
|
|
setStatusLED(LED_HOT);
|
|
} else {
|
|
setStatusLED(LED_HEATING);
|
|
cxt->scratch_state.state5 = false;
|
|
}
|
|
if (cxt->scratch_state.state3 != 0 && xTaskGetTickCount() >= cxt->scratch_state.state3) {
|
|
setBuzzer(false);
|
|
}
|
|
|
|
// Draw in the screen details
|
|
if (getSettingValue(SettingsOptions::DetailedSoldering)) {
|
|
if (OLED::getRotation()) {
|
|
OLED::setCursor(50, 0);
|
|
} else {
|
|
OLED::setCursor(-1, 0);
|
|
}
|
|
|
|
gui_drawTipTemp(true, FontStyle::LARGE);
|
|
|
|
if (cxt->scratch_state.state2) { // Boost mode is on
|
|
if (OLED::getRotation()) {
|
|
OLED::setCursor(34, 0);
|
|
} else {
|
|
OLED::setCursor(50, 0);
|
|
}
|
|
OLED::print(LargeSymbolPlus, FontStyle::LARGE);
|
|
} else {
|
|
#ifndef NO_SLEEP_MODE
|
|
if (getSettingValue(SettingsOptions::Sensitivity) && getSettingValue(SettingsOptions::SleepTime)) {
|
|
if (OLED::getRotation()) {
|
|
OLED::setCursor(32, 0);
|
|
} else {
|
|
OLED::setCursor(47, 0);
|
|
}
|
|
printCountdownUntilSleep(getSleepTimeout());
|
|
}
|
|
#endif
|
|
if (OLED::getRotation()) {
|
|
OLED::setCursor(32, 8);
|
|
} else {
|
|
OLED::setCursor(47, 8);
|
|
}
|
|
OLED::print(PowerSourceNames[getPowerSourceNumber()], FontStyle::SMALL, 2);
|
|
}
|
|
|
|
detailedPowerStatus();
|
|
|
|
} else {
|
|
basicSolderingStatus(cxt->scratch_state.state2);
|
|
}
|
|
// Check if we should bail due to undervoltage for example
|
|
if (checkExitSoldering()) {
|
|
setBuzzer(false);
|
|
cxt->transitionMode = TransitionAnimation::Right;
|
|
return OperatingMode::HomeScreen;
|
|
}
|
|
#ifdef NO_SLEEP_MODE
|
|
|
|
if (shouldShutdown()) {
|
|
// shutdown
|
|
currentTempTargetDegC = 0;
|
|
cxt->transitionMode = TransitionAnimation::Right;
|
|
return OperatingMode::HomeScreen;
|
|
}
|
|
#endif
|
|
if (shouldBeSleeping()) {
|
|
return OperatingMode::Sleeping;
|
|
}
|
|
|
|
if (heaterThermalRunaway) {
|
|
currentTempTargetDegC = 0; // heater control off
|
|
heaterThermalRunaway = false;
|
|
cxt->transitionMode = TransitionAnimation::Right;
|
|
return OperatingMode::ThermalRunaway;
|
|
}
|
|
return handleSolderingButtons(buttons, cxt);
|
|
}
|