pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-07-31 02:45:41 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

burn _lots_ less cpu updating the display when idle

Browse Source
This commit is contained in:
geeksville 2020-02-21 10:13:51 -08:00
parent 5f3e8b5309
commit d4efb2c44c
1 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/screen.cpp
View File

@ -323,7 +323,8 @@ float estimatedHeading(double lat, double lon)
} }
/// Sometimes we will have Position objects that only have a time, so check for valid lat/lon /// Sometimes we will have Position objects that only have a time, so check for valid lat/lon
bool hasPosition(NodeInfo *n) { bool hasPosition(NodeInfo *n)
{
return n->has_position && (n->position.latitude != 0 || n->position.longitude != 0); return n->has_position && (n->position.latitude != 0 || n->position.longitude != 0);
} }
#define COMPASS_DIAM 44 #define COMPASS_DIAM 44
@ -529,7 +530,8 @@ void screen_setup()
// The ESP is capable of rendering 60fps in 80Mhz mode // The ESP is capable of rendering 60fps in 80Mhz mode
// but that won't give you much time for anything else // but that won't give you much time for anything else
// run it in 160Mhz mode or just set it to 30 fps // run it in 160Mhz mode or just set it to 30 fps
ui.setTargetFPS(30); // We do this now in loop()
// ui.setTargetFPS(30);
// Customize the active and inactive symbol // Customize the active and inactive symbol
//ui.setActiveSymbol(activeSymbol); //ui.setActiveSymbol(activeSymbol);
@ -574,12 +576,18 @@ static bool showingBluetooth;
/// If set to true (possibly from an ISR), we should turn on the screen the next time our idle loop runs. /// If set to true (possibly from an ISR), we should turn on the screen the next time our idle loop runs.
static bool wakeScreen; static bool wakeScreen;
static bool showingBootScreen = true; // start by showing the bootscreen
uint32_t lastPressMs; uint32_t lastPressMs;
/// Turn off the screen this many ms after last press or wake /// Turn off the screen this many ms after last press or wake
#define SCREEN_SLEEP_MS (60 * 1000) #define SCREEN_SLEEP_MS (60 * 1000)
#define TRANSITION_FRAMERATE 60 // fps
#define IDLE_FRAMERATE 10 // in fps
static uint32_t targetFramerate = IDLE_FRAMERATE;
uint32_t screen_loop() uint32_t screen_loop()
{ {
if (!disp) // If we don't have a screen, don't ever spend any CPU for us if (!disp) // If we don't have a screen, don't ever spend any CPU for us
@ -595,8 +603,16 @@ uint32_t screen_loop()
if (!screenOn) // If we didn't just wake and the screen is still off, then bail if (!screenOn) // If we didn't just wake and the screen is still off, then bail
return UINT32_MAX; return UINT32_MAX;
static bool showingBootScreen = true; // start by showing the bootscreen // Switch to a low framerate (to save CPU) when we are not in transition
// but we should only call setTargetFPS when framestate changes, because otherwise that breaks
// animations.
if (targetFramerate != IDLE_FRAMERATE && ui.getUiState()->frameState == FIXED)
{
// oldFrameState = ui.getUiState()->frameState;
DEBUG_MSG("Setting idle framerate\n");
targetFramerate = IDLE_FRAMERATE;
ui.setTargetFPS(targetFramerate);
}
ui.update(); ui.update();
// While showing the bluetooth pair screen all of our standard screen switching is stopped // While showing the bluetooth pair screen all of our standard screen switching is stopped
@ -629,8 +645,11 @@ uint32_t screen_loop()
} }
} }
// If we are scrolling do 30fps, otherwise just 1 fps (to save CPU) // DEBUG_MSG("want fps %d, fixed=%d\n", targetFramerate, ui.getUiState()->frameState);
return (ui.getUiState()->frameState == IN_TRANSITION ? 10 : 500); // If we are scrolling we need to be called soon, otherwise just 1 fps (to save CPU)
// We also ask to be called twice as fast as we really need so that any rounding errors still result
// with the correct framerate
return 1000 / targetFramerate / 2;
} }
// Show the bluetooth PIN screen // Show the bluetooth PIN screen
@ -687,6 +706,15 @@ void screen_press()
wakeScreen = true; wakeScreen = true;
// If screen was off, just wake it, otherwise advance to next frame // If screen was off, just wake it, otherwise advance to next frame
if (screenOn) // If we are in a transition, the press must have bounced, drop it.
if (screenOn && ui.getUiState()->frameState == FIXED)
{
ui.nextFrame(); ui.nextFrame();
DEBUG_MSG("Setting fast framerate\n");
// We are about to start a transition so speed up fps
targetFramerate = TRANSITION_FRAMERATE;
ui.setTargetFPS(targetFramerate);
}
} }