4db384edb6
All checks were successful
CI / build (push) Successful in 2m23s
On ESP32-C3 with USB CDC, Serial.printf() blocks indefinitely when USB is not connected. This caused device freezes when booted without USB. Solution: Call Serial.setTxTimeoutMs(0) after Serial.begin() to make all Serial output non-blocking. Also added if (Serial) guards to high-traffic logging paths in EpubReaderActivity as belt-and-suspenders protection. Includes documentation of the debugging process and Serial call inventory. Also applies clang-format to fix pre-existing formatting issues.
56 lines
2.2 KiB
C++
56 lines
2.2 KiB
C++
#pragma once
|
|
#include <Epub.h>
|
|
#include <Epub/Section.h>
|
|
#include <freertos/FreeRTOS.h>
|
|
#include <freertos/semphr.h>
|
|
#include <freertos/task.h>
|
|
|
|
#include "activities/ActivityWithSubactivity.h"
|
|
|
|
class EpubReaderActivity final : public ActivityWithSubactivity {
|
|
std::shared_ptr<Epub> epub;
|
|
std::unique_ptr<Section> section = nullptr;
|
|
TaskHandle_t displayTaskHandle = nullptr;
|
|
SemaphoreHandle_t renderingMutex = nullptr;
|
|
int currentSpineIndex = 0;
|
|
int nextPageNumber = 0;
|
|
int pagesUntilFullRefresh = 0;
|
|
bool updateRequired = false;
|
|
const std::function<void()> onGoBack;
|
|
const std::function<void()> onGoHome;
|
|
const std::function<void()> onGoToClearCache;
|
|
const std::function<void()> onGoToSettings;
|
|
|
|
// End-of-book prompt state
|
|
bool showingEndOfBookPrompt = false;
|
|
int endOfBookSelection = 2; // 0=Archive, 1=Delete, 2=Keep (default to safe option)
|
|
|
|
// Content offset for position restoration after re-indexing
|
|
uint32_t savedContentOffset = 0;
|
|
bool hasContentOffset = false; // True if we have a valid content offset to use
|
|
|
|
static void taskTrampoline(void* param);
|
|
[[noreturn]] void displayTaskLoop();
|
|
void renderScreen();
|
|
void renderContents(std::unique_ptr<Page> page, int orientedMarginTop, int orientedMarginRight,
|
|
int orientedMarginBottom, int orientedMarginLeft);
|
|
void renderStatusBar(int orientedMarginRight, int orientedMarginBottom, int orientedMarginLeft) const;
|
|
void renderEndOfBookPrompt();
|
|
void handleEndOfBookAction();
|
|
|
|
public:
|
|
explicit EpubReaderActivity(GfxRenderer& renderer, MappedInputManager& mappedInput, std::unique_ptr<Epub> epub,
|
|
const std::function<void()>& onGoBack, const std::function<void()>& onGoHome,
|
|
const std::function<void()>& onGoToClearCache = nullptr,
|
|
const std::function<void()>& onGoToSettings = nullptr)
|
|
: ActivityWithSubactivity("EpubReader", renderer, mappedInput),
|
|
epub(std::move(epub)),
|
|
onGoBack(onGoBack),
|
|
onGoHome(onGoHome),
|
|
onGoToClearCache(onGoToClearCache),
|
|
onGoToSettings(onGoToSettings) {}
|
|
void onEnter() override;
|
|
void onExit() override;
|
|
void loop() override;
|
|
};
|