snark13/Xteink-X4-crosspoint-reader
1
0
Fork 0
mirror of https://github.com/daveallie/crosspoint-reader.git synced 2026-02-07 08:07:40 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

add 16 bit integer ranges to allow for larger ints in wpm

Browse Source
This commit is contained in:
Matthijs Mars 2026-01-09 14:29:17 +01:00
parent 38f0b9678d
commit 3f9142fba7
4 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/CrossPointSettings.cpp
View File

@ -12,7 +12,7 @@
CrossPointSettings CrossPointSettings::instance; CrossPointSettings CrossPointSettings::instance;
namespace { namespace {
constexpr uint8_t SETTINGS_FILE_VERSION = 1; constexpr uint8_t SETTINGS_FILE_VERSION = 2;
// Increment this when adding new persisted settings fields // Increment this when adding new persisted settings fields
constexpr uint8_t SETTINGS_COUNT = 19; constexpr uint8_t SETTINGS_COUNT = 19;
constexpr char SETTINGS_FILE[] = "/.crosspoint/settings.bin"; constexpr char SETTINGS_FILE[] = "/.crosspoint/settings.bin";
@ -62,7 +62,7 @@ bool CrossPointSettings::loadFromFile() {
uint8_t version; uint8_t version;
serialization::readPod(inputFile, 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); Serial.printf("[%lu] [CPS] Deserialization failed: Unknown version %u\n", millis(), version);
inputFile.close(); inputFile.close();
return false; return false;
@ -112,7 +112,13 @@ bool CrossPointSettings::loadFromFile() {
} }
serialization::readPod(inputFile, textAntiAliasing); serialization::readPod(inputFile, textAntiAliasing);
if (++settingsRead >= fileSettingsCount) break; if (++settingsRead >= fileSettingsCount) break;
if (version == 1) {
uint8_t wpmV1;
serialization::readPod(inputFile, wpmV1);
readingSpeedWpm = wpmV1;
} else {
serialization::readPod(inputFile, readingSpeedWpm); serialization::readPod(inputFile, readingSpeedWpm);
}
if (++settingsRead >= fileSettingsCount) break; if (++settingsRead >= fileSettingsCount) break;
serialization::readPod(inputFile, showTimeLeftInChapter); serialization::readPod(inputFile, showTimeLeftInChapter);
} while (false); } while (false);

2
src/CrossPointSettings.h
View File

@ -62,7 +62,7 @@ class CrossPointSettings {
uint8_t extraParagraphSpacing = 1; uint8_t extraParagraphSpacing = 1;
uint8_t textAntiAliasing = 1; uint8_t textAntiAliasing = 1;
// Reading speed (words per minute) for time-left estimate // Reading speed (words per minute) for time-left estimate
uint8_t readingSpeedWpm = 200; uint16_t readingSpeedWpm = 200;
// Toggle to show time remaining in the current chapter // Toggle to show time remaining in the current chapter
uint8_t showTimeLeftInChapter = 0; uint8_t showTimeLeftInChapter = 0;
// Duration of the power button press // Duration of the power button press

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

@ -35,7 +35,7 @@ const SettingInfo settingsList[settingsCount] = {
SettingInfo::Value("Reader Screen Margin", &CrossPointSettings::screenMargin, {5, 40, 5}), SettingInfo::Value("Reader Screen Margin", &CrossPointSettings::screenMargin, {5, 40, 5}),
SettingInfo::Enum("Reader Paragraph Alignment", &CrossPointSettings::paragraphAlignment, SettingInfo::Enum("Reader Paragraph Alignment", &CrossPointSettings::paragraphAlignment,
{"Justify", "Left", "Center", "Right"}), {"Justify", "Left", "Center", "Right"}),
SettingInfo::Value("Reading Speed (WPM)", &CrossPointSettings::readingSpeedWpm, {150, 300, 10}), SettingInfo::Value("Reading Speed (WPM)", &CrossPointSettings::readingSpeedWpm, {80, 300, 10}),
SettingInfo::Toggle("Show Time Left", &CrossPointSettings::showTimeLeftInChapter), SettingInfo::Toggle("Show Time Left", &CrossPointSettings::showTimeLeftInChapter),
SettingInfo::Enum("Time to Sleep", &CrossPointSettings::sleepTimeout, SettingInfo::Enum("Time to Sleep", &CrossPointSettings::sleepTimeout,
{"1 min", "5 min", "10 min", "15 min", "30 min"}), {"1 min", "5 min", "10 min", "15 min", "30 min"}),
@ -129,14 +129,21 @@ void SettingsActivity::toggleCurrentSetting() {
} else if (setting.type == SettingType::ENUM && setting.valuePtr != nullptr) { } else if (setting.type == SettingType::ENUM && setting.valuePtr != nullptr) {
const uint8_t currentValue = SETTINGS.*(setting.valuePtr); const uint8_t currentValue = SETTINGS.*(setting.valuePtr);
SETTINGS.*(setting.valuePtr) = (currentValue + 1) % static_cast<uint8_t>(setting.enumValues.size()); 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 // 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 // Wrap to minValue if exceeding setting value boundary
if (currentValue + setting.valueRange.step > setting.valueRange.max) { if (currentValue + setting.valueRange.step > setting.valueRange.max) {
SETTINGS.*(setting.valuePtr) = setting.valueRange.min; SETTINGS.*(setting.valuePtr16) = setting.valueRange.min;
} else { } 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) { } else if (setting.type == SettingType::ACTION) {
if (strcmp(setting.name, "Calibre Settings") == 0) { if (strcmp(setting.name, "Calibre Settings") == 0) {
@ -204,6 +211,8 @@ void SettingsActivity::render() const {
} else if (settingsList[i].type == SettingType::ENUM && settingsList[i].valuePtr != nullptr) { } else if (settingsList[i].type == SettingType::ENUM && settingsList[i].valuePtr != nullptr) {
const uint8_t value = SETTINGS.*(settingsList[i].valuePtr); const uint8_t value = SETTINGS.*(settingsList[i].valuePtr);
valueText = settingsList[i].enumValues[value]; 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) { } else if (settingsList[i].type == SettingType::VALUE && settingsList[i].valuePtr != nullptr) {
valueText = std::to_string(SETTINGS.*(settingsList[i].valuePtr)); valueText = std::to_string(SETTINGS.*(settingsList[i].valuePtr));
} }

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

@ -17,30 +17,35 @@ enum class SettingType { TOGGLE, ENUM, ACTION, VALUE };
struct SettingInfo { struct SettingInfo {
const char* name; // Display name of the setting const char* name; // Display name of the setting
SettingType type; // Type of setting SettingType type; // Type of setting
uint8_t CrossPointSettings::* valuePtr; // Pointer to member in CrossPointSettings (for TOGGLE/ENUM/VALUE) 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; std::vector<std::string> enumValues;
struct ValueRange { struct ValueRange {
uint8_t min; uint16_t min;
uint8_t max; uint16_t max;
uint8_t step; uint16_t step;
}; };
// Bounds/step for VALUE type settings // Bounds/step for VALUE type settings
ValueRange valueRange; ValueRange valueRange;
// Static constructors // Static constructors
static SettingInfo Toggle(const char* name, uint8_t CrossPointSettings::* ptr) { 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) { 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) { 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};
} }
}; };