discstation 0.1.23 → 0.1.27

package/arduino/v1/DiscStation.ino

@@ -3,9 +3,20 @@
 #include <Adafruit_SSD1306.h>
 #include "esp_task_wdt.h"
 #include <WiFi.h>
+#include "esp_mac.h"
+#include <WiFiManager.h>
+#include <ESPmDNS.h>
+#include <Preferences.h>
 #include <ArduinoOTA.h>
 #include <QRCode.h>
 
+// Optional build-time Wi-Fi override for power users: copy secrets.h.example
+// to secrets.h (git-ignored) and set WIFI_SSID / WIFI_PASS / OTA_PASSWORD.
+// If WIFI_SSID is defined the runtime setup portal is skipped entirely.
+#if __has_include("secrets.h")
+  #include "secrets.h"
+#endif
+
 #define SCREEN_WIDTH 128
 #define SCREEN_HEIGHT 64
 #define OLED_RESET    -1
@@ -14,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
@@ -23,8 +32,12 @@
 #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 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           15000  // if a live link drops, force a re-join after this
 
 #define MAX_HOME_MODES 5
 #define BURN_COUNT 4
@@ -36,8 +49,17 @@ String homeModes[MAX_HOME_MODES] = {"BURN", "PLAY", "RIP"};
 
 WiFiServer tcpServer(TCP_PORT);
 WiFiClient tcpClient;
+WiFiManager wm;
+Preferences prefs;
 bool wifiConnected = false;
 bool wifiInitDone = false;
+bool portalActive = false;
+bool otaEnabled = false;
+bool credsJustSaved = false;
+bool wifiResetArmed = false;
+unsigned long wifiDropAt = 0;
+String apName = "DiscStation";
+String mdnsHost = "discstation";
 
 class DualPrint : public Print {
 public:
@@ -56,23 +78,105 @@ private:
   WiFiClient* _client = nullptr;
 } Out;
 
+void drawSetup();       // fwd decls (defined with the other draw* below)
+void drawWifiReset();
+
+String deviceSuffix() {
+  uint8_t mac[6];
+  esp_read_mac(mac, ESP_MAC_WIFI_STA);  // factory MAC from eFuse - valid before the Wi-Fi driver starts
+  char buf[5];
+  snprintf(buf, sizeof(buf), "%02X%02X", mac[4], mac[5]);
+  return String(buf);
+}
+
+void loadCreds(String& ssid, String& pass) {
+  prefs.begin("discstation", true);
+  ssid = prefs.getString("ssid", "");
+  pass = prefs.getString("pass", "");
+  prefs.end();
+}
+
+void saveCreds(const String& ssid, const String& pass) {
+  prefs.begin("discstation", false);
+  prefs.putString("ssid", ssid);
+  prefs.putString("pass", pass);
+  prefs.end();
+}
+
+void clearCreds() {
+  prefs.begin("discstation", false);
+  prefs.clear();
+  prefs.end();
+  WiFi.disconnect(true, true);   // also wipe the ESP's own persisted creds
+}
+
+void wmSaveCallback() {
+  saveCreds(wm.getWiFiSSID(), wm.getWiFiPass());
+  credsJustSaved = true;         // loop() reboots cleanly into STA mode
+}
+
+void onWifiUp() {
+  portalActive = false;
+  wifiConnected = true;
+  wifiDropAt = 0;
+  WiFi.setSleep(WIFI_PS_MIN_MODEM);
+  tcpServer.begin();
+  if (MDNS.begin(mdnsHost.c_str())) {
+    MDNS.addService("discstation", "tcp", TCP_PORT);
+  }
+#ifdef OTA_PASSWORD
+  ArduinoOTA.setHostname(mdnsHost.c_str());
+  ArduinoOTA.setPassword(OTA_PASSWORD);
+  ArduinoOTA.begin();
+  otaEnabled = true;
+#endif
+  Out.print("WiFi OK "); Out.println(WiFi.localIP());
+}
+
+void startPortal() {
+  Out.print("WiFi: setup portal '"); Out.print(apName); Out.println("'");
+  portalActive = true;
+  WiFi.mode(WIFI_AP_STA);
+  wm.setConfigPortalBlocking(false);
+  wm.setConfigPortalTimeout(0);
+  wm.setSaveConfigCallback(wmSaveCallback);
+  wm.startConfigPortal(apName.c_str());   // open AP at 192.168.4.1
+  drawSetup();
+}
+
 void initWiFi() {
-  Out.print("WiFi Tez...");
+  apName   = "DiscStation-" + deviceSuffix();
+  mdnsHost = "discstation-" + deviceSuffix();
+  mdnsHost.toLowerCase();
+
   WiFi.mode(WIFI_STA);
-  WiFi.begin("Tez", "Dellwin8#$");
-  for (int i = 0; i < 80; i++) {
-    if (WiFi.status() == WL_CONNECTED) break;
-    delay(250);
+  WiFi.setAutoReconnect(true);
+  WiFi.setSleep(WIFI_PS_MIN_MODEM);
+
+  String ssid, pass;
+#ifdef WIFI_SSID
+  ssid = WIFI_SSID;
+  pass = WIFI_PASS;
+#else
+  loadCreds(ssid, pass);
+#endif
+
+  if (ssid.length() > 0) {
+    Out.print("WiFi "); Out.print(ssid); Out.print("...");
+    WiFi.begin(ssid.c_str(), pass.c_str());
+    unsigned long t0 = millis();
+    while (WiFi.status() != WL_CONNECTED && millis() - t0 < WIFI_CONNECT_TIMEOUT_MS) {
+      esp_task_wdt_reset();
+      delay(200);
+    }
   }
+
   if (WiFi.status() == WL_CONNECTED) {
-    wifiConnected = true;
-    tcpServer.begin();
-    ArduinoOTA.begin();
-    ArduinoOTA.setHostname("discstation-v1");
-    ArduinoOTA.setPassword("dvdstation");
-    Out.print(" OK "); Out.println(WiFi.localIP());
+    Out.println(" OK");
+    onWifiUp();
   } else {
-    Out.println(" fail");
+    if (ssid.length() > 0) Out.println(" fail (2.4GHz band / wrong password?)");
+    startPortal();
   }
 }
 String discName = "";
@@ -89,7 +193,8 @@ enum UiState {
   UI_STANDBY,
   UI_WAITING,
   UI_IP,
-  UI_DISCONNECTED
+  UI_DISCONNECTED,
+  UI_SETUP
 };
 
 const char* BURN_MODES[BURN_COUNT] = {"AUTO", "BEST", "LONG", "TEST"};
@@ -133,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;
@@ -143,6 +245,7 @@ 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;
 bool audioPlayMode = false;
 int displayRotation = 0;
@@ -210,6 +313,7 @@ void drawHeader() {
 void drawHome() {
   uiState = UI_HOME;
   returnToHomeAt = 0;
+  lastInputTime = millis();
   if (!displayOk) return;
 
   display.clearDisplay();
@@ -360,9 +464,13 @@ void drawIP() {
 }
 
 void drawStandby() {
+  // While the Wi-Fi setup portal is up and the appliance is otherwise idle,
+  // the standby screen doubles as the setup instructions.
+  if (portalActive) { drawSetup(); return; }
   uiState = UI_STANDBY;
   returnToHomeAt = 0;
   standbyStartTime = millis();
+  lastInputTime = millis();
   displayBlank = false;
   if (!displayOk) return;
 
@@ -375,6 +483,39 @@ void drawStandby() {
   display.display();
 }
 
+void drawSetup() {
+  uiState = UI_SETUP;
+  returnToHomeAt = 0;
+  displayBlank = false;
+  lastInputTime = millis();
+  if (!displayOk) return;
+
+  display.clearDisplay();
+  drawHeader();
+  display.setCursor(2, 16);
+  display.print("WIFI SETUP");
+  display.setCursor(2, 28);
+  display.print("JOIN:");
+  display.setCursor(2, 38);
+  printUpper(apName);
+  display.setCursor(2, 50);
+  display.print("THEN 192.168.4.1");
+  display.display();
+}
+
+void drawWifiReset() {
+  uiState = UI_SETUP;
+  displayBlank = false;
+  if (!displayOk) return;
+  display.clearDisplay();
+  drawHeader();
+  display.setCursor(2, 25);
+  display.print("WIFI RESET");
+  display.setCursor(2, 40);
+  display.print("REBOOTING...");
+  display.display();
+}
+
 void drawDisconnected() {
   uiState = UI_DISCONNECTED;
   returnToHomeAt = 0;
@@ -403,6 +544,7 @@ void wakeDisplay() {
     case UI_WAITING: drawWaiting(); break;
     case UI_STANDBY: drawStandby(); break;
     case UI_DISCONNECTED: drawDisconnected(); break;
+    case UI_SETUP: drawSetup(); break;
   }
 }
 
@@ -602,16 +744,13 @@ void parseMessage(String msg) {
 }
 
 void setup() {
+  setCpuFrequencyMhz(160);  // 240 -> 160: ~halves CPU power, Wi-Fi/I2C/OTA all fine at 160
   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(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);
@@ -629,21 +768,15 @@ 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();
   Out.println("DISCSTATION_READY");
 }
 
 void handleSelectPress(bool longPress) {
   wakeDisplay();
+  lastInputTime = millis();
   if (uiState == UI_HOME) {
     if (longPress) {
       Out.println("EJECT");
@@ -733,6 +866,7 @@ void handleSelectPress(bool longPress) {
 
 void handleUp(bool longPress) {
   wakeDisplay();
+  lastInputTime = millis();
   if (uiState == UI_HOME) {
     if (homeCount > 0) {
       homeIndex = (homeIndex - 1 + homeCount) % homeCount;
@@ -772,6 +906,7 @@ void handleUp(bool longPress) {
 
 void handleDown(bool longPress) {
   wakeDisplay();
+  lastInputTime = millis();
   if (uiState == UI_HOME) {
     if (homeCount > 0) {
       homeIndex = (homeIndex + 1) % homeCount;
@@ -814,8 +949,33 @@ void loop() {
     wifiInitDone = true;
     initWiFi();
   }
-  if (wifiConnected) {
-    ArduinoOTA.handle();
+
+  if (credsJustSaved) {          // portal saved new creds -> reboot into clean STA
+    drawWifiReset();
+    delay(600);
+    ESP.restart();
+  }
+
+  if (portalActive) {
+    wm.process();
+    if (WiFi.status() == WL_CONNECTED) onWifiUp();
+  }
+
+  // Live link dropped: WiFi.setAutoReconnect handles most; if still down after
+  // WIFI_RETRY_MS, force a fresh join.
+  if (wifiConnected && WiFi.status() != WL_CONNECTED) {
+    if (wifiDropAt == 0) wifiDropAt = millis();
+    else if (millis() - wifiDropAt > WIFI_RETRY_MS) {
+      wifiDropAt = millis();
+      WiFi.disconnect();
+      WiFi.begin();
+    }
+  } else if (wifiConnected) {
+    wifiDropAt = 0;
+  }
+
+  if (wifiConnected && WiFi.status() == WL_CONNECTED) {
+    if (otaEnabled) ArduinoOTA.handle();
     if (tcpServer.hasClient()) {
       if (tcpClient) tcpClient.stop();
       tcpClient = tcpServer.available();
@@ -865,11 +1025,27 @@ void loop() {
     if (sel && !selectDown && millis() - selectLastDebounce > DEBOUNCE_MS) {
       selectDown = true;
       selectDownAt = 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 &&
+        (uiState == UI_HOME || uiState == UI_SETUP || uiState == UI_STANDBY) &&
+        millis() - selectDownAt >= WIFI_RESET_HOLD_MS) {
+      wifiResetArmed = true;
+      Out.println("WiFi: creds wiped, rebooting");
+      clearCreds();
+      drawWifiReset();
+      delay(800);
+      ESP.restart();
     }
     if (!sel && selectDown) {
       selectDown = false;
       selectLastDebounce = millis();
-      handleSelectPress(millis() - selectDownAt >= LONG_PRESS_MS);
+      if (!wifiResetArmed) {
+        handleSelectPress(millis() - selectDownAt >= LONG_PRESS_MS);
+      }
+      wifiResetArmed = false;
     }
   }
 
@@ -915,15 +1091,12 @@ void loop() {
     if (!displayBlank) drawStatus();
   }
 
-  // --- Standby blanking ---
-  if (displayOk && uiState == UI_STANDBY && !displayBlank &&
-      (long)(millis() - standbyStartTime) >= STANDBY_BLANK_MS) {
+  // --- OLED idle blanking (HOME + STANDBY) ---
+  if (displayOk && !displayBlank &&
+      (uiState == UI_HOME || uiState == UI_STANDBY) &&
+      (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) ---
@@ -932,29 +1105,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/arduino/v1/secrets.h.example

@@ -0,0 +1,14 @@
+// Optional build-time Wi-Fi override for the ESP32 DevKit remote.
+//
+//   cp secrets.h.example secrets.h      (secrets.h is git-ignored)
+//
+// If WIFI_SSID is defined, the firmware connects straight to this network and
+// the runtime setup portal is skipped entirely. Leave secrets.h absent to use
+// the normal captive-portal provisioning ("DiscStation-XXXX" AP).
+
+#define WIFI_SSID  "YourNetwork"
+#define WIFI_PASS  "YourPassword"
+
+// Optional: enable Arduino OTA updates with this password. Omit to keep OTA off
+// (recommended unless you actually use it).
+// #define OTA_PASSWORD "change-me"

package/discstation.env.example

@@ -7,6 +7,13 @@ YTDLP_FRAGMENT_RETRIES=3
 DISC_OUTPUT_LIMIT_BYTES=4300000000
 DISC_DL_OUTPUT_LIMIT_BYTES=8000000000
 
+# Wi-Fi appliance remote. Default (unset) = "auto": if no USB cable is
+# present, find the remote by mDNS / discstation.local. Set an IP or
+# hostname to skip discovery (connects on TCP 2323); set "off" to never
+# look. The remote's OLED shows its IP after you provision its Wi-Fi.
+# DISC_REMOTE_HOST=192.168.1.50
+# DISC_REMOTE_HOST=off
+
 # TMDb API key for video (DVD / burned movie) metadata lookup. Get a free key at
 # https://www.themoviedb.org/settings/api . Without it, ripped videos keep their
 # disc-label / filename naming. Alternatively put the key in

package/package.json

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

package/requirements.txt

@@ -3,3 +3,4 @@ pyserial>=3.5
 mutagen>=1.45
 requests>=2.28
 yt-dlp>=2024.1.1
+zeroconf>=0.131   # auto-discover a Wi-Fi appliance remote (DISC_REMOTE_HOST=auto, the default)