discstation 0.1.28 → 0.1.30

package/README.md

@@ -9,8 +9,8 @@ use every mode.
 ## Hardware
 
 - **Brain:** Raspberry Pi 4/5 (or any Linux box)
-- **Remote (optional):** ESP32 DevKit or ESP32-C6 with an SSD1306 OLED, 3
-  buttons, and a volume pot — connected by **USB serial** or over **Wi-Fi**
+- **Remote (optional):** ESP32 DevKit (WROOM-32) with an SSD1306 OLED, a
+  rotary encoder, and 3 buttons — connected by **USB serial** or over **Wi-Fi**
   (see below) — or none at all; the web UI / mobile app's on-screen remote
   covers the same controls when no ESP32 is detected, and steps aside
   (greyed out, auto-collapsing) the moment one appears.
@@ -61,9 +61,7 @@ remote can talk to the host over Wi-Fi instead of a USB cable.
 │   ├── discstation_meta.py   # TMDb video metadata
 │   └── static/               # Built-in web UI (index.html, app.js, style.css)
 ├── mobile/                   # Expo (React Native) companion app
-├── arduino/
-│   ├── c6/                   # ESP32-C6 firmware
-│   └── v1/                   # ESP32 DevKit firmware
+├── arduino/DiscStation/     # ESP32 DevKit remote firmware
 ├── scripts/setup.mjs         # `discstation-setup` — cross-OS installer dispatch
 ├── docs/                     # Platform support notes
 ├── install.sh / install-macos.sh / install-windows.ps1
@@ -113,10 +111,9 @@ Support by OS:
 # Linux host
 ./install.sh
 
-# Arduino
+# Arduino (ESP32 DevKit remote)
 arduino-cli lib install QRCode
-# Upload arduino/c6/DiscStation_C6.ino or arduino/v1/DiscStation.ino
-# to the matching ESP32 board
+arduino-cli compile --upload -b esp32:esp32:esp32 -p /dev/ttyUSB0 arduino/DiscStation
 
 # macOS host
 ./install-macos.sh

package/arduino/{v1 → DiscStation}/DiscStation.ino

@@ -22,17 +22,21 @@
 #define OLED_RESET    -1
 #define I2C_ADDRESS   0x3C
 
-#define BTN_SELECT_PIN  14
-#define BTN_UP_PIN      13
-#define BTN_DOWN_PIN    15
-#define POT_PIN         34
+#define BTN_EJECT_PIN     14  // was SELECT
+#define BTN_HOME_PIN      13  // was UP; also carries the 10s Wi-Fi-reset hold
+#define BTN_PLAYPAUSE_PIN 15  // was DOWN
+#define ENC_CLK_PIN       32  // freed ex-LED pin
+#define ENC_DT_PIN        33  // freed ex-LED pin
+#define ENC_SW_PIN         4  // encoder's click switch
 
 #define DEBOUNCE_MS      50
 #define LONG_PRESS_MS    1000
-#define POT_READ_MS      200
+#define ENC_CLICK_GUARD_MS 200  // ignore new SW presses this soon after a rotation tick (rotation vibration can bounce SW low)
+#define ENC_DEBOUNCE_US 2000     // ignore encoder interrupts closer together than this (contact bounce)
 #define DONE_RESET_MS    30000
 #define STANDBY_BLANK_MS 60000
-#define IDLE_BLANK_MS    45000   // blank the OLED after this long with no input on HOME/STANDBY
+#define IDLE_BLANK_MS    45000   // no input this long on HOME/STANDBY -> spinning-disc screensaver
+#define SAVER_FRAME_MS   90      // screensaver frame interval (~11fps)
 #define PING_TIMEOUT_MS  30000
 
 #define WIFI_RESET_HOLD_MS      10000  // hold SELECT this long on HOME to wipe Wi-Fi creds
@@ -217,36 +221,39 @@ bool displayOk = false;
 unsigned long returnToHomeAt = 0;
 unsigned long playStatusAt = 0;
 bool playStatusTemp = false;
-unsigned long lastPotRead = 0;
 
-// Select button state
-unsigned long selectDownAt = 0;
-bool selectDown = false;
-unsigned long selectLastDebounce = 0;
+// Encoder click (SW) - short/long press state, same shape as the old SELECT button
+unsigned long encClickDownAt = 0;
+bool encClickDown = false;
+unsigned long encClickLastDebounce = 0;
+unsigned long lastEncRotateMs = 0;   // set whenever a rotation tick is drained; guards SW against rotation noise
 
