Fix hold to wake logic

esp_sleep_get_wakeup_cause does not seem to be set when not connected to USB power

README.md

@@ -31,7 +31,9 @@ This project is **not affiliated with Xteink**; it's built as a community projec
 - [x] EPUB parsing and rendering
 - [x] Saved reading position
 - [ ] File explorer with file picker
-  - Currently CrossPoint will just open the first EPUB it finds at the root of the SD card
+  - [x] Basic EPUB picker from root directory
+  - [ ] Support nested folders
+  - [ ] EPUB picker with cover art
 - [ ] Image support within EPUB
 - [ ] Configurable font, layout, and display options
 - [ ] WiFi connectivity

lib/EpdRenderer/EpdRenderer.cpp

@@ -57,10 +57,10 @@ void EpdRenderer::drawText(const int x, const int y, const char* text, const boo
   getFontRenderer(bold, italic)->renderString(text, &xpos, &ypos, color > 0 ? GxEPD_BLACK : GxEPD_WHITE);
 }
 
-void EpdRenderer::drawSmallText(const int x, const int y, const char* text) const {
+void EpdRenderer::drawSmallText(const int x, const int y, const char* text, const uint16_t color) const {
   int ypos = y + smallFont->font->data->advanceY + marginTop;
   int xpos = x + marginLeft;
-  smallFont->renderString(text, &xpos, &ypos, GxEPD_BLACK);
+  smallFont->renderString(text, &xpos, &ypos, color > 0 ? GxEPD_BLACK : GxEPD_WHITE);
 }
 
 void EpdRenderer::drawTextBox(const int x, const int y, const std::string& text, const int width, const int height,

lib/EpdRenderer/EpdRenderer.h

@@ -26,7 +26,7 @@ class EpdRenderer {
   int getTextWidth(const char* text, bool bold = false, bool italic = false) const;
   int getSmallTextWidth(const char* text) const;
   void drawText(int x, int y, const char* text, bool bold = false, bool italic = false, uint16_t color = 1) const;
-  void drawSmallText(int x, int y, const char* text) const;
+  void drawSmallText(int x, int y, const char* text, uint16_t color = 1) const;
   void drawTextBox(int x, int y, const std::string& text, int width, int height, bool bold = false,
                    bool italic = false) const;
   void drawLine(int x1, int y1, int x2, int y2, uint16_t color) const;

src/CrossPointState.cpp

@@ -0,0 +1,46 @@
+#include "CrossPointState.h"
+
+#include <HardwareSerial.h>
+#include <SD.h>
+#include <Serialization.h>
+
+#include <fstream>
+
+constexpr uint8_t STATE_VERSION = 1;
+constexpr char STATE_FILE[] = "/sd/.crosspoint/state.bin";
+
+void CrossPointState::serialize(std::ostream& os) const {
+  serialization::writePod(os, STATE_VERSION);
+  serialization::writeString(os, openEpubPath);
+}
+
+CrossPointState* CrossPointState::deserialize(std::istream& is) {
+  const auto state = new CrossPointState();
+
+  uint8_t version;
+  serialization::readPod(is, version);
+  if (version != STATE_VERSION) {
+    Serial.printf("CrossPointState: Unknown version %u\n", version);
+    return state;
+  }
+
+  serialization::readString(is, state->openEpubPath);
+  return state;
+}
+
+void CrossPointState::saveToFile() const {
+  std::ofstream outputFile(STATE_FILE);
+  serialize(outputFile);
+  outputFile.close();
+}
+
+CrossPointState* CrossPointState::loadFromFile() {
+  if (!SD.exists(&STATE_FILE[3])) {
+    return new CrossPointState();
+  }
+
+  std::ifstream inputFile(STATE_FILE);
+  CrossPointState* state = deserialize(inputFile);
+  inputFile.close();
+  return state;
+}

src/CrossPointState.h

@@ -0,0 +1,14 @@
+#pragma once
+#include <iosfwd>
+#include <string>
+
+class CrossPointState {
+  void serialize(std::ostream& os) const;
+  static CrossPointState* deserialize(std::istream& is);
+
+ public:
+  std::string openEpubPath;
+  ~CrossPointState() = default;
+  void saveToFile() const;
+  static CrossPointState* loadFromFile();
+};

src/Input.h

@@ -10,9 +10,9 @@
 // Button ADC thresholds
 #define BTN_THRESHOLD 100  // Threshold tolerance
 #define BTN_RIGHT_VAL 3
-#define BTN_LEFT_VAL 1470
+#define BTN_LEFT_VAL 1500
-#define BTN_CONFIRM_VAL 2655
+#define BTN_CONFIRM_VAL 2700
-#define BTN_BACK_VAL 3470
+#define BTN_BACK_VAL 3550
 #define BTN_VOLUME_DOWN_VAL 3
 #define BTN_VOLUME_UP_VAL 2305
 

src/main.cpp

@@ -6,8 +6,10 @@
 #include <SPI.h>
 
 #include "Battery.h"
+#include "CrossPointState.h"
 #include "Input.h"
 #include "screens/EpubReaderScreen.h"
+#include "screens/FileSelectionScreen.h"
 #include "screens/FullScreenMessageScreen.h"
 
 #define SPI_FQ 40000000
@@ -28,10 +30,11 @@ GxEPD2_BW<GxEPD2_426_GDEQ0426T82, GxEPD2_426_GDEQ0426T82::HEIGHT> display(GxEPD2
                                                                                                  EPD_RST, EPD_BUSY));
 auto renderer = new EpdRenderer(&display);
 Screen* currentScreen;
+CrossPointState* appState;
 
 // Power button timing
 // Time required to confirm boot from sleep
-constexpr unsigned long POWER_BUTTON_WAKEUP_MS = 1500;
+constexpr unsigned long POWER_BUTTON_WAKEUP_MS = 1000;
 // Time required to enter sleep mode
 constexpr unsigned long POWER_BUTTON_SLEEP_MS = 1000;
 
@@ -62,9 +65,15 @@ void enterNewScreen(Screen* screen) {
 
 // Verify long press on wake-up from deep sleep
 void verifyWakeupLongPress() {
-  const auto input = getInput();
+  // Give the user up to 1000ms to start holding the power button, and must hold for POWER_BUTTON_WAKEUP_MS
+  const auto start = millis();
+  auto input = getInput();
+  while (input.button != POWER && millis() - start < 1000) {
+    delay(50);
+    input = getInput();
+  }
 
-  if (input.button == POWER && input.pressTime > POWER_BUTTON_WAKEUP_MS) {
+  if (input.button != POWER || input.pressTime < POWER_BUTTON_WAKEUP_MS) {
     // Button released too early. Returning to sleep.
     // IMPORTANT: Re-arm the wakeup trigger before sleeping again
     esp_deep_sleep_enable_gpio_wakeup(1ULL << BTN_GPIO3, ESP_GPIO_WAKEUP_GPIO_LOW);
@@ -77,7 +86,7 @@ void enterDeepSleep() {
   enterNewScreen(new FullScreenMessageScreen(renderer, "Sleeping", true, false, true));
 
   Serial.println("Power button released after a long press. Entering deep sleep.");
-  delay(2000);  // Allow Serial buffer to empty and display to update
+  delay(1000);  // Allow Serial buffer to empty and display to update
 
   // Enable Wakeup on LOW (button press)
   esp_deep_sleep_enable_gpio_wakeup(1ULL << BTN_GPIO3, ESP_GPIO_WAKEUP_GPIO_LOW);
@@ -102,16 +111,24 @@ void setupSerial() {
   }
 }
 
+void onGoHome();
+void onSelectEpubFile(const std::string& path) {
+  enterNewScreen(new FullScreenMessageScreen(renderer, "Loading..."));
+
+  Epub* epub = loadEpub(path);
+  if (epub) {
+    appState->openEpubPath = path;
+    appState->saveToFile();
+    enterNewScreen(new EpubReaderScreen(renderer, epub, onGoHome));
+  } else {
+    enterNewScreen(new FullScreenMessageScreen(renderer, "Failed to load epub"));
+  }
+}
+void onGoHome() { enterNewScreen(new FileSelectionScreen(renderer, onSelectEpubFile)); }
+
 void setup() {
   setupInputPinModes();
-
+  verifyWakeupLongPress();
-  // Check if boot was triggered by the Power Button (Deep Sleep Wakeup)
-  // If triggered by RST pin or Battery insertion, this will be false, allowing
-  // normal boot.
-  if (esp_sleep_get_wakeup_cause() == ESP_SLEEP_WAKEUP_GPIO) {
-    verifyWakeupLongPress();
-  }
-
   setupSerial();
 
   // Initialize pins
@@ -127,37 +144,21 @@ void setup() {
   display.setTextColor(GxEPD_BLACK);
   Serial.println("Display initialized");
 
-  enterNewScreen(new FullScreenMessageScreen(renderer, "Loading...", true));
+  enterNewScreen(new FullScreenMessageScreen(renderer, "Booting...", true));
 
   // SD Card Initialization
   SD.begin(SD_SPI_CS, SPI, SPI_FQ);
 
-  // TODO: Add a file selection screen, for now just load the first file
+  appState = CrossPointState::loadFromFile();
-  File root = SD.open("/");
+  if (!appState->openEpubPath.empty()) {
-  String filename;
+    Epub* epub = loadEpub(appState->openEpubPath);
-  while (true) {
+    if (epub) {
-    filename = root.getNextFileName();
+      enterNewScreen(new EpubReaderScreen(renderer, epub, onGoHome));
-    if (!filename) {
+      return;
-      break;
-    }
-
-    if (filename.substring(filename.length() - 5) == ".epub") {
-      Serial.printf("Found epub: %s\n", filename.c_str());
-      break;
     }
   }
 
-  if (!filename) {
+  enterNewScreen(new FileSelectionScreen(renderer, onSelectEpubFile));
-    enterNewScreen(new FullScreenMessageScreen(renderer, "Could not find epub"));
-    return;
-  }
-
-  Epub* epub = loadEpub(std::string(filename.c_str()));
-  if (epub) {
-    enterNewScreen(new EpubReaderScreen(renderer, epub));
-  } else {
-    enterNewScreen(new FullScreenMessageScreen(renderer, "Failed to load epub"));
-  }
 }
 
 void loop() {

src/screens/EpubReaderScreen.cpp

@@ -41,13 +41,14 @@ void EpubReaderScreen::onEnter() {
 
 void EpubReaderScreen::onExit() {
   vTaskDelete(displayTaskHandle);
+  displayTaskHandle = nullptr;
   xSemaphoreTake(sectionMutex, portMAX_DELAY);
   vSemaphoreDelete(sectionMutex);
   sectionMutex = nullptr;
 }
 
 void EpubReaderScreen::handleInput(const Input input) {
-  if (input.button == VOLUME_UP || input.button == VOLUME_DOWN) {
+  if (input.button == VOLUME_UP || input.button == VOLUME_DOWN || input.button == LEFT || input.button == RIGHT) {
     const bool skipChapter = input.pressTime > SKIP_CHAPTER_MS;
 
     // No current section, attempt to rerender the book
@@ -56,17 +57,17 @@ void EpubReaderScreen::handleInput(const Input input) {
       return;
     }
 
-    if (input.button == VOLUME_UP && skipChapter) {
+    if ((input.button == VOLUME_UP || input.button == LEFT) && skipChapter) {
       nextPageNumber = 0;
       currentSpineIndex--;
       delete section;
       section = nullptr;
-    } else if (input.button == VOLUME_DOWN && skipChapter) {
+    } else if ((input.button == VOLUME_DOWN || input.button == RIGHT) && skipChapter) {
       nextPageNumber = 0;
       currentSpineIndex++;
       delete section;
       section = nullptr;
-    } else if (input.button == VOLUME_UP) {
+    } else if (input.button == VOLUME_UP || input.button == LEFT) {
       if (section->currentPage > 0) {
         section->currentPage--;
       } else {
@@ -77,7 +78,7 @@ void EpubReaderScreen::handleInput(const Input input) {
         section = nullptr;
         xSemaphoreGive(sectionMutex);
       }
-    } else if (input.button == VOLUME_DOWN) {
+    } else if (input.button == VOLUME_DOWN || input.button == RIGHT) {
       if (section->currentPage < section->pageCount - 1) {
         section->currentPage++;
       } else {
@@ -91,6 +92,8 @@ void EpubReaderScreen::handleInput(const Input input) {
     }
 
     updateRequired = true;
+  } else if (input.button == BACK) {
+    onGoHome();
   }
 }
 

src/screens/EpubReaderScreen.h

@@ -15,6 +15,7 @@ class EpubReaderScreen final : public Screen {
   int currentSpineIndex = 0;
   int nextPageNumber = 0;
   bool updateRequired = false;
+  const std::function<void()> onGoHome;
 
   static void taskTrampoline(void* param);
   [[noreturn]] void displayTaskLoop();
@@ -22,7 +23,8 @@ class EpubReaderScreen final : public Screen {
   void renderStatusBar() const;
 
  public:
-  explicit EpubReaderScreen(EpdRenderer* renderer, Epub* epub) : Screen(renderer), epub(epub) {}
+  explicit EpubReaderScreen(EpdRenderer* renderer, Epub* epub, const std::function<void()>& onGoHome)
+      : Screen(renderer), epub(epub), onGoHome(onGoHome) {}
   ~EpubReaderScreen() override { free(section); }
   void onEnter() override;
   void onExit() override;

src/screens/FileSelectionScreen.cpp

@@ -0,0 +1,87 @@
+#include "FileSelectionScreen.h"
+
+#include <EpdRenderer.h>
+#include <SD.h>
+
+void FileSelectionScreen::taskTrampoline(void* param) {
+  auto* self = static_cast<FileSelectionScreen*>(param);
+  self->displayTaskLoop();
+}
+
+void FileSelectionScreen::onEnter() {
+  files.clear();
+  auto root = SD.open("/");
+  File file;
+  while ((file = root.openNextFile())) {
+    if (file.isDirectory()) {
+      file.close();
+      continue;
+    }
+
+    auto filename = std::string(file.name());
+    if (filename.substr(filename.length() - 5) != ".epub" || filename[0] == '.') {
+      file.close();
+      continue;
+    }
+
+    files.emplace_back(filename);
+    file.close();
+  }
+  root.close();
+
+  // Trigger first update
+  updateRequired = true;
+
+  xTaskCreate(&FileSelectionScreen::taskTrampoline, "FileSelectionScreenTask",
+              1024,               // Stack size
+              this,               // Parameters
+              1,                  // Priority
+              &displayTaskHandle  // Task handle
+  );
+}
+
+void FileSelectionScreen::onExit() {
+  vTaskDelete(displayTaskHandle);
+  displayTaskHandle = nullptr;
+}
+
+void FileSelectionScreen::handleInput(const Input input) {
+  if (input.button == VOLUME_DOWN || input.button == RIGHT) {
+    selectorIndex = (selectorIndex + 1) % files.size();
+    updateRequired = true;
+  } else if (input.button == VOLUME_UP || input.button == LEFT) {
+    selectorIndex = (selectorIndex + files.size() - 1) % files.size();
+    updateRequired = true;
+  } else if (input.button == CONFIRM) {
+    Serial.printf("Selected file: %s\n", files[selectorIndex].c_str());
+    onSelect("/" + files[selectorIndex]);
+  }
+}
+
+void FileSelectionScreen::displayTaskLoop() {
+  while (true) {
+    if (updateRequired) {
+      updateRequired = false;
+      render();
+    }
+    vTaskDelay(10 / portTICK_PERIOD_MS);
+  }
+}
+
+void FileSelectionScreen::render() const {
+  renderer->clearScreen();
+
+  const auto pageWidth = renderer->getPageWidth();
+  const auto titleWidth = renderer->getTextWidth("CrossPoint Reader", true);
+  renderer->drawText((pageWidth - titleWidth) / 2, 0, "CrossPoint Reader", true);
+
+  // Draw selection
+  renderer->fillRect(0, 50 + selectorIndex * 20 + 2, pageWidth - 1, 20, 1);
+
+  for (size_t i = 0; i < files.size(); i++) {
+    const auto file = files[i];
+    renderer->drawSmallText(50, 50 + i * 20, file.c_str(), i == selectorIndex ? 0 : 1);
+  }
+
+  renderer->flushDisplay();
+}

src/screens/FileSelectionScreen.h

@@ -0,0 +1,28 @@
+#pragma once
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+
+#include <functional>
+#include <string>
+#include <vector>
+
+#include "Screen.h"
+
+class FileSelectionScreen final : public Screen {
+  TaskHandle_t displayTaskHandle = nullptr;
+  std::vector<std::string> files;
+  int selectorIndex = 0;
+  bool updateRequired = false;
+  const std::function<void(const std::string&)> onSelect;
+
+  static void taskTrampoline(void* param);
+  [[noreturn]] void displayTaskLoop();
+  void render() const;
+
+ public:
+  explicit FileSelectionScreen(EpdRenderer* renderer, const std::function<void(const std::string&)>& onSelect)
+      : Screen(renderer), onSelect(onSelect) {}
+  void onEnter() override;
+  void onExit() override;
+  void handleInput(Input input) override;
+};