rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-22 18:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into esp32-c6

Browse Source
This commit is contained in:
Thomas Göttgens
2024-09-27 22:51:29 +02:00
committed by GitHub
parent 11c17ec78c ef223b1195
commit cb1cf055b1
31 changed files with 109 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/graphics/Screen.cpp
View File

@@ -2201,7 +2201,7 @@ void Screen::setFrames(FrameFocus focus)
case FOCUS_PRESERVE:
// If we can identify which type of frame "originalPosition" was, can move directly to it in the new frameset
FramesetInfo &oldFsi = this->framesetInfo;
const FramesetInfo &oldFsi = this->framesetInfo;
if (originalPosition == oldFsi.positions.log)
ui->switchToFrame(fsi.positions.log);
else if (originalPosition == oldFsi.positions.settings)