diff --git a/src/CrossPointSettings.cpp b/src/CrossPointSettings.cpp index 74bc0d2..d304c4e 100644 --- a/src/CrossPointSettings.cpp +++ b/src/CrossPointSettings.cpp @@ -12,7 +12,7 @@ CrossPointSettings CrossPointSettings::instance; namespace { constexpr uint8_t SETTINGS_FILE_VERSION = 1; // Increment this when adding new persisted settings fields -constexpr uint8_t SETTINGS_COUNT = 11; +constexpr uint8_t SETTINGS_COUNT = 13; constexpr char SETTINGS_FILE[] = "/.crosspoint/settings.bin"; } // namespace @@ -38,6 +38,8 @@ bool CrossPointSettings::saveToFile() const { serialization::writePod(outputFile, fontSize); serialization::writePod(outputFile, lineSpacing); serialization::writePod(outputFile, paragraphAlignment); + serialization::writePod(outputFile, sleepTimeout); + serialization::writePod(outputFile, refreshFrequency); outputFile.close(); Serial.printf("[%lu] [CPS] Settings saved to file\n", millis()); @@ -86,6 +88,10 @@ bool CrossPointSettings::loadFromFile() { if (++settingsRead >= fileSettingsCount) break; serialization::readPod(inputFile, paragraphAlignment); if (++settingsRead >= fileSettingsCount) break; + serialization::readPod(inputFile, sleepTimeout); + if (++settingsRead >= fileSettingsCount) break; + serialization::readPod(inputFile, refreshFrequency); + if (++settingsRead >= fileSettingsCount) break; } while (false); inputFile.close(); @@ -129,6 +135,38 @@ float CrossPointSettings::getReaderLineCompression() const { } } +unsigned long CrossPointSettings::getSleepTimeoutMs() const { + switch (sleepTimeout) { + case SLEEP_1_MIN: + return 1UL * 60 * 1000; + case SLEEP_5_MIN: + return 5UL * 60 * 1000; + case SLEEP_10_MIN: + default: + return 10UL * 60 * 1000; + case SLEEP_15_MIN: + return 15UL * 60 * 1000; + case SLEEP_30_MIN: + return 30UL * 60 * 1000; + } +} + +int CrossPointSettings::getRefreshFrequency() const { + switch (refreshFrequency) { + case REFRESH_1: + return 1; + case REFRESH_5: + return 5; + case REFRESH_10: + return 10; + case REFRESH_15: + default: + return 15; + case REFRESH_30: + return 30; + } +} + int CrossPointSettings::getReaderFontId() const { switch (fontFamily) { case BOOKERLY: diff --git a/src/CrossPointSettings.h b/src/CrossPointSettings.h index b9cce85..bb38df6 100644 --- a/src/CrossPointSettings.h +++ b/src/CrossPointSettings.h @@ -45,6 +45,12 @@ class CrossPointSettings { enum LINE_COMPRESSION { TIGHT = 0, NORMAL = 1, WIDE = 2 }; enum PARAGRAPH_ALIGNMENT { JUSTIFIED = 0, LEFT_ALIGN = 1, CENTER_ALIGN = 2, RIGHT_ALIGN = 3 }; + // Auto-sleep timeout options (in minutes) + enum SLEEP_TIMEOUT { SLEEP_1_MIN = 0, SLEEP_5_MIN = 1, SLEEP_10_MIN = 2, SLEEP_15_MIN = 3, SLEEP_30_MIN = 4 }; + + // E-ink refresh frequency (pages between full refreshes) + enum REFRESH_FREQUENCY { REFRESH_1 = 0, REFRESH_5 = 1, REFRESH_10 = 2, REFRESH_15 = 3, REFRESH_30 = 4 }; + // Sleep screen settings uint8_t sleepScreen = DARK; // Status bar settings @@ -64,6 +70,10 @@ class CrossPointSettings { uint8_t fontSize = MEDIUM; uint8_t lineSpacing = NORMAL; uint8_t paragraphAlignment = JUSTIFIED; + // Auto-sleep timeout setting (default 10 minutes) + uint8_t sleepTimeout = SLEEP_10_MIN; + // E-ink refresh frequency (default 15 pages) + uint8_t refreshFrequency = REFRESH_15; ~CrossPointSettings() = default; @@ -77,6 +87,8 @@ class CrossPointSettings { bool loadFromFile(); float getReaderLineCompression() const; + unsigned long getSleepTimeoutMs() const; + int getRefreshFrequency() const; }; // Helper macro to access settings diff --git a/src/activities/reader/EpubReaderActivity.cpp b/src/activities/reader/EpubReaderActivity.cpp index 4348625..d3cd501 100644 --- a/src/activities/reader/EpubReaderActivity.cpp +++ b/src/activities/reader/EpubReaderActivity.cpp @@ -13,7 +13,7 @@ #include "fontIds.h" namespace { -constexpr int pagesPerRefresh = 15; +// pagesPerRefresh now comes from SETTINGS.getRefreshFrequency() constexpr unsigned long skipChapterMs = 700; constexpr unsigned long goHomeMs = 1000; constexpr int topPadding = 5; @@ -379,7 +379,7 @@ void EpubReaderActivity::renderContents(std::unique_ptr page, const int or renderStatusBar(orientedMarginRight, orientedMarginBottom, orientedMarginLeft); if (pagesUntilFullRefresh <= 1) { renderer.displayBuffer(EInkDisplay::HALF_REFRESH); - pagesUntilFullRefresh = pagesPerRefresh; + pagesUntilFullRefresh = SETTINGS.getRefreshFrequency(); } else { renderer.displayBuffer(); pagesUntilFullRefresh--; diff --git a/src/activities/reader/XtcReaderActivity.cpp b/src/activities/reader/XtcReaderActivity.cpp index efdd18a..c0580cf 100644 --- a/src/activities/reader/XtcReaderActivity.cpp +++ b/src/activities/reader/XtcReaderActivity.cpp @@ -11,13 +11,13 @@ #include #include +#include "CrossPointSettings.h" #include "CrossPointState.h" #include "MappedInputManager.h" #include "XtcReaderChapterSelectionActivity.h" #include "fontIds.h" namespace { -constexpr int pagesPerRefresh = 15; constexpr unsigned long skipPageMs = 700; constexpr unsigned long goHomeMs = 1000; } // namespace @@ -266,7 +266,7 @@ void XtcReaderActivity::renderPage() { // Display BW with conditional refresh based on pagesUntilFullRefresh if (pagesUntilFullRefresh <= 1) { renderer.displayBuffer(EInkDisplay::HALF_REFRESH); - pagesUntilFullRefresh = pagesPerRefresh; + pagesUntilFullRefresh = SETTINGS.getRefreshFrequency(); } else { renderer.displayBuffer(); pagesUntilFullRefresh--; @@ -346,7 +346,7 @@ void XtcReaderActivity::renderPage() { // Display with appropriate refresh if (pagesUntilFullRefresh <= 1) { renderer.displayBuffer(EInkDisplay::HALF_REFRESH); - pagesUntilFullRefresh = pagesPerRefresh; + pagesUntilFullRefresh = SETTINGS.getRefreshFrequency(); } else { renderer.displayBuffer(); pagesUntilFullRefresh--; diff --git a/src/activities/settings/SettingsActivity.cpp b/src/activities/settings/SettingsActivity.cpp index d9d1941..a242389 100644 --- a/src/activities/settings/SettingsActivity.cpp +++ b/src/activities/settings/SettingsActivity.cpp @@ -9,7 +9,7 @@ // Define the static settings list namespace { -constexpr int settingsCount = 12; +constexpr int settingsCount = 14; const SettingInfo settingsList[settingsCount] = { // Should match with SLEEP_SCREEN_MODE {"Sleep Screen", SettingType::ENUM, &CrossPointSettings::sleepScreen, {"Dark", "Light", "Custom", "Cover"}}, @@ -38,6 +38,14 @@ const SettingInfo settingsList[settingsCount] = { SettingType::ENUM, &CrossPointSettings::paragraphAlignment, {"Justify", "Left", "Center", "Right"}}, + {"Time to Sleep", + SettingType::ENUM, + &CrossPointSettings::sleepTimeout, + {"1 min", "5 min", "10 min", "15 min", "30 min"}}, + {"Refresh Frequency", + SettingType::ENUM, + &CrossPointSettings::refreshFrequency, + {"1 page", "5 pages", "10 pages", "15 pages", "30 pages"}}, {"Check for updates", SettingType::ACTION, nullptr, {}}, }; } // namespace diff --git a/src/main.cpp b/src/main.cpp index 5273d03..e81448b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -126,8 +126,6 @@ EpdFont ui12RegularFont(&ubuntu_12_regular); EpdFont ui12BoldFont(&ubuntu_12_bold); EpdFontFamily ui12FontFamily(&ui12RegularFont, &ui12BoldFont); -// Auto-sleep timeout (10 minutes of inactivity) -constexpr unsigned long AUTO_SLEEP_TIMEOUT_MS = 10 * 60 * 1000; // measurement of power button press duration calibration value unsigned long t1 = 0; unsigned long t2 = 0; @@ -325,8 +323,9 @@ void loop() { lastActivityTime = millis(); // Reset inactivity timer } - if (millis() - lastActivityTime >= AUTO_SLEEP_TIMEOUT_MS) { - Serial.printf("[%lu] [SLP] Auto-sleep triggered after %lu ms of inactivity\n", millis(), AUTO_SLEEP_TIMEOUT_MS); + const unsigned long sleepTimeoutMs = SETTINGS.getSleepTimeoutMs(); + if (millis() - lastActivityTime >= sleepTimeoutMs) { + Serial.printf("[%lu] [SLP] Auto-sleep triggered after %lu ms of inactivity\n", millis(), sleepTimeoutMs); enterDeepSleep(); // This should never be hit as `enterDeepSleep` calls esp_deep_sleep_start return;