From fb8196e946835508623c2404de23ff8afba1ed87 Mon Sep 17 00:00:00 2001
From: jpirnay <jens@pirnay.com>
Date: Tue, 7 Apr 2026 11:12:07 +0200
Subject: [PATCH] Change index type

---
 src/CrossPointState.cpp                     | 2 +-
 src/CrossPointState.h                       | 2 +-
 src/JsonSettingsIO.cpp                      | 2 +-
 src/activities/boot_sleep/SleepActivity.cpp | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/CrossPointState.cpp b/src/CrossPointState.cpp
index af8bdda5..3d6c2b70 100644
--- a/src/CrossPointState.cpp
+++ b/src/CrossPointState.cpp
@@ -63,7 +63,7 @@ bool CrossPointState::loadFromBinaryFile() {
   if (version >= 2) {
     serialization::readPod(inputFile, lastSleepImage);
   } else {
-    lastSleepImage = UINT8_MAX;
+    lastSleepImage = SIZE_MAX;
   }
 
   if (version >= 3) {
diff --git a/src/CrossPointState.h b/src/CrossPointState.h
index 1de89838..9e7795b9 100644
--- a/src/CrossPointState.h
+++ b/src/CrossPointState.h
@@ -9,7 +9,7 @@ class CrossPointState {
 
  public:
   std::string openEpubPath;
-  uint8_t lastSleepImage = UINT8_MAX;  // UINT8_MAX = unset sentinel
+  size_t lastSleepImage = SIZE_MAX;  // SIZE_MAX = unset sentinel
   uint8_t readerActivityLoadCount = 0;
   bool lastSleepFromReader = false;
   ~CrossPointState() = default;
diff --git a/src/JsonSettingsIO.cpp b/src/JsonSettingsIO.cpp
index 11147884..bfa0e011 100644
--- a/src/JsonSettingsIO.cpp
+++ b/src/JsonSettingsIO.cpp
@@ -88,7 +88,7 @@ bool JsonSettingsIO::loadState(CrossPointState& s, const char* json) {
   }
 
   s.openEpubPath = doc["openEpubPath"] | std::string("");
-  s.lastSleepImage = doc["lastSleepImage"] | (uint8_t)UINT8_MAX;
+  s.lastSleepImage = doc["lastSleepImage"] | SIZE_MAX;
   s.readerActivityLoadCount = doc["readerActivityLoadCount"] | (uint8_t)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 05808bb6..f1ee331d 100644
--- a/src/activities/boot_sleep/SleepActivity.cpp
+++ b/src/activities/boot_sleep/SleepActivity.cpp
@@ -212,12 +212,12 @@ std::vector<std::string> collectSleepImages(bool allowPng) {
 // SEQUENTIAL: advances from APP_STATE.lastSleepImage, wrapping at numFiles.
 size_t pickSleepImageIndex(size_t numFiles) {
   if (SETTINGS.sleepImagePickMode == CrossPointSettings::SLEEP_IMAGE_PICK_MODE::PICK_SEQUENTIAL) {
-    const uint8_t last = APP_STATE.lastSleepImage;
-    if (last == UINT8_MAX || last >= numFiles) return 0;
-    return (static_cast<size_t>(last) + 1) % numFiles;
+    const size_t last = APP_STATE.lastSleepImage;
+    if (last == SIZE_MAX || last >= numFiles) return 0;
+    return (last + 1) % numFiles;
   }
   size_t idx = random(numFiles);
-  while (numFiles > 1 && APP_STATE.lastSleepImage != UINT8_MAX && idx == APP_STATE.lastSleepImage) {
+  while (numFiles > 1 && APP_STATE.lastSleepImage != SIZE_MAX && idx == APP_STATE.lastSleepImage) {
     idx = random(numFiles);
   }
   return idx;