cottongin/crosspoint-reader
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Merge 58985119f1 into 66811bf50b

Browse Source
This commit is contained in:
Matthijs Mars
2026-01-12 18:59:24 +10:00
committed by GitHub
parent 66811bf50b 58985119f1
commit b85af8effb
10 changed files with 153 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/CrossPointSettings.cpp
View File

@@ -12,9 +12,9 @@
CrossPointSettings CrossPointSettings::instance;
namespace {
constexpr uint8_t SETTINGS_FILE_VERSION = 1;
constexpr uint8_t SETTINGS_FILE_VERSION = 2;
// Increment this when adding new persisted settings fields
constexpr uint8_t SETTINGS_COUNT = 17;
constexpr uint8_t SETTINGS_COUNT = 19;
constexpr char SETTINGS_FILE[] = "/.crosspoint/settings.bin";
} // namespace
@@ -46,6 +46,8 @@ bool CrossPointSettings::saveToFile() const {
serialization::writePod(outputFile, sleepScreenCoverMode);
serialization::writeString(outputFile, std::string(opdsServerUrl));
serialization::writePod(outputFile, textAntiAliasing);
serialization::writePod(outputFile, readingSpeedWpm);
serialization::writePod(outputFile, showTimeLeftInChapter);
outputFile.close();
Serial.printf("[%lu] [CPS] Settings saved to file\n", millis());
@@ -60,7 +62,7 @@ bool CrossPointSettings::loadFromFile() {
uint8_t version;
serialization::readPod(inputFile, version);
if (version != SETTINGS_FILE_VERSION) {
if (version != SETTINGS_FILE_VERSION && version != 1) {
Serial.printf("[%lu] [CPS] Deserialization failed: Unknown version %u\n", millis(), version);
inputFile.close();
return false;
@@ -110,6 +112,15 @@ bool CrossPointSettings::loadFromFile() {
}
serialization::readPod(inputFile, textAntiAliasing);
if (++settingsRead >= fileSettingsCount) break;
if (version == 1) {
uint8_t wpmV1;
serialization::readPod(inputFile, wpmV1);
readingSpeedWpm = wpmV1;
} else {
serialization::readPod(inputFile, readingSpeedWpm);
}
if (++settingsRead >= fileSettingsCount) break;
serialization::readPod(inputFile, showTimeLeftInChapter);
} while (false);
inputFile.close();

4
src/CrossPointSettings.h
View File

@@ -61,6 +61,10 @@ class CrossPointSettings {
// Text rendering settings
uint8_t extraParagraphSpacing = 1;
uint8_t textAntiAliasing = 1;
// Reading speed (words per minute) for time-left estimate
uint16_t readingSpeedWpm = 200;
// Toggle to show time remaining in the current chapter
uint8_t showTimeLeftInChapter = 0;
// Duration of the power button press
uint8_t shortPwrBtn = 0;
// EPUB reading orientation settings

25
src/activities/reader/EpubReaderActivity.cpp
View File

@@ -5,6 +5,10 @@
#include <GfxRenderer.h>
#include <SDCardManager.h>
#include <algorithm>
#include <cmath>
#include <cstdio>
#include "CrossPointSettings.h"
#include "CrossPointState.h"
#include "EpubReaderChapterSelectionActivity.h"
@@ -17,6 +21,15 @@ namespace {
constexpr unsigned long skipChapterMs = 700;
constexpr unsigned long goHomeMs = 1000;
constexpr int statusBarMargin = 19;
std::string formatMinutes(const float minutes) {
if (minutes <= 0.0f) {
return "";
}
const int totalMinutes = static_cast<int>(std::floor(minutes));
return std::to_string(totalMinutes) + "m";
}
} // namespace
void EpubReaderActivity::taskTrampoline(void* param) {
@@ -426,10 +439,20 @@ void EpubReaderActivity::renderStatusBar(const int orientedMarginRight, const in
if (showProgress) {
// Calculate progress in book
const float sectionChapterProg = static_cast<float>(section->currentPage) / section->pageCount;
std::string timeLeftText;
const uint8_t bookProgress = epub->calculateProgress(currentSpineIndex, sectionChapterProg);
if (SETTINGS.showTimeLeftInChapter && SETTINGS.readingSpeedWpm > 0) {
const uint32_t wordsLeft = section->getWordsLeftFrom(section->currentPage);
if (wordsLeft > 0) {
const float minutesLeft =
static_cast<float>(wordsLeft) / static_cast<float>(std::max<uint8_t>(1, SETTINGS.readingSpeedWpm));
timeLeftText = formatMinutes(minutesLeft);
}
}
// Right aligned text for progress counter
const std::string progress = std::to_string(section->currentPage + 1) + "/" + std::to_string(section->pageCount) +
const std::string progress = (timeLeftText.empty() ? std::string() : timeLeftText + " ") +
std::to_string(section->currentPage + 1) + "/" + std::to_string(section->pageCount) +
" " + std::to_string(bookProgress) + "%";
progressTextWidth = renderer.getTextWidth(SMALL_FONT_ID, progress.c_str());
renderer.drawText(SMALL_FONT_ID, renderer.getScreenWidth() - orientedMarginRight - progressTextWidth, textY,

21
src/activities/settings/SettingsActivity.cpp
View File

@@ -13,7 +13,7 @@
// Define the static settings list
namespace {
constexpr int settingsCount = 18;
constexpr int settingsCount = 20;
const SettingInfo settingsList[settingsCount] = {
// Should match with SLEEP_SCREEN_MODE
SettingInfo::Enum("Sleep Screen", &CrossPointSettings::sleepScreen, {"Dark", "Light", "Custom", "Cover", "None"}),
@@ -35,6 +35,8 @@ const SettingInfo settingsList[settingsCount] = {
SettingInfo::Value("Reader Screen Margin", &CrossPointSettings::screenMargin, {5, 40, 5}),
SettingInfo::Enum("Reader Paragraph Alignment", &CrossPointSettings::paragraphAlignment,
{"Justify", "Left", "Center", "Right"}),
SettingInfo::Value("Reading Speed (WPM)", &CrossPointSettings::readingSpeedWpm, {150, 300, 5}),
SettingInfo::Toggle("Show Time Left In Chapter", &CrossPointSettings::showTimeLeftInChapter),
SettingInfo::Enum("Time to Sleep", &CrossPointSettings::sleepTimeout,
{"1 min", "5 min", "10 min", "15 min", "30 min"}),
SettingInfo::Enum("Refresh Frequency", &CrossPointSettings::refreshFrequency,
@@ -127,14 +129,21 @@ void SettingsActivity::toggleCurrentSetting() {
} else if (setting.type == SettingType::ENUM && setting.valuePtr != nullptr) {
const uint8_t currentValue = SETTINGS.*(setting.valuePtr);
SETTINGS.*(setting.valuePtr) = (currentValue + 1) % static_cast<uint8_t>(setting.enumValues.size());
} else if (setting.type == SettingType::VALUE && setting.valuePtr != nullptr) {
} else if (setting.type == SettingType::VALUE && setting.valuePtr16 != nullptr) {
// Decreasing would also be nice for large ranges I think but oh well can't have everything
const int8_t currentValue = SETTINGS.*(setting.valuePtr);
const uint16_t currentValue = SETTINGS.*(setting.valuePtr16);
// Wrap to minValue if exceeding setting value boundary
if (currentValue + setting.valueRange.step > setting.valueRange.max) {
SETTINGS.*(setting.valuePtr) = setting.valueRange.min;
SETTINGS.*(setting.valuePtr16) = setting.valueRange.min;
} else {
SETTINGS.*(setting.valuePtr) = currentValue + setting.valueRange.step;
SETTINGS.*(setting.valuePtr16) = currentValue + setting.valueRange.step;
}
} else if (setting.type == SettingType::VALUE && setting.valuePtr != nullptr) {
const uint16_t currentValue = SETTINGS.*(setting.valuePtr);
if (currentValue + setting.valueRange.step > setting.valueRange.max) {
SETTINGS.*(setting.valuePtr) = static_cast<uint8_t>(setting.valueRange.min);
} else {
SETTINGS.*(setting.valuePtr) = static_cast<uint8_t>(currentValue + setting.valueRange.step);
}
} else if (setting.type == SettingType::ACTION) {
if (strcmp(setting.name, "Calibre Settings") == 0) {
@@ -202,6 +211,8 @@ void SettingsActivity::render() const {
} else if (settingsList[i].type == SettingType::ENUM && settingsList[i].valuePtr != nullptr) {
const uint8_t value = SETTINGS.*(settingsList[i].valuePtr);
valueText = settingsList[i].enumValues[value];
} else if (settingsList[i].type == SettingType::VALUE && settingsList[i].valuePtr16 != nullptr) {
valueText = std::to_string(SETTINGS.*(settingsList[i].valuePtr16));
} else if (settingsList[i].type == SettingType::VALUE && settingsList[i].valuePtr != nullptr) {
valueText = std::to_string(SETTINGS.*(settingsList[i].valuePtr));
}

25
src/activities/settings/SettingsActivity.h
View File

@@ -15,32 +15,37 @@ enum class SettingType { TOGGLE, ENUM, ACTION, VALUE };
// Structure to hold setting information
struct SettingInfo {
const char* name; // Display name of the setting
SettingType type; // Type of setting
uint8_t CrossPointSettings::* valuePtr; // Pointer to member in CrossPointSettings (for TOGGLE/ENUM/VALUE)
const char* name; // Display name of the setting
SettingType type; // Type of setting
uint8_t CrossPointSettings::* valuePtr; // Pointer for 8-bit settings (TOGGLE/ENUM)
uint16_t CrossPointSettings::* valuePtr16; // Pointer for 16-bit VALUE settings
std::vector<std::string> enumValues;
struct ValueRange {
uint8_t min;
uint8_t max;
uint8_t step;
uint16_t min;
uint16_t max;
uint16_t step;
};
// Bounds/step for VALUE type settings
ValueRange valueRange;
// Static constructors
static SettingInfo Toggle(const char* name, uint8_t CrossPointSettings::* ptr) {
return {name, SettingType::TOGGLE, ptr};
return {name, SettingType::TOGGLE, ptr, nullptr};
}
static SettingInfo Enum(const char* name, uint8_t CrossPointSettings::* ptr, std::vector<std::string> values) {
return {name, SettingType::ENUM, ptr, std::move(values)};
return {name, SettingType::ENUM, ptr, nullptr, std::move(values)};
}
static SettingInfo Action(const char* name) { return {name, SettingType::ACTION, nullptr}; }
static SettingInfo Action(const char* name) { return {name, SettingType::ACTION, nullptr, nullptr}; }
static SettingInfo Value(const char* name, uint16_t CrossPointSettings::* ptr, const ValueRange valueRange) {
return {name, SettingType::VALUE, nullptr, ptr, {}, valueRange};
}
static SettingInfo Value(const char* name, uint8_t CrossPointSettings::* ptr, const ValueRange valueRange) {
return {name, SettingType::VALUE, ptr, {}, valueRange};
return {name, SettingType::VALUE, ptr, nullptr, {}, valueRange};
}
};