-// Up button state
-unsigned long upDownAt = 0;
-bool upDown = false;
-unsigned long upLastDebounce = 0;
+// EJECT button - single press, no long-press timer needed
+bool ejectDown = false;
+unsigned long ejectLastDebounce = 0;
 
-// Down button state
-unsigned long downDownAt = 0;
-bool downDown = false;
-unsigned long downLastDebounce = 0;
+// HOME/BACK button - single press; also carries the 10s Wi-Fi-reset hold
+unsigned long homeDownAt = 0;
+bool homeDown = false;
+unsigned long homeLastDebounce = 0;
 
-// FF/REW speed state (used by UP/DOWN during playback)
-int ffSpeedIndex = 0;
-int rewSpeedIndex = 0;
+// PLAY/PAUSE button - short = pause/resume, long = stop
+unsigned long playpauseDownAt = 0;
+bool playpauseDown = false;
+unsigned long playpauseLastDebounce = 0;
 
 int homeIndex = 0;
 int burnModeIndex = 0;
 int burnSpeedIndex = 0;
 bool editingSpeed = false;
 int playVolume = 50;
+bool playSeekMode = false;   // false = encoder rotate adjusts volume (default); true = seek/track-skip
 unsigned long standbyStartTime = 0;
 unsigned long lastMsgTime = 0;
-unsigned long lastInputTime = 0;   // last button press / screen change; drives OLED idle-blank
-bool displayBlank = false;
+unsigned long lastInputTime = 0;   // last button press / screen change; drives the idle screensaver
+bool displayBlank = false;          // true = real UI hidden, disc screensaver running; any input restores it
+unsigned long lastSaverFrame = 0;
+int saverStep = 0;
 bool audioPlayMode = false;
 int displayRotation = 0;
 
@@ -254,20 +261,22 @@ int displayRotation = 0;
 int indeterminateCount = 0;
 unsigned long lastIndeterminateAnim = 0;
 
-int readBucket(int count) {
-  int raw = analogRead(POT_PIN);
-  int idx = raw * count / 4096;
-  if (idx < 0) idx = 0;
-  if (idx >= count) idx = count - 1;
-  return idx;
-}
-
-int readPercent() {
-  int raw = analogRead(POT_PIN);
-  int pct = raw * 100 / 4095;
-  if (pct < 0) pct = 0;
-  if (pct > 100) pct = 100;
-  return ((pct + 2) / 5) * 5;
+// --- Rotary encoder decode ---
+// Interrupt only on CLK's falling edge (one detent = one interrupt, not four
+// - a mechanical encoder's contact bounce can otherwise fire far more often
+// than that and starve other tasks, including the USB-serial link); DT's
+// level at that instant gives direction. A short time debounce rejects
+// contact chatter. Interrupt-driven because the main loop's ~20ms cadence is
+// too slow to reliably catch a fast spin without missing ticks.
+volatile int16_t encTicks = 0;   // whole detents ready for loop() to drain
+volatile uint32_t encLastIsrUs = 0;
+
+void IRAM_ATTR encoderISR() {
+  uint32_t now = micros();
+  if (now - encLastIsrUs < ENC_DEBOUNCE_US) return;
+  encLastIsrUs = now;
+  if (digitalRead(ENC_CLK_PIN) != digitalRead(ENC_DT_PIN)) encTicks++;
+  else encTicks--;
 }
 
 void sendHomeMode() {
@@ -531,6 +540,46 @@ void drawDisconnected() {
   display.display();
 }
 
+// 24-step sine table x64: sin(i*15deg)*64. Drives the idle disc screensaver.
+const int8_t SIN24[24] = {
+  0, 17, 32, 45, 55, 62, 64, 62, 55, 45, 32, 17,
+  0, -17, -32, -45, -55, -62, -64, -62, -55, -45, -32, -17
+};
+
+// Spinning-disc screensaver frame - shown after IDLE_BLANK_MS on HOME/STANDBY
+// instead of powering the panel off. Keeps the OLED lit and the I2C bus busy so
+// a USB power-bank feeding the remote doesn't hit its no-load auto-shutoff.
+void drawDiscSaver(int step) {
+  if (!displayOk) return;
+  const int cx = 64, cy = 32, R = 30;
+  display.clearDisplay();
+  display.fillCircle(cx, cy, R, SSD1306_WHITE);                 // vinyl body
+
+  for (int cl = 0; cl < 2; cl++) {                              // 2 groove clusters, 180 apart
+    int base = step + cl * 12;
+    for (int g = 0; g < 3; g++) {                               // 3 nested "sound wave" grooves
+      for (int t = 0; t < 3; t++) {                             // 3px-thick stroke
+        int r = 16 + g * 5 + t;
+        int px = -100, py = -100;
+        for (int a = 0; a <= 4; a++) {                          // ~60deg arc, 4 chords
+          int i = (base + a) % 24;
+          int x = cx + r * SIN24[(i + 6) % 24] / 64;
+          int y = cy + r * SIN24[i] / 64;
+          if (px > -100) display.drawLine(px, py, x, y, SSD1306_BLACK);
+          px = x; py = y;
+        }
+      }
+    }
+  }
+
+  display.fillCircle(cx, cy, 13, SSD1306_BLACK);                // concentric label
+  display.fillCircle(cx, cy, 11, SSD1306_WHITE);
+  display.fillCircle(cx, cy, 8,  SSD1306_BLACK);
+  display.fillCircle(cx, cy, 5,  SSD1306_WHITE);
+  display.fillCircle(cx, cy, 2,  SSD1306_BLACK);                // center hole
+  display.display();
+}
+
 // Returns true if this call actually woke a blanked screen - callers use that
 // to swallow the wake press so it doesn't also trigger a menu action.
 bool wakeDisplay() {
@@ -564,13 +613,16 @@ void drawPlay() {
   display.setCursor(2, 30);
   printUpper(line2);
   display.setCursor(2, 44);
-  display.print("VOL // ");
-  display.print(playVolume);
-  display.print("%");
-  if (!audioPlayMode) {
-    display.setCursor(2, 56);
-    display.print("SELECT // PLAY");
+  if (playSeekMode) {
+    display.print(audioPlayMode ? "TURN // SKIP TRACK" : "TURN // SEEK");
+  } else {
+    display.print("VOL // ");
+    display.print(playVolume);
+    display.print("%");
   }
+  display.setCursor(2, 56);
+  display.print("CLICK // ");
+  display.print(playSeekMode ? "VOL MODE" : "SEEK MODE");
 
   display.display();
 }
@@ -592,7 +644,6 @@ void parseMessage(String msg) {
   Out.println(msg);
 
   if (msg.startsWith("HOME:")) {
-    homeIndex = readBucket(homeCount);
     drawHome();
 
   } else if (msg.startsWith("DISC:")) {
@@ -626,7 +677,6 @@ void parseMessage(String msg) {
   } else if (msg.startsWith("TITLE:")) {
     titleLine = msg.substring(6);
     if (titleLine.length() > 20) titleLine = titleLine.substring(0, 20);
-    burnModeIndex = readBucket(BURN_COUNT);
     drawBurnReady();
 
   } else if (msg.startsWith("META:")) {
@@ -642,8 +692,8 @@ void parseMessage(String msg) {
   } else if (msg.startsWith("PLAY:")) {
     line1 = msg.substring(5);
     line2 = "Playing disc";
-    playVolume = readPercent();
-    Out.print("POT:");            // push the knob's current level so playback starts at it
+    playSeekMode = false;          // always start in volume mode
+    Out.print("POT:");             // push the last-used volume so playback starts at it
     Out.println(playVolume);
     drawPlay();
 
@@ -753,16 +803,13 @@ void setup() {
   Serial.begin(115200);
   esp_task_wdt_add(NULL);
   Wire.begin(21, 22);
-  pinMode(BTN_SELECT_PIN, INPUT_PULLUP);
-  pinMode(BTN_UP_PIN, INPUT_PULLUP);
-  pinMode(BTN_DOWN_PIN, INPUT_PULLUP);
-  pinMode(POT_PIN, INPUT);
-  analogReadResolution(12);
-  analogSetPinAttenuation(POT_PIN, ADC_11db);
-
-  homeIndex = readBucket(homeCount);
-  burnModeIndex = readBucket(BURN_COUNT);
-  playVolume = readPercent();
+  pinMode(BTN_EJECT_PIN, INPUT_PULLUP);
+  pinMode(BTN_HOME_PIN, INPUT_PULLUP);
+  pinMode(BTN_PLAYPAUSE_PIN, INPUT_PULLUP);
+  pinMode(ENC_SW_PIN, INPUT_PULLUP);
+  pinMode(ENC_CLK_PIN, INPUT_PULLUP);
+  pinMode(ENC_DT_PIN, INPUT_PULLUP);
+  attachInterrupt(digitalPinToInterrupt(ENC_CLK_PIN), encoderISR, FALLING);
 
   displayOk = display.begin(SSD1306_SWITCHCAPVCC, I2C_ADDRESS);
 
@@ -855,96 +902,137 @@ void handleSelectPress(bool longPress) {
     Out.println("CANCEL");
     drawStandby();
 
-  } else if (uiState == UI_STANDBY) {
-    displayRotation = 2;
-    drawStandby();
   } else if (uiState == UI_PLAY) {
-    ffSpeedIndex = 0;
-    rewSpeedIndex = 0;
     if (longPress) {
       Out.println("PLAY_STOP");
     } else {
-      Out.println("PLAY_BUTTON");
+      playSeekMode = !playSeekMode;   // encoder click swaps what rotating does
+      drawPlay();
     }
   }
 }
 
-void handleUp(bool longPress) {
-  if (wakeDisplay()) { lastInputTime = millis(); return; }  // wake-only press, swallow the action
+// Encoder rotation replaces UP/DOWN. One tick = one detent (see encoderISR).
+// STANDBY's displayRotation flip and BURN_READY's mode/speed scroll are
+// otherwise unchanged from the old UP/DOWN behavior. PLAY defaults to
+// adjusting volume; a short encoder click (see handleSelectPress) swaps it
+// to seek/track-skip instead - there's only one rotate axis now, where
+// before the pot (volume) and UP/DOWN (seek) were independent.
+void handleEncoderCW() {
+  if (wakeDisplay()) { lastInputTime = millis(); return; }  // wake-only turn, swallow the action
   lastInputTime = millis();
   if (uiState == UI_HOME) {
     if (homeCount > 0) {
-      homeIndex = (homeIndex - 1 + homeCount) % homeCount;
+      homeIndex = (homeIndex + 1) % homeCount;
       sendHomeMode();
       drawHome();
     }
   } else if (uiState == UI_BURN_READY) {
     if (editingSpeed) {
-      burnSpeedIndex = (burnSpeedIndex - 1 + SPEED_COUNT) % SPEED_COUNT;
+      burnSpeedIndex = (burnSpeedIndex + 1) % SPEED_COUNT;
       Out.print("SPEED:");
       Out.println(SPEED_MODES[burnSpeedIndex]);
       drawBurnReady();
     } else {
-      burnModeIndex = (burnModeIndex - 1 + BURN_COUNT) % BURN_COUNT;
+      burnModeIndex = (burnModeIndex + 1) % BURN_COUNT;
       sendBurnMode();
       drawBurnReady();
     }
   } else if (uiState == UI_STANDBY) {
-    displayRotation = 0;
+    displayRotation = 2;
     drawStandby();
   } else if (uiState == UI_PLAY) {
-    if (audioPlayMode) {
-      Out.println(displayRotation == 0 ? (longPress ? "REW:BIG" : "REW:10") : (longPress ? "FF:BIG" : "FF:10"));
-      return;
-    }
-    rewSpeedIndex = 0;
-    if (longPress) {
-      Out.println("FF:BIG");
+    if (!playSeekMode) {
+      playVolume = min(100, playVolume + 5);
+      Out.print("POT:");
+      Out.println(playVolume);
+      drawPlay();
+    } else if (audioPlayMode) {
+      Out.println(displayRotation == 0 ? "FF:BIG" : "REW:BIG");  // next/prev track, screen-flip-aware
     } else {
-      ffSpeedIndex = (ffSpeedIndex + 1) % 4;
-      int seek_sec[] = {10, 20, 30, 60};
-      Out.print("FF:");
-      Out.println(seek_sec[ffSpeedIndex]);
+      Out.println("FF:10");
     }
   }
 }
 
-void handleDown(bool longPress) {
-  if (wakeDisplay()) { lastInputTime = millis(); return; }  // wake-only press, swallow the action
+void handleEncoderCCW() {
+  if (wakeDisplay()) { lastInputTime = millis(); return; }  // wake-only turn, swallow the action
   lastInputTime = millis();
   if (uiState == UI_HOME) {
     if (homeCount > 0) {
-      homeIndex = (homeIndex + 1) % homeCount;
+      homeIndex = (homeIndex - 1 + homeCount) % homeCount;
       sendHomeMode();
       drawHome();
     }
   } else if (uiState == UI_BURN_READY) {
     if (editingSpeed) {
-      burnSpeedIndex = (burnSpeedIndex + 1) % SPEED_COUNT;
+      burnSpeedIndex = (burnSpeedIndex - 1 + SPEED_COUNT) % SPEED_COUNT;
       Out.print("SPEED:");
       Out.println(SPEED_MODES[burnSpeedIndex]);
       drawBurnReady();
     } else {
-      burnModeIndex = (burnModeIndex + 1) % BURN_COUNT;
+      burnModeIndex = (burnModeIndex - 1 + BURN_COUNT) % BURN_COUNT;
       sendBurnMode();
       drawBurnReady();
     }
   } else if (uiState == UI_STANDBY) {
-    displayRotation = 2;
+    displayRotation = 0;
     drawStandby();
   } else if (uiState == UI_PLAY) {
-    if (audioPlayMode) {
-      Out.println(displayRotation == 0 ? (longPress ? "FF:BIG" : "FF:10") : (longPress ? "REW:BIG" : "REW:10"));
-      return;
-    }
-    ffSpeedIndex = 0;
-    if (longPress) {
-      Out.println("REW:BIG");
+    if (!playSeekMode) {
+      playVolume = max(0, playVolume - 5);
+      Out.print("POT:");
+      Out.println(playVolume);
+      drawPlay();
+    } else if (audioPlayMode) {
+      Out.println(displayRotation == 0 ? "REW:BIG" : "FF:BIG");
     } else {
-      rewSpeedIndex = (rewSpeedIndex + 1) % 4;
-      int seek_sec[] = {10, 20, 30, 60};
-      Out.print("REW:");
-      Out.println(seek_sec[rewSpeedIndex]);
+      Out.println("REW:10");
+    }
+  }
+}
+
+// EJECT: fixed shortcut, any idle-ish state. Not during an active burn/rip -
+// don't pull the disc mid-operation (matches the old SELECT-EJECT's implicit
+// restriction, since that branch only ever existed on HOME/STANDBY).
+void handleEjectButton() {
+  if (wakeDisplay()) { lastInputTime = millis(); return; }
+  lastInputTime = millis();
+  if (uiState == UI_HOME || uiState == UI_STANDBY || uiState == UI_DISCONNECTED || uiState == UI_PLAY) {
+    Out.println("EJECT");
+    line1 = "Ejecting...";
+    line2 = "";
+    line3 = "";
+    returnToHomeAt = millis() + 5000;
+    drawStatus();
+  }
+}
+
+// HOME/BACK: universal escape from anywhere back to the top menu.
+void handleHomeButton() {
+  if (wakeDisplay()) { lastInputTime = millis(); return; }
+  lastInputTime = millis();
+  if (uiState == UI_HOME) return;
+  Out.println(uiState == UI_PLAY ? "PLAY_STOP" : "CANCEL");
+  drawHome();
+}
+
+// PLAY/PAUSE: toggles pause while playing; from HOME, jumps straight into
+// PLAY without needing to scroll the menu there first.
+void handlePlayPauseButton(bool longPress) {
+  if (wakeDisplay()) { lastInputTime = millis(); return; }
+  lastInputTime = millis();
+  if (uiState == UI_PLAY) {
+    Out.println(longPress ? "PLAY_STOP" : "PLAY_BUTTON");
+  } else if (uiState == UI_HOME && !longPress) {
+    bool hasPlay = false;
+    for (int i = 0; i < homeCount; i++) if (homeModes[i] == "PLAY") hasPlay = true;
+    if (hasPlay) {
+      Out.println("SELECT:PLAY");
+      line1 = "Selected";
+      line2 = "PLAY";
+      line3 = "";
+      drawStatus();
     }
   }
 }
@@ -1012,31 +1100,60 @@ void loop() {
     drawPlay();
   }
 
-  // --- Pot reading (PLAY only, volume) ---
-  if (uiState == UI_PLAY && millis() - lastPotRead > POT_READ_MS) {
-    lastPotRead = millis();
-    int nextVolume = readPercent();
-    if (abs(nextVolume - playVolume) >= 3) {
-      playVolume = nextVolume;
-      Out.print("POT:");
-      Out.println(playVolume);
-      drawPlay();
+  // --- Encoder rotation: drain ticks accumulated by encoderISR ---
+  {
+    noInterrupts();
+    int16_t ticks = encTicks;
+    encTicks = 0;
+    interrupts();
+    if (ticks != 0) lastEncRotateMs = millis();
+    while (ticks > 0) { handleEncoderCW(); ticks--; }
+    while (ticks < 0) { handleEncoderCCW(); ticks++; }
+  }
+
+  // --- Encoder click (SW) - same debounce/long-press shape as the old SELECT.
+  // Also guarded against rotation: spinning the knob can momentarily bounce
+  // SW low too, which was being misread as a real click and firing SELECT/PLAY. ---
+  {
+    bool sw = digitalRead(ENC_SW_PIN) == LOW;
+    if (sw && !encClickDown && millis() - encClickLastDebounce > DEBOUNCE_MS &&
+        millis() - lastEncRotateMs > ENC_CLICK_GUARD_MS) {
+      encClickDown = true;
+      encClickDownAt = millis();
+    }
+    if (!sw && encClickDown) {
+      encClickDown = false;
+      encClickLastDebounce = millis();
+      handleSelectPress(millis() - encClickDownAt >= LONG_PRESS_MS);
     }
   }
 
-  // --- SELECT button ---
+  // --- EJECT button (single press, no long-press timer) ---
   {
-    bool sel = digitalRead(BTN_SELECT_PIN) == LOW;
-    if (sel && !selectDown && millis() - selectLastDebounce > DEBOUNCE_MS) {
-      selectDown = true;
-      selectDownAt = millis();
+    bool ej = digitalRead(BTN_EJECT_PIN) == LOW;
+    if (ej && !ejectDown && millis() - ejectLastDebounce > DEBOUNCE_MS) {
+      ejectDown = true;
+    }
+    if (!ej && ejectDown) {
+      ejectDown = false;
+      ejectLastDebounce = millis();
+      handleEjectButton();
+    }
+  }
+
+  // --- HOME/BACK button (single press; 10s hold = Wi-Fi reset) ---
+  {
+    bool hm = digitalRead(BTN_HOME_PIN) == LOW;
+    if (hm && !homeDown && millis() - homeLastDebounce > DEBOUNCE_MS) {
+      homeDown = true;
+      homeDownAt = millis();
       wifiResetArmed = false;
     }
-    // 10s hold on HOME (or SETUP) = wipe Wi-Fi creds + reboot to portal. Fires
-    // while still held so the eventual release doesn't also trigger EJECT.
-    if (sel && selectDown && !wifiResetArmed &&
+    // 10s hold on HOME/SETUP/STANDBY = wipe Wi-Fi creds + reboot to portal. Fires
+    // while still held so the eventual release doesn't also trigger the normal action.
+    if (hm && homeDown && !wifiResetArmed &&
         (uiState == UI_HOME || uiState == UI_SETUP || uiState == UI_STANDBY) &&
-        millis() - selectDownAt >= WIFI_RESET_HOLD_MS) {
+        millis() - homeDownAt >= WIFI_RESET_HOLD_MS) {
       wifiResetArmed = true;
       Out.println("WiFi: creds wiped, rebooting");
       clearCreds();
@@ -1044,47 +1161,25 @@ void loop() {
       delay(800);
       ESP.restart();
     }
-    if (!sel && selectDown) {
-      selectDown = false;
-      selectLastDebounce = millis();
-      if (!wifiResetArmed) {
-        handleSelectPress(millis() - selectDownAt >= LONG_PRESS_MS);
-      }
+    if (!hm && homeDown) {
+      homeDown = false;
+      homeLastDebounce = millis();
+      if (!wifiResetArmed) handleHomeButton();
       wifiResetArmed = false;
     }
   }
 
-  // --- UP button ---
+  // --- PLAY/PAUSE button (short = pause/resume, long = stop) ---
   {
-    bool up = digitalRead(BTN_UP_PIN) == LOW;
-    if (up && !upDown && millis() - upLastDebounce > DEBOUNCE_MS) {
-      upDown = true;
-      upDownAt = millis();
+    bool pp = digitalRead(BTN_PLAYPAUSE_PIN) == LOW;
+    if (pp && !playpauseDown && millis() - playpauseLastDebounce > DEBOUNCE_MS) {
+      playpauseDown = true;
+      playpauseDownAt = millis();
     }
-    if (!up && upDown) {
-      upDown = false;
-      upLastDebounce = millis();
-      bool lp = millis() - upDownAt >= LONG_PRESS_MS;
-      if (uiState == UI_PLAY || !lp) {
-        handleUp(lp);
-      }
-    }
-  }
-
-  // --- DOWN button ---
-  {
-    bool dn = digitalRead(BTN_DOWN_PIN) == LOW;
-    if (dn && !downDown && millis() - downLastDebounce > DEBOUNCE_MS) {
-      downDown = true;
-      downDownAt = millis();
-    }
-    if (!dn && downDown) {
-      downDown = false;
-      downLastDebounce = millis();
-      bool lp = millis() - downDownAt >= LONG_PRESS_MS;
-      if (uiState == UI_PLAY || !lp) {
-        handleDown(lp);
-      }
+    if (!pp && playpauseDown) {
+      playpauseDown = false;
+      playpauseLastDebounce = millis();
+      handlePlayPauseButton(millis() - playpauseDownAt >= LONG_PRESS_MS);
     }
   }
 
@@ -1096,12 +1191,19 @@ void loop() {
     if (!displayBlank) drawStatus();
   }
 
-  // --- OLED idle blanking (HOME + STANDBY) ---
+  // --- Idle disc screensaver (HOME + STANDBY) ---
   if (displayOk && !displayBlank &&
       (uiState == UI_HOME || uiState == UI_STANDBY) &&
       (long)(millis() - lastInputTime) >= IDLE_BLANK_MS) {
-    display.ssd1306_command(0xAE);
     displayBlank = true;
+    saverStep = 0;
+    lastSaverFrame = 0;
+  }
+  if (displayBlank && displayOk &&
+      (long)(millis() - lastSaverFrame) >= SAVER_FRAME_MS) {
+    lastSaverFrame = millis();
+    drawDiscSaver(saverStep);
+    saverStep = (saverStep + 1) % 24;
   }
 
   // --- PING timeout (disconnected) ---

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "discstation",
-  "version": "0.1.28",
+  "version": "0.1.30",
   "description": "DiscStation optical-media appliance host — one cross-OS installer",
   "bin": {
     "discstation-setup": "scripts/setup.mjs",

package/src/discstation.py

@@ -4558,7 +4558,7 @@ def main():
                 port = discstation_host.serial_port()
                 if port:
                     print(f"Using ESP32 serial port: {port}")
-                    ser = serial.Serial(port, discstation_burn.BAUD, timeout=1, write_timeout=1)
+                    ser = serial.Serial(port, discstation_burn.BAUD, timeout=1, write_timeout=2)
                     if discstation_host.system_name() == "linux":
                         ser.setDTR(False)
                         time.sleep(0.1)

package/src/discstation_burn.py

@@ -538,9 +538,23 @@ def send(ser, msg):
             pass
     if not ser:
         return False
+    payload = (msg + '\n').encode()
     try:
         with SERIAL_WRITE_LOCK:
-            ser.write((msg + '\n').encode())
+            # pyserial's Serial.write() on Linux waits on select() for the fd
+            # to report writable before it calls the real write() - some
+            # USB-CDC-ACM devices (e.g. the ESP32-C6's native USB peripheral,
+            # unlike a CP2102/CH340 bridge chip) never signal that through
+            # select() even though a plain write succeeds instantly, so
+            # ser.write() times out forever on those. Write through the raw
+            # fd directly for a real serial port; other transports
+            # (TcpSerial/VirtualSerial) keep their own write().
+            fileno = getattr(ser, "fileno", None)
+            if isinstance(ser, serial.Serial) and fileno:
+                os.write(fileno(), payload)
+            else:
+                ser.write(payload)
+        return True
     except (serial.SerialException, OSError) as e:
         if not _serial_write_failed:
             print(f"serial send error ('{msg[:30]}'): {e}")
@@ -549,7 +563,6 @@ def send(ser, msg):
     except Exception as e:
         print(f"serial send error ('{msg[:30]}'): {e}")
         return False
-    return True
 
 def safe_send(ser, msg):
     if not ser: