diff --git a/src/CrossPointState.cpp b/src/CrossPointState.cpp index 7d084da6e..ef7d2466c 100644 --- a/src/CrossPointState.cpp +++ b/src/CrossPointState.cpp @@ -5,6 +5,8 @@ #include #include +#include + namespace { constexpr uint8_t STATE_FILE_VERSION = 4; constexpr char STATE_FILE_BIN[] = "/.crosspoint/state.bin"; @@ -14,6 +16,21 @@ constexpr char STATE_FILE_BAK[] = "/.crosspoint/state.bin.bak"; CrossPointState CrossPointState::instance; +bool CrossPointState::isRecentSleep(uint16_t idx, uint8_t checkCount) const { + const uint8_t effectiveCount = std::min(checkCount, recentSleepFill); + for (uint8_t i = 0; i < effectiveCount; i++) { + const uint8_t slot = (recentSleepPos + SLEEP_RECENT_COUNT - 1 - i) % SLEEP_RECENT_COUNT; + if (recentSleepImages[slot] == idx) return true; + } + return false; +} + +void CrossPointState::pushRecentSleep(uint16_t idx) { + recentSleepImages[recentSleepPos] = idx; + recentSleepPos = (recentSleepPos + 1) % SLEEP_RECENT_COUNT; + if (recentSleepFill < SLEEP_RECENT_COUNT) recentSleepFill++; +} + bool CrossPointState::saveToFile() const { Storage.mkdir("/.crosspoint"); return JsonSettingsIO::saveState(*this, STATE_FILE_JSON); @@ -60,9 +77,11 @@ bool CrossPointState::loadFromBinaryFile() { serialization::readString(inputFile, openEpubPath); if (version >= 2) { - serialization::readPod(inputFile, lastSleepImage); - } else { - lastSleepImage = UINT8_MAX; + uint8_t legacyLastSleep = UINT8_MAX; + serialization::readPod(inputFile, legacyLastSleep); + if (legacyLastSleep != UINT8_MAX) { + pushRecentSleep(static_cast(legacyLastSleep)); + } } if (version >= 3) { diff --git a/src/CrossPointState.h b/src/CrossPointState.h index 1de898382..4b18f3b1c 100644 --- a/src/CrossPointState.h +++ b/src/CrossPointState.h @@ -1,6 +1,5 @@ #pragma once #include -#include #include class CrossPointState { @@ -8,10 +7,20 @@ class CrossPointState { static CrossPointState instance; public: + static constexpr uint8_t SLEEP_RECENT_COUNT = 16; + std::string openEpubPath; - uint8_t lastSleepImage = UINT8_MAX; // UINT8_MAX = unset sentinel + uint16_t recentSleepImages[SLEEP_RECENT_COUNT] = {}; // circular buffer of recent wallpaper indices + uint8_t recentSleepPos = 0; // next write slot + uint8_t recentSleepFill = 0; // valid entries (0..SLEEP_RECENT_COUNT) uint8_t readerActivityLoadCount = 0; bool lastSleepFromReader = false; + + // Returns true if idx was shown within the last checkCount picks. + // Walks backwards from the most recently written slot. + bool isRecentSleep(uint16_t idx, uint8_t checkCount) const; + + void pushRecentSleep(uint16_t idx); ~CrossPointState() = default; // Get singleton instance diff --git a/src/JsonSettingsIO.cpp b/src/JsonSettingsIO.cpp index a0458043a..eeb454dff 100644 --- a/src/JsonSettingsIO.cpp +++ b/src/JsonSettingsIO.cpp @@ -69,7 +69,10 @@ void applyLegacyStatusBarSettings(CrossPointSettings& settings) { bool JsonSettingsIO::saveState(const CrossPointState& s, const char* path) { JsonDocument doc; doc["openEpubPath"] = s.openEpubPath; - doc["lastSleepImage"] = s.lastSleepImage; + JsonArray recentArr = doc["recentSleepImages"].to(); + for (int i = 0; i < CrossPointState::SLEEP_RECENT_COUNT; i++) recentArr.add(s.recentSleepImages[i]); + doc["recentSleepPos"] = s.recentSleepPos; + doc["recentSleepFill"] = s.recentSleepFill; doc["readerActivityLoadCount"] = s.readerActivityLoadCount; doc["lastSleepFromReader"] = s.lastSleepFromReader; @@ -87,8 +90,24 @@ bool JsonSettingsIO::loadState(CrossPointState& s, const char* json) { } s.openEpubPath = doc["openEpubPath"] | std::string(""); - s.lastSleepImage = doc["lastSleepImage"] | (uint8_t)UINT8_MAX; - s.readerActivityLoadCount = doc["readerActivityLoadCount"] | (uint8_t)0; + memset(s.recentSleepImages, 0, sizeof(s.recentSleepImages)); + JsonArrayConst recentArr = doc["recentSleepImages"]; + const int actualCount = recentArr.isNull() ? 0 + : std::min(static_cast(recentArr.size()), + static_cast(CrossPointState::SLEEP_RECENT_COUNT)); + for (int i = 0; i < actualCount; i++) s.recentSleepImages[i] = recentArr[i] | static_cast(0); + s.recentSleepPos = doc["recentSleepPos"] | static_cast(0); + if (s.recentSleepPos >= CrossPointState::SLEEP_RECENT_COUNT) + s.recentSleepPos = actualCount > 0 ? s.recentSleepPos % CrossPointState::SLEEP_RECENT_COUNT : 0; + s.recentSleepFill = doc["recentSleepFill"] | static_cast(0); + s.recentSleepFill = static_cast(std::min(static_cast(s.recentSleepFill), actualCount)); + // Migrate legacy single-image field from old state.json (pre-recency-buffer). + // Only seeds the buffer if the new buffer is empty (fresh migration, not a resave). + if (s.recentSleepFill == 0 && !doc["lastSleepImage"].isNull()) { + const uint8_t legacy = doc["lastSleepImage"] | static_cast(UINT8_MAX); + if (legacy != UINT8_MAX) s.pushRecentSleep(static_cast(legacy)); + } + s.readerActivityLoadCount = doc["readerActivityLoadCount"] | static_cast(0); s.lastSleepFromReader = doc["lastSleepFromReader"] | false; return true; } diff --git a/src/activities/boot_sleep/SleepActivity.cpp b/src/activities/boot_sleep/SleepActivity.cpp index 88a15aa13..06efdef7a 100644 --- a/src/activities/boot_sleep/SleepActivity.cpp +++ b/src/activities/boot_sleep/SleepActivity.cpp @@ -85,13 +85,16 @@ void SleepActivity::renderCustomSleepScreen() const { } const auto numFiles = files.size(); if (numFiles > 0) { - // Generate a random number between 1 and numFiles - auto randomFileIndex = random(numFiles); - // If we picked the same image as last time, reroll - while (numFiles > 1 && APP_STATE.lastSleepImage != UINT8_MAX && randomFileIndex == APP_STATE.lastSleepImage) { - randomFileIndex = random(numFiles); + // Pick a random wallpaper, excluding recently shown ones. + // Window: up to SLEEP_RECENT_COUNT entries, capped at numFiles-1. + const uint16_t fileCount = static_cast(std::min(numFiles, static_cast(UINT16_MAX))); + const uint8_t window = + static_cast(std::min(static_cast(APP_STATE.recentSleepFill), numFiles - 1)); + auto randomFileIndex = static_cast(random(fileCount)); + for (uint8_t attempt = 0; attempt < 20 && APP_STATE.isRecentSleep(randomFileIndex, window); attempt++) { + randomFileIndex = static_cast(random(fileCount)); } - APP_STATE.lastSleepImage = randomFileIndex; + APP_STATE.pushRecentSleep(randomFileIndex); APP_STATE.saveToFile(); const auto filename = std::string(sleepDir) + "/" + files[randomFileIndex]; FsFile file;