Skip to content

Disable animation between home and soldering screens if detailed view is set for both modes (probably a finally proper fix for #2076) #2102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ia merged 4 commits into from
Mar 9, 2025
Merged

Disable animation between home and soldering screens if detailed view is set for both modes (probably a finally proper fix for #2076) #2102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7dbc55f
Probably a finally proper fix for #2076
ia Mar 7, 2025
11d9f1a
Fix code style
ia Mar 7, 2025
42aeee1
Alternative solution with more code lines in different functions
ia Mar 7, 2025
c698c58
Making clang-format happy
ia Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions source/Core/Threads/GUIThread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ void guiRenderLoop(void) {
memset(&context.scratch_state, 0, sizeof(context.scratch_state));
currentOperatingMode = newMode;
}

// If the transition marker is set, we need to make the next draw occur to the secondary buffer so we have something to transition to
if (context.transitionMode != TransitionAnimation::None) {
OLED::useSecondaryFramebuffer(true);
Expand Down
3 changes: 2 additions & 1 deletion source/Core/Threads/UI/logic/HomeScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ OperatingMode handleHomeButtons(const ButtonState buttons, guiContext *cxt) {
break;
case BUTTON_F_SHORT:
if (!isTipDisconnected()) {
cxt->transitionMode = TransitionAnimation::Left;
bool detailedView = getSettingValue(SettingsOptions::DetailedIDLE) && getSettingValue(SettingsOptions::DetailedSoldering);
cxt->transitionMode = detailedView ? TransitionAnimation::None : TransitionAnimation::Left;
return OperatingMode::Soldering;
}
break;
Expand Down
10 changes: 7 additions & 3 deletions source/Core/Threads/UI/logic/Soldering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt)
}
return OperatingMode::Soldering;
}

bool detailedView = getSettingValue(SettingsOptions::DetailedIDLE) && getSettingValue(SettingsOptions::DetailedSoldering);
// otherwise we are unlocked
switch (buttons) {
case BUTTON_NONE:
Expand All @@ -56,7 +58,7 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt)
case BUTTON_BOTH:
/*Fall through*/
case BUTTON_B_LONG:
cxt->transitionMode = TransitionAnimation::Right;
cxt->transitionMode = detailedView ? TransitionAnimation::None : TransitionAnimation::Right;
return OperatingMode::HomeScreen;
case BUTTON_F_LONG:
// if boost mode is enabled turn it on
Expand Down Expand Up @@ -142,18 +144,20 @@ OperatingMode gui_solderingMode(const ButtonState buttons, guiContext *cxt) {
} else {
ui_draw_soldering_basic_status(cxt->scratch_state.state2);
}

bool detailedView = getSettingValue(SettingsOptions::DetailedIDLE) && getSettingValue(SettingsOptions::DetailedSoldering);
// Check if we should bail due to undervoltage for example
if (checkExitSoldering()) {
setBuzzer(false);
cxt->transitionMode = TransitionAnimation::Right;
cxt->transitionMode = detailedView ? TransitionAnimation::None : TransitionAnimation::Right;
return OperatingMode::HomeScreen;
}
#ifdef NO_SLEEP_MODE

if (shouldShutdown()) {
// shutdown
currentTempTargetDegC = 0;
cxt->transitionMode = TransitionAnimation::Right;
cxt->transitionMode = detailedView ? TransitionAnimation::None : TransitionAnimation::Right;
return OperatingMode::HomeScreen;
}
#endif
Expand Down