mirror of
https://github.com/Ralim/IronOS.git
synced 2025-07-23 20:30:38 +02:00
Big overhaul of the UI framework (#1749)
* 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>
This commit is contained in:
@@ -188,7 +188,7 @@ uint16_t getSettingValue(const enum SettingsOptions option) { return systemSetti
|
||||
|
||||
// Increment by the step size to the next value. If past the end wrap to the minimum
|
||||
// Returns true if we are on the _last_ value
|
||||
bool nextSettingValue(const enum SettingsOptions option) {
|
||||
void nextSettingValue(const enum SettingsOptions option) {
|
||||
const auto constants = settingsConstants[(int)option];
|
||||
if (systemSettings.settingsValues[(int)option] == (constants.max)) {
|
||||
// Already at max, wrap to the start
|
||||
@@ -200,13 +200,38 @@ bool nextSettingValue(const enum SettingsOptions option) {
|
||||
// Otherwise increment
|
||||
systemSettings.settingsValues[(int)option] += constants.increment;
|
||||
}
|
||||
// Return if we are at the max
|
||||
return constants.max == systemSettings.settingsValues[(int)option];
|
||||
}
|
||||
|
||||
bool isLastSettingValue(const enum SettingsOptions option) {
|
||||
const auto constants = settingsConstants[(int)option];
|
||||
uint16_t max = constants.max;
|
||||
// handle temp unit limitations
|
||||
if (option == SettingsOptions::SolderingTemp) {
|
||||
if (getSettingValue(SettingsOptions::TemperatureInF)) {
|
||||
max = MAX_TEMP_F;
|
||||
} else {
|
||||
max = MAX_TEMP_C;
|
||||
}
|
||||
} else if (option == SettingsOptions::BoostTemp) {
|
||||
if (getSettingValue(SettingsOptions::TemperatureInF)) {
|
||||
max = MAX_TEMP_F;
|
||||
} else {
|
||||
max = MAX_TEMP_C;
|
||||
}
|
||||
} else if (option == SettingsOptions::SleepTemp) {
|
||||
if (getSettingValue(SettingsOptions::TemperatureInF)) {
|
||||
max = 580;
|
||||
} else {
|
||||
max = 300;
|
||||
}
|
||||
} else if (option == SettingsOptions::UILanguage) {
|
||||
return isLastLanguageOption();
|
||||
}
|
||||
return systemSettings.settingsValues[(int)option] > (max - constants.increment);
|
||||
}
|
||||
// Step backwards on the settings item
|
||||
// Return true if we are at the end (min)
|
||||
bool prevSettingValue(const enum SettingsOptions option) {
|
||||
void prevSettingValue(const enum SettingsOptions option) {
|
||||
const auto constants = settingsConstants[(int)option];
|
||||
if (systemSettings.settingsValues[(int)option] == (constants.min)) {
|
||||
// Already at min, wrap to the max
|
||||
@@ -218,8 +243,6 @@ bool prevSettingValue(const enum SettingsOptions option) {
|
||||
// Otherwise decrement
|
||||
systemSettings.settingsValues[(int)option] -= constants.increment;
|
||||
}
|
||||
// Return if we are at the min
|
||||
return constants.min == systemSettings.settingsValues[(int)option];
|
||||
}
|
||||
|
||||
uint16_t lookupHallEffectThreshold() {
|
||||
|
Reference in New Issue
Block a user