discstation 0.1.26 → 0.1.28

package/arduino/c6/DiscStation_C6.ino

@@ -24,8 +24,6 @@
 #define BTN_SELECT_PIN  21  // D3
 #define BTN_UP_PIN      20  // D9/MISO
 #define BTN_DOWN_PIN    18  // D10/MOSI
-#define LED_POWER_PIN   15  // Built-in user LED
-#define LED_ACT_PIN     16  // D6/TX
 #define POT_PIN          0  // D0/A0 (ADC)
 
 #define DEBOUNCE_MS      50
@@ -35,11 +33,10 @@
 #define STANDBY_BLANK_MS 60000
 #define IDLE_BLANK_MS    45000   // blank the OLED after this long with no input on HOME/STANDBY
 #define PING_TIMEOUT_MS  30000
-#define LED_BLINK_MS     250
 
 #define WIFI_RESET_HOLD_MS      10000
 #define WIFI_CONNECT_TIMEOUT_MS 18000
-#define WIFI_RETRY_MS           30000
+#define WIFI_RETRY_MS           15000
 
 #define MAX_HOME_MODES 5
 #define BURN_COUNT 4
@@ -237,8 +234,6 @@ unsigned long downLastDebounce = 0;
 int ffSpeedIndex = 0;
 int rewSpeedIndex = 0;
 
-bool actLedState = false;
-unsigned long lastLedBlink = 0;
 int homeIndex = 0;
 int burnModeIndex = 0;
 int burnSpeedIndex = 0;
@@ -550,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) {
@@ -566,6 +563,7 @@ void wakeDisplay() {
     case UI_LOADING: drawLoading(); break;
     case UI_SETUP: drawSetup(); break;
   }
+  return true;
 }
 
 void drawPlay() {
@@ -660,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:")) {
@@ -792,10 +792,6 @@ void setup() {
   pinMode(BTN_SELECT_PIN, INPUT_PULLUP);
   pinMode(BTN_UP_PIN, INPUT_PULLUP);
   pinMode(BTN_DOWN_PIN, INPUT_PULLUP);
-  pinMode(LED_POWER_PIN, OUTPUT);
-  pinMode(LED_ACT_PIN, OUTPUT);
-  digitalWrite(LED_POWER_PIN, HIGH);
-  digitalWrite(LED_ACT_PIN, LOW);
   pinMode(POT_PIN, INPUT);
   analogReadResolution(12);
 
@@ -812,13 +808,6 @@ void setup() {
     delay(3000);
   }
 
-  for (int i = 0; i < 3; i++) {
-    digitalWrite(LED_ACT_PIN, HIGH);
-    delay(150);
-    digitalWrite(LED_ACT_PIN, LOW);
-    delay(150);
-  }
-
   drawStandby();
   lastMsgTime = millis();
   lastInputTime = millis();
@@ -826,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) {
@@ -912,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) {
@@ -949,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) {
@@ -1134,10 +1123,6 @@ void loop() {
       (long)(millis() - lastInputTime) >= IDLE_BLANK_MS) {
     display.ssd1306_command(0xAE);
     displayBlank = true;
-    digitalWrite(LED_POWER_PIN, LOW);
-  }
-  if (!displayBlank) {
-    digitalWrite(LED_POWER_PIN, HIGH);
   }
 
   if (uiState != UI_DISCONNECTED &&
@@ -1145,28 +1130,5 @@ void loop() {
     drawDisconnected();
   }
 
-  {
-    bool ledOn = false;
-    if (uiState == UI_BURN_READY || uiState == UI_PLAY || uiState == UI_WAITING || uiState == UI_IP) {
-      ledOn = true;
-    } else if (uiState == UI_STATUS) {
-      if (progressPercent >= 0) {
-        ledOn = (millis() - lastLedBlink > LED_BLINK_MS);
-        if (ledOn) {
-          lastLedBlink = millis();
-          actLedState = !actLedState;
-        }
-        ledOn = actLedState;
-      } else {
-        ledOn = true;
-      }
-    } else if (uiState == UI_HOME || uiState == UI_STANDBY || uiState == UI_LOADING) {
-      ledOn = false;
-    } else if (uiState == UI_DISCONNECTED) {
-      ledOn = true;
-    }
-    digitalWrite(LED_ACT_PIN, ledOn ? HIGH : LOW);
-  }
-
   delay(20);
 }

package/arduino/v1/DiscStation.ino

@@ -25,8 +25,6 @@
 #define BTN_SELECT_PIN  14
 #define BTN_UP_PIN      13
 #define BTN_DOWN_PIN    15
-#define LED_POWER_PIN   32
-#define LED_ACT_PIN     33
 #define POT_PIN         34
 
 #define DEBOUNCE_MS      50
@@ -36,11 +34,10 @@
 #define STANDBY_BLANK_MS 60000
 #define IDLE_BLANK_MS    45000   // blank the OLED after this long with no input on HOME/STANDBY
 #define PING_TIMEOUT_MS  30000
-#define LED_BLINK_MS     250
 
 #define WIFI_RESET_HOLD_MS      10000  // hold SELECT this long on HOME to wipe Wi-Fi creds
 #define WIFI_CONNECT_TIMEOUT_MS 18000  // give a stored-creds join this long before falling to the portal
-#define WIFI_RETRY_MS           30000  // if a live link drops, force a re-join after this
+#define WIFI_RETRY_MS           15000  // if a live link drops, force a re-join after this
 
 #define MAX_HOME_MODES 5
 #define BURN_COUNT 4
@@ -241,9 +238,6 @@ unsigned long downLastDebounce = 0;
 int ffSpeedIndex = 0;
 int rewSpeedIndex = 0;
 
-// LED state
-bool actLedState = false;
-unsigned long lastLedBlink = 0;
 int homeIndex = 0;
 int burnModeIndex = 0;
 int burnSpeedIndex = 0;
@@ -537,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) {
@@ -552,6 +548,7 @@ void wakeDisplay() {
     case UI_DISCONNECTED: drawDisconnected(); break;
     case UI_SETUP: drawSetup(); break;
   }
+  return true;
 }
 
 void drawPlay() {
@@ -646,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:")) {
@@ -757,10 +756,6 @@ void setup() {
   pinMode(BTN_SELECT_PIN, INPUT_PULLUP);
   pinMode(BTN_UP_PIN, INPUT_PULLUP);
   pinMode(BTN_DOWN_PIN, INPUT_PULLUP);
-  pinMode(LED_POWER_PIN, OUTPUT);
-  pinMode(LED_ACT_PIN, OUTPUT);
-  digitalWrite(LED_POWER_PIN, HIGH);
-  digitalWrite(LED_ACT_PIN, LOW);
   pinMode(POT_PIN, INPUT);
   analogReadResolution(12);
   analogSetPinAttenuation(POT_PIN, ADC_11db);
@@ -778,14 +773,6 @@ void setup() {
     delay(3000);
   }
 
-  // Blink activity LED 3x to confirm it works
-  for (int i = 0; i < 3; i++) {
-    digitalWrite(LED_ACT_PIN, HIGH);
-    delay(150);
-    digitalWrite(LED_ACT_PIN, LOW);
-    delay(150);
-  }
-
   drawStandby();
   lastMsgTime = millis();
   lastInputTime = millis();
@@ -793,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) {
@@ -883,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) {
@@ -923,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) {
@@ -1115,10 +1102,6 @@ void loop() {
       (long)(millis() - lastInputTime) >= IDLE_BLANK_MS) {
     display.ssd1306_command(0xAE);
     displayBlank = true;
-    digitalWrite(LED_POWER_PIN, LOW);
-  }
-  if (!displayBlank) {
-    digitalWrite(LED_POWER_PIN, HIGH);
   }
 
   // --- PING timeout (disconnected) ---
@@ -1127,29 +1110,5 @@ void loop() {
     drawDisconnected();
   }
 
-  // --- Activity LED ---
-  {
-    bool ledOn = false;
-    if (uiState == UI_BURN_READY || uiState == UI_PLAY || uiState == UI_WAITING || uiState == UI_IP) {
-      ledOn = true;
-    } else if (uiState == UI_STATUS) {
-      if (progressPercent >= 0) {
-        ledOn = (millis() - lastLedBlink > LED_BLINK_MS);
-        if (ledOn) {
-          lastLedBlink = millis();
-          actLedState = !actLedState;
-        }
-        ledOn = actLedState;
-      } else {
-        ledOn = true;
-      }
-    } else if (uiState == UI_HOME || uiState == UI_STANDBY) {
-      ledOn = false;
-    } else if (uiState == UI_DISCONNECTED) {
-      ledOn = true;
-    }
-    digitalWrite(LED_ACT_PIN, ledOn ? HIGH : LOW);
-  }
-
   delay(20);
 }

package/package.json

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

package/src/discstation.py

@@ -122,7 +122,7 @@ class TcpSerial:
     A dead link raises serial.SerialException from in_waiting/write, which is
     what check_serial_alive() / main()'s reconnect loop already expect."""
 
-    def __init__(self, host, port=2323, connect_timeout=5):
+    def __init__(self, host, port=2323, connect_timeout=3):
         if host.count(":") == 1 and not host.startswith("["):  # "ip:port"
             host, _, p = host.rpartition(":")
             if p.isdigit():

package/src/discstation_host.py

@@ -72,6 +72,7 @@ def serial_port():
 _REMOTE_MDNS_TYPE = "_discstation._tcp.local."
 _REMOTE_DEFAULT_HOST = "discstation.local"
 _remote_cache = {"at": 0.0, "value": None}
+_remote_browser = {}  # {"zc": Zeroconf|None, "found": {"addr": ...}} - built once, lives for the process
 
 
 def remote_host():
@@ -79,8 +80,10 @@ def remote_host():
 
     `DISC_REMOTE_HOST` unset / `auto` (default) -> mDNS browse for the
         firmware's `_discstation._tcp` advert, falling back to resolving
-        `discstation.local` via the OS resolver. Result cached ~60s so the
-        reconnect loop / hot-swap poll don't hammer mDNS.
+        `discstation.local` via the OS resolver. A hit is cached 60s (stable
+        address, don't hammer mDNS); a miss only ~8s, so a host that just
+        rejoined the appliance's network reconnects promptly instead of
+        waiting out a full minute.
     `DISC_REMOTE_HOST=<ip|host>`  -> that address, verbatim, instantly.
     `DISC_REMOTE_HOST=off` / `none` / `0`  -> None (never look; USB / web only).
 
@@ -92,52 +95,60 @@ def remote_host():
     if setting and setting != "auto":
         return (os.environ.get("DISC_REMOTE_HOST") or "").strip()
 
-    if time.time() - _remote_cache["at"] < 60:
-        return _remote_cache["value"]
+    addr = _mdns_addr()
+    if addr:
+        return addr
 
-    value = _discover_remote()
+    # zeroconf absent / nothing advertised yet -> OS resolver for discstation.local.
+    # Cache it: a hit 60s, a miss ~8s (so a host that just rejoined reconnects fast).
+    ttl = 60 if _remote_cache["value"] else 8
+    if time.time() - _remote_cache["at"] < ttl:
+        return _remote_cache["value"]
+    try:
+        value = socket.gethostbyname(_REMOTE_DEFAULT_HOST)
+    except OSError:
+        value = None
     _remote_cache["at"] = time.time()
     _remote_cache["value"] = value
     return value
 
 
-def _discover_remote():
-    try:
-        from zeroconf import Zeroconf, ServiceBrowser
-    except ImportError:
-        Zeroconf = None
-    if Zeroconf is not None:
+def _mdns_addr():
+    """Latest IPv4 advertised for the firmware's _discstation._tcp service, or None.
+
+    A single background ServiceBrowser is started on the first call and reused for
+    the whole process. (Creating a fresh Zeroconf per lookup - this runs every few
+    seconds while the link is down - leaked sockets and engine threads until the
+    process hit its fd limit and every transport died.)"""
+    if not _remote_browser:
+        try:
+            from zeroconf import Zeroconf, ServiceBrowser
+        except ImportError:
+            _remote_browser["zc"] = None
+            return None
         found = {}
 
         class _Listener:
-            def add_service(self, zc, type_, name):
-                info = zc.get_service_info(type_, name, timeout=1500)
+            def _seen(self, zc, type_, name):
+                info = zc.get_service_info(type_, name, timeout=1000)
                 if info:
                     for addr in info.parsed_addresses():
                         if "." in addr:  # IPv4
                             found["addr"] = addr
                             return
 
-            update_service = add_service
+            add_service = _seen
+            update_service = _seen
 
-            def remove_service(self, *a):
-                pass
+            def remove_service(self, zc, type_, name):
+                found.pop("addr", None)
 
-        zc = Zeroconf()
-        try:
-            ServiceBrowser(zc, _REMOTE_MDNS_TYPE, _Listener())
-            deadline = time.time() + 2.5
-            while time.time() < deadline and "addr" not in found:
-                time.sleep(0.1)
-        finally:
-            zc.close()
-        if found.get("addr"):
-            return found["addr"]
+        _remote_browser["found"] = found
+        _remote_browser["zc"] = Zeroconf()
+        ServiceBrowser(_remote_browser["zc"], _REMOTE_MDNS_TYPE, _Listener())
 
-    try:
-        return socket.gethostbyname(_REMOTE_DEFAULT_HOST)
-    except OSError:
-        return None
+    found = _remote_browser.get("found")
+    return found.get("addr") if found else None
 
 
 def _stable_serial_path(device):