discstation 0.1.27 → 0.1.29

package/arduino/c6/DiscStation_C6.ino

@@ -31,7 +31,8 @@
 #define POT_READ_MS      200
 #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
@@ -241,8 +242,10 @@ bool editingSpeed = false;
 int playVolume = 50;
 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;
 
@@ -545,8 +548,50 @@ void drawLoading() {
   display.display();
 }
 
-void wakeDisplay() {
-  if (!displayBlank || !displayOk) return;
+// 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() {
+  if (!displayBlank || !displayOk) return false;
   display.ssd1306_command(0xAF);
   displayBlank = false;
   switch (uiState) {
@@ -561,6 +606,7 @@ void wakeDisplay() {
     case UI_LOADING: drawLoading(); break;
     case UI_SETUP: drawSetup(); break;
   }
+  return true;
 }
 
 void drawPlay() {
@@ -655,6 +701,8 @@ void parseMessage(String msg) {
     line1 = msg.substring(5);
     line2 = "Playing disc";
     playVolume = readPercent();
+    Out.print("POT:");            // push the knob's current level so playback starts at it
+    Out.println(playVolume);
     drawPlay();
 
   } else if (msg.startsWith("PLAY_MODE:")) {
@@ -810,7 +858,7 @@ void setup() {
 }
 
 void handleSelectPress(bool longPress) {
-  wakeDisplay();
+  if (wakeDisplay()) { lastInputTime = millis(); return; }  // wake-only press, swallow the action
   lastInputTime = millis();
   if (uiState == UI_HOME) {
     if (longPress) {
@@ -896,7 +944,7 @@ void handleSelectPress(bool longPress) {
 }
 
 void handleUp(bool longPress) {
-  wakeDisplay();
+  if (wakeDisplay()) { lastInputTime = millis(); return; }  // wake-only press, swallow the action
   lastInputTime = millis();
   if (uiState == UI_HOME) {
     if (homeCount > 0) {
@@ -933,7 +981,7 @@ void handleUp(bool longPress) {
 }
 
 void handleDown(bool longPress) {
-  wakeDisplay();
+  if (wakeDisplay()) { lastInputTime = millis(); return; }  // wake-only press, swallow the action
   lastInputTime = millis();
   if (uiState == UI_HOME) {
     if (homeCount > 0) {
@@ -1113,11 +1161,19 @@ void loop() {
     if (!displayBlank) drawLoading();
   }
 
+  // --- 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;
   }
 
   if (uiState != UI_DISCONNECTED &&

package/arduino/v1/DiscStation.ino

@@ -32,7 +32,8 @@
 #define POT_READ_MS      200
 #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
@@ -245,8 +246,10 @@ bool editingSpeed = false;
 int playVolume = 50;
 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;
 
@@ -531,8 +534,50 @@ void drawDisconnected() {
   display.display();
 }
 
-void wakeDisplay() {
-  if (!displayBlank || !displayOk) return;
+// 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() {
+  if (!displayBlank || !displayOk) return false;
   display.ssd1306_command(0xAF);
   displayBlank = false;
   switch (uiState) {
@@ -546,6 +591,7 @@ void wakeDisplay() {
     case UI_DISCONNECTED: drawDisconnected(); break;
     case UI_SETUP: drawSetup(); break;
   }
+  return true;
 }
 
 void drawPlay() {
@@ -640,6 +686,8 @@ void parseMessage(String msg) {
     line1 = msg.substring(5);
     line2 = "Playing disc";
     playVolume = readPercent();
+    Out.print("POT:");            // push the knob's current level so playback starts at it
+    Out.println(playVolume);
     drawPlay();
 
   } else if (msg.startsWith("PLAY_MODE:")) {
@@ -775,7 +823,7 @@ void setup() {
 }
 
 void handleSelectPress(bool longPress) {
-  wakeDisplay();
+  if (wakeDisplay()) { lastInputTime = millis(); return; }  // wake-only press, swallow the action
   lastInputTime = millis();
   if (uiState == UI_HOME) {
     if (longPress) {
@@ -865,7 +913,7 @@ void handleSelectPress(bool longPress) {
 }
 
 void handleUp(bool longPress) {
-  wakeDisplay();
+  if (wakeDisplay()) { lastInputTime = millis(); return; }  // wake-only press, swallow the action
   lastInputTime = millis();
   if (uiState == UI_HOME) {
     if (homeCount > 0) {
@@ -905,7 +953,7 @@ void handleUp(bool longPress) {
 }
 
 void handleDown(bool longPress) {
-  wakeDisplay();
+  if (wakeDisplay()) { lastInputTime = millis(); return; }  // wake-only press, swallow the action
   lastInputTime = millis();
   if (uiState == UI_HOME) {
     if (homeCount > 0) {
@@ -1091,12 +1139,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.27",
+  "version": "0.1.29",
   "description": "DiscStation optical-media appliance host — one cross-OS installer",
   "bin": {
     "discstation-setup": "scripts/setup.mjs",