82bfbd8fa6
Merge 3 upstream commits into mod/master: - feat: Allow screenshot retrieval from device (#820) - feat: Add central logging pragma (#843) - fix: Account for nbsp character as non-breaking space (#757) Conflict resolution: - src/main.cpp: kept mod's HalPowerManager + upstream's Logging/screenshot - SleepActivity.cpp: kept mod's letterbox fill rework, applied LOG_* pattern Additional changes for logging compatibility: - Converted remaining Serial.printf calls in mod files to LOG_* macros (HalPowerManager, BookSettings, BookmarkStore, GfxRenderer) - Added ENABLE_SERIAL_LOG and LOG_LEVEL=2 to [env:mod] build flags Co-authored-by: Cursor <cursoragent@cursor.com>
61 lines
1.7 KiB
C++
61 lines
1.7 KiB
C++
#include "BookSettings.h"
|
|
|
|
#include <HalStorage.h>
|
|
#include <Logging.h>
|
|
#include <Serialization.h>
|
|
|
|
namespace {
|
|
constexpr uint8_t BOOK_SETTINGS_VERSION = 1;
|
|
constexpr uint8_t BOOK_SETTINGS_COUNT = 1; // Number of persisted fields
|
|
} // namespace
|
|
|
|
std::string BookSettings::filePath(const std::string& cachePath) { return cachePath + "/book_settings.bin"; }
|
|
|
|
BookSettings BookSettings::load(const std::string& cachePath) {
|
|
BookSettings settings;
|
|
FsFile f;
|
|
if (!Storage.openFileForRead("BST", filePath(cachePath), f)) {
|
|
return settings;
|
|
}
|
|
|
|
uint8_t version;
|
|
serialization::readPod(f, version);
|
|
if (version != BOOK_SETTINGS_VERSION) {
|
|
f.close();
|
|
return settings;
|
|
}
|
|
|
|
uint8_t fieldCount;
|
|
serialization::readPod(f, fieldCount);
|
|
|
|
// Read fields that exist (supports older files with fewer fields)
|
|
uint8_t fieldsRead = 0;
|
|
do {
|
|
serialization::readPod(f, settings.letterboxFillOverride);
|
|
if (++fieldsRead >= fieldCount) break;
|
|
// New fields added here for forward compatibility
|
|
} while (false);
|
|
|
|
f.close();
|
|
LOG_DBG("BST", "Loaded book settings from %s (letterboxFill=%d)", filePath(cachePath).c_str(),
|
|
settings.letterboxFillOverride);
|
|
return settings;
|
|
}
|
|
|
|
bool BookSettings::save(const std::string& cachePath, const BookSettings& settings) {
|
|
FsFile f;
|
|
if (!Storage.openFileForWrite("BST", filePath(cachePath), f)) {
|
|
LOG_ERR("BST", "Could not save book settings!");
|
|
return false;
|
|
}
|
|
|
|
serialization::writePod(f, BOOK_SETTINGS_VERSION);
|
|
serialization::writePod(f, BOOK_SETTINGS_COUNT);
|
|
serialization::writePod(f, settings.letterboxFillOverride);
|
|
// New fields added here
|
|
f.close();
|
|
|
|
LOG_DBG("BST", "Saved book settings to %s", filePath(cachePath).c_str());
|
|
return true;
|
|
}
|