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

Force write screen on side animation cancel

Browse Source 
.
This commit is contained in:
Ben V. Brown
2023-07-21 18:13:00 +10:00
parent 3347bc6bde
commit c85fa4affa
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/Core/Drivers/OLED.cpp
View File

@@ -318,9 +318,12 @@ void OLED::transitionSecondaryFramebuffer(bool forwardNavigation) {
refresh(); // Now refresh to write out the contents to the new page refresh(); // Now refresh to write out the contents to the new page
vTaskDelayUntil(&startDraw, TICKS_100MS / 7); vTaskDelayUntil(&startDraw, TICKS_100MS / 7);
if (getButtonState() != BUTTON_NONE) { if (getButtonState() != BUTTON_NONE) {
memcpy(screenBuffer + FRAMEBUFFER_START, secondFrameBuffer + FRAMEBUFFER_START, sizeof(screenBuffer) - FRAMEBUFFER_START);
refresh(); // Now refresh to write out the contents to the new page
return; return;
} }
} }
refresh(); //
} }
void OLED::useSecondaryFramebuffer(bool useSecondary) { void OLED::useSecondaryFramebuffer(bool useSecondary) {

4
source/Core/Threads/OperatingModes/CJC.cpp
View File

@@ -11,8 +11,10 @@ OperatingMode performCJCC(const ButtonState buttons, guiContext *cxt) {
OLED::print(translatedString(Tr->CJCCalibrating), FontStyle::SMALL); OLED::print(translatedString(Tr->CJCCalibrating), FontStyle::SMALL);
OLED::setCursor(0, 8); OLED::setCursor(0, 8);
OLED::print(SmallSymbolDot, FontStyle::SMALL); OLED::print(SmallSymbolDot, FontStyle::SMALL);
for (uint8_t x = 0; x < (cxt->scratch_state.state1 / 4); x++) for (uint8_t x = 0; x < (cxt->scratch_state.state1 / 4); x++) {
OLED::print(SmallSymbolDot, FontStyle::SMALL); OLED::print(SmallSymbolDot, FontStyle::SMALL);
}
cxt->scratch_state.state1++; cxt->scratch_state.state1++;
return OperatingMode::CJCCalibration; return OperatingMode::CJCCalibration;
} }

3
source/Core/Threads/OperatingModes/SettingsMenu.cpp
View File

@@ -183,8 +183,7 @@ OperatingMode gui_SettingsMenu(const ButtonState buttons, guiContext *cxt) {
cxt->transitionMode = TransitionAnimation::Left; cxt->transitionMode = TransitionAnimation::Left;
return OperatingMode::HomeScreen; return OperatingMode::HomeScreen;
} else { } else {
(*subEntry) = 0; (*subEntry) = 0; // Reset back to the main menu
(*mainEntry) += 1;
} }
// When we exit a list we want to animate to the left // When we exit a list we want to animate to the left
cxt->transitionMode = TransitionAnimation::Left; cxt->transitionMode = TransitionAnimation::Left;