eric/Crosspoint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix duplicate include

Browse Source
This commit is contained in:
jpirnay
2026-04-08 00:12:01 +02:00
parent d49b7434c9
commit 1f99ed404d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/activities/boot_sleep/SleepActivity.cpp
+3 -4
View File
@@ -10,7 +10,6 @@
#include <Serialization.h> #include <Serialization.h>
#include <Txt.h> #include <Txt.h>
#include <Xtc.h> #include <Xtc.h>
#include <Epub/converters/PngToFramebufferConverter.h>
#include <esp_system.h> #include <esp_system.h>
#include <algorithm> #include <algorithm>
@@ -73,8 +72,7 @@ int32_t pngSleepSeek(PNGFILE* pFile, int32_t pos) {
return f->seek(pos); return f->seek(pos);
} }
bool renderPngSleepScreen(const std::string& filename, GfxRenderer& renderer, bool renderPngSleepScreen(const std::string& filename, GfxRenderer& renderer, const BookOverlayInfo& overlayInfo) {
const BookOverlayInfo& overlayInfo) {
constexpr size_t MIN_FREE_HEAP = 60 * 1024; // PNG decoder ~42 KB + overhead constexpr size_t MIN_FREE_HEAP = 60 * 1024; // PNG decoder ~42 KB + overhead
if (ESP.getFreeHeap() < MIN_FREE_HEAP) { if (ESP.getFreeHeap() < MIN_FREE_HEAP) {
LOG_ERR("SLP", "Not enough heap for PNG sleep image: %s", filename.c_str()); LOG_ERR("SLP", "Not enough heap for PNG sleep image: %s", filename.c_str());
@@ -353,7 +351,8 @@ void SleepActivity::renderCustomSleepScreen() const {
} }
if (Storage.openFileForRead("SLP", "/sleep.png", explicitSleepFile)) { if (Storage.openFileForRead("SLP", "/sleep.png", explicitSleepFile)) {
explicitSleepFile.close(); explicitSleepFile.close();
const BookOverlayInfo resolvedOverlayInfo = shouldLoadOverlayInfo ? getBookOverlayInfo(APP_STATE.openEpubPath) : overlayInfo; const BookOverlayInfo resolvedOverlayInfo =
shouldLoadOverlayInfo ? getBookOverlayInfo(APP_STATE.openEpubPath) : overlayInfo;
if (renderPngSleepScreen("/sleep.png", renderer, resolvedOverlayInfo)) { if (renderPngSleepScreen("/sleep.png", renderer, resolvedOverlayInfo)) {
LOG_DBG("SLP", "Loading explicit custom sleep image: /sleep.png"); LOG_DBG("SLP", "Loading explicit custom sleep image: /sleep.png");
return; return;