discstation 0.1.27 → 0.1.28

package/arduino/c6/DiscStation_C6.ino

@@ -545,8 +545,10 @@ void drawLoading() {
   display.display();
 }
 
-void wakeDisplay() {
-  if (!displayBlank || !displayOk) return;
+// 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 +563,7 @@ void wakeDisplay() {
     case UI_LOADING: drawLoading(); break;
     case UI_SETUP: drawSetup(); break;
   }
+  return true;
 }
 
 void drawPlay() {
@@ -655,6 +658,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 +815,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 +901,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 +938,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) {

package/arduino/v1/DiscStation.ino

@@ -531,8 +531,10 @@ void drawDisconnected() {
   display.display();
 }
 
-void wakeDisplay() {
-  if (!displayBlank || !displayOk) return;
+// 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 +548,7 @@ void wakeDisplay() {
     case UI_DISCONNECTED: drawDisconnected(); break;
     case UI_SETUP: drawSetup(); break;
   }
+  return true;
 }
 
 void drawPlay() {
@@ -640,6 +643,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 +780,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 +870,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 +910,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) {

package/package.json

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