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

further #ifdef USE_EPD

Browse Source
This commit is contained in:
Manuel
2025-11-27 20:52:00 +01:00
parent 2ababd582c
commit 7a04627da9
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/PowerFSM.cpp
View File

@@ -353,7 +353,7 @@ void PowerFSM_setup()
powerFSM.add_transition(&stateDARK, &stateDARK, EVENT_CONTACT_FROM_PHONE, NULL, "Contact from phone"); powerFSM.add_transition(&stateDARK, &stateDARK, EVENT_CONTACT_FROM_PHONE, NULL, "Contact from phone");
#ifdef USE_EINK #if defined(USE_EINK) || defined(USE_EPD)
// Allow E-Ink devices to suppress the screensaver, if screen timeout set to 0 // Allow E-Ink devices to suppress the screensaver, if screen timeout set to 0
if (config.display.screen_on_secs > 0) if (config.display.screen_on_secs > 0)
#endif #endif

6
src/graphics/Screen.cpp
View File

@@ -683,7 +683,7 @@ void Screen::setup()
handleSetOn(true); handleSetOn(true);
determineResolution(dispdev->height(), dispdev->width()); determineResolution(dispdev->height(), dispdev->width());
ui->update(); ui->update();
#if defined(USE_EINK) || defined(USE_EPD) #if !defined(USE_EINK) && !defined(USE_EPD)
ui->update(); // Some SSD1306 clones drop the first draw, so run twice ui->update(); // Some SSD1306 clones drop the first draw, so run twice
#endif #endif
serialSinceMsec = millis(); serialSinceMsec = millis();
@@ -810,7 +810,7 @@ int32_t Screen::runOnce()
static const int bootOEMFrameCount = sizeof(bootOEMFrames) / sizeof(bootOEMFrames[0]); static const int bootOEMFrameCount = sizeof(bootOEMFrames) / sizeof(bootOEMFrames[0]);
ui->setFrames(bootOEMFrames, bootOEMFrameCount); ui->setFrames(bootOEMFrames, bootOEMFrameCount);
ui->update(); ui->update();
#ifndef USE_EINK #if !defined(USE_EINK) && !defined(USE_EPD)
ui->update(); ui->update();
#endif #endif
showingOEMBootScreen = false; showingOEMBootScreen = false;
@@ -1063,7 +1063,7 @@ void Screen::setFrames(FrameFocus focus)
normalFrames[numframes++] = graphics::MessageRenderer::drawTextMessageFrame; normalFrames[numframes++] = graphics::MessageRenderer::drawTextMessageFrame;
indicatorIcons.push_back(icon_mail); indicatorIcons.push_back(icon_mail);
#ifndef USE_EINK #if !defined(USE_EINK) && !defined(USE_EPD)
if (!hiddenFrames.nodelist) { if (!hiddenFrames.nodelist) {
fsi.positions.nodelist = numframes; fsi.positions.nodelist = numframes;
normalFrames[numframes++] = graphics::NodeListRenderer::drawDynamicNodeListScreen; normalFrames[numframes++] = graphics::NodeListRenderer::drawDynamicNodeListScreen;

4
src/graphics/draw/MenuHandler.cpp
View File

@@ -1491,11 +1491,11 @@ void menuHandler::FrameToggles_menu()
// Track last selected index (not enum value!) // Track last selected index (not enum value!)
static int lastSelectedIndex = 0; static int lastSelectedIndex = 0;
#ifndef USE_EINK #if !defined(USE_EINK) && !defined(USE_EPD)
optionsArray[options] = screen->isFrameHidden("nodelist") ? "Show Node List" : "Hide Node List"; optionsArray[options] = screen->isFrameHidden("nodelist") ? "Show Node List" : "Hide Node List";
optionsEnumArray[options++] = nodelist; optionsEnumArray[options++] = nodelist;
#endif #endif
#ifdef USE_EINK #if defined(USE_EINK) || defined(USE_EPD)
optionsArray[options] = screen->isFrameHidden("nodelist_lastheard") ? "Show NL - Last Heard" : "Hide NL - Last Heard"; optionsArray[options] = screen->isFrameHidden("nodelist_lastheard") ? "Show NL - Last Heard" : "Hide NL - Last Heard";
optionsEnumArray[options++] = nodelist_lastheard; optionsEnumArray[options++] = nodelist_lastheard;
optionsArray[options] = screen->isFrameHidden("nodelist_hopsignal") ? "Show NL - Hops/Signal" : "Hide NL - Hops/Signal"; optionsArray[options] = screen->isFrameHidden("nodelist_hopsignal") ? "Show NL - Hops/Signal" : "Hide NL - Hops/Signal";