discstation 0.1.23 → 0.1.27

package/arduino/c6/DiscStation_C6.ino

@@ -1,18 +1,29 @@
 #include <Wire.h>
 #include <Adafruit_GFX.h>
 #include <Adafruit_SSD1306.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 __has_include("secrets.h")
+  #include "secrets.h"
+#endif
+
 #define SCREEN_WIDTH 128
 #define SCREEN_HEIGHT 64
 #define OLED_RESET    -1
 #define I2C_ADDRESS   0x3C
+#define TCP_PORT      2323
 
 #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
@@ -20,8 +31,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
+#define WIFI_CONNECT_TIMEOUT_MS 18000
+#define WIFI_RETRY_MS           15000
 
 #define MAX_HOME_MODES 5
 #define BURN_COUNT 4
@@ -31,6 +46,137 @@ int homeCount = 3;
 String homeModes[MAX_HOME_MODES] = {"BURN", "PLAY", "RIP"};
 String discName = "";
 
+// --- Wi-Fi link: mirror every outbound line to Serial AND a TCP client ---
+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:
+  void setClient(WiFiClient* c) { _client = c; }
+  size_t write(uint8_t c) override {
+    Serial.write(c);
+    if (_client && _client->connected()) _client->write(c);
+    return 1;
+  }
+  size_t write(const uint8_t* buf, size_t len) override {
+    Serial.write(buf, len);
+    if (_client && _client->connected()) _client->write(buf, len);
+    return len;
+  }
+private:
+  WiFiClient* _client = nullptr;
+} Out;
+
+void drawSetup();
+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);
+}
+
+void wmSaveCallback() {
+  saveCreds(wm.getWiFiSSID(), wm.getWiFiPass());
+  credsJustSaved = true;
+}
+
+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());
+  drawSetup();
+}
+
+void initWiFi() {
+  apName   = "DiscStation-" + deviceSuffix();
+  mdnsHost = "discstation-" + deviceSuffix();
+  mdnsHost.toLowerCase();
+
+  WiFi.mode(WIFI_STA);
+  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) delay(200);
+  }
+
+  if (WiFi.status() == WL_CONNECTED) {
+    Out.println(" OK");
+    onWifiUp();
+  } else {
+    if (ssid.length() > 0) Out.println(" fail (2.4GHz band / wrong password?)");
+    startPortal();
+  }
+}
+
 Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RESET);
 
 String ipUrl = "";
@@ -44,7 +190,8 @@ enum UiState {
   UI_WAITING,
   UI_IP,
   UI_DISCONNECTED,
-  UI_LOADING
+  UI_LOADING,
+  UI_SETUP
 };
 
 const char* BURN_MODES[BURN_COUNT] = {"AUTO", "BEST", "LONG", "TEST"};
@@ -87,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;
@@ -96,6 +241,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;
@@ -121,14 +267,14 @@ int readPercent() {
 
 void sendHomeMode() {
   if (homeIndex >= 0 && homeIndex < homeCount) {
-    Serial.print("MENU:");
-    Serial.println(homeModes[homeIndex]);
+    Out.print("MENU:");
+    Out.println(homeModes[homeIndex]);
   }
 }
 
 void sendBurnMode() {
-  Serial.print("MODE:");
-  Serial.println(BURN_MODES[burnModeIndex]);
+  Out.print("MODE:");
+  Out.println(BURN_MODES[burnModeIndex]);
 }
 
 void printUpper(String value) {
@@ -162,6 +308,7 @@ void drawHeader() {
 void drawHome() {
   uiState = UI_HOME;
   returnToHomeAt = 0;
+  lastInputTime = millis();
   if (!displayOk) return;
 
   display.clearDisplay();
@@ -311,9 +458,11 @@ void drawIP() {
 }
 
 void drawStandby() {
+  if (portalActive) { drawSetup(); return; }
   uiState = UI_STANDBY;
   returnToHomeAt = 0;
   standbyStartTime = millis();
+  lastInputTime = millis();
   displayBlank = false;
   if (!displayOk) return;
 
@@ -326,6 +475,38 @@ 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);
+  display.print(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;
@@ -378,6 +559,7 @@ void wakeDisplay() {
     case UI_STANDBY: drawStandby(); break;
     case UI_DISCONNECTED: drawDisconnected(); break;
     case UI_LOADING: drawLoading(); break;
+    case UI_SETUP: drawSetup(); break;
   }
 }
 
@@ -410,7 +592,7 @@ void parseMessage(String msg) {
 
   if (msg == "PING") {
     lastMsgTime = millis();
-    Serial.println("PONG");
+    Out.println("PONG");
     if (uiState == UI_DISCONNECTED) drawStandby();
     return;
   }
@@ -418,8 +600,8 @@ void parseMessage(String msg) {
   wakeDisplay();
   lastMsgTime = millis();
 
-  Serial.print("RCV:");
-  Serial.println(msg);
+  Out.print("RCV:");
+  Out.println(msg);
 
   if (msg.startsWith("HOME:")) {
     homeIndex = readBucket(homeCount);
@@ -593,6 +775,7 @@ void parseMessage(String msg) {
 }
 
 void setup() {
+  setCpuFrequencyMhz(160);  // 240 -> 160: ~halves CPU power; I2C/GPIO all fine at 160
   Serial.begin(115200);
   Wire.begin(22, 23);
 
@@ -604,10 +787,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);
 
@@ -618,37 +797,32 @@ void setup() {
   displayOk = display.begin(SSD1306_SWITCHCAPVCC, I2C_ADDRESS);
 
   if (displayOk) {
-    Serial.println("Display OK");
+    Out.println("Display OK");
   } else {
-    Serial.println("Display FAILED");
+    Out.println("Display FAILED");
     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();
-  Serial.println("DISCSTATION_READY");
+  lastInputTime = millis();
+  Out.println("DISCSTATION_READY");
 }
 
 void handleSelectPress(bool longPress) {
   wakeDisplay();
+  lastInputTime = millis();
   if (uiState == UI_HOME) {
     if (longPress) {
-      Serial.println("EJECT");
+      Out.println("EJECT");
       line1 = "Ejecting...";
       line2 = "";
       line3 = "";
       returnToHomeAt = millis() + 5000;
       drawStatus();
     } else if (homeIndex >= 0 && homeIndex < homeCount) {
-      Serial.print("SELECT:");
-      Serial.println(homeModes[homeIndex]);
+      Out.print("SELECT:");
+      Out.println(homeModes[homeIndex]);
       line1 = "Selected";
       line2 = homeModes[homeIndex];
       line3 = "";
@@ -656,7 +830,7 @@ void handleSelectPress(bool longPress) {
     }
 
   } else if (uiState == UI_STANDBY) {
-    Serial.println("EJECT");
+    Out.println("EJECT");
     line1 = "Ejecting...";
     line2 = "";
     line3 = "";
@@ -668,16 +842,16 @@ void handleSelectPress(bool longPress) {
 
   } else if (uiState == UI_IP) {
     if (longPress) {
-      Serial.println("CANCEL");
+      Out.println("CANCEL");
       drawHome();
     }
 
   } else if (uiState == UI_WAITING) {
     if (longPress) {
-      Serial.println("CANCEL");
+      Out.println("CANCEL");
       drawHome();
     } else {
-      Serial.println("CONFIRM");
+      Out.println("CONFIRM");
       line1 = "Confirmed!";
       line2 = "";
       line3 = "";
@@ -686,8 +860,8 @@ void handleSelectPress(bool longPress) {
 
   } else if (uiState == UI_BURN_READY) {
     if (longPress) {
-      Serial.print("START:");
-      Serial.println(BURN_MODES[burnModeIndex]);
+      Out.print("START:");
+      Out.println(BURN_MODES[burnModeIndex]);
       line1 = "Starting...";
       line2 = BURN_MODES[burnModeIndex];
       line3 = "";
@@ -699,7 +873,7 @@ void handleSelectPress(bool longPress) {
 
   } else if (uiState == UI_STATUS) {
     if (longPress) {
-      Serial.println("CANCEL");
+      Out.println("CANCEL");
       line1 = "Cancelling...";
       line2 = "";
       line3 = "";
@@ -707,22 +881,23 @@ void handleSelectPress(bool longPress) {
     }
 
   } else if (uiState == UI_DISCONNECTED) {
-    Serial.println("CANCEL");
+    Out.println("CANCEL");
     drawStandby();
 
   } else if (uiState == UI_PLAY) {
     ffSpeedIndex = 0;
     rewSpeedIndex = 0;
     if (longPress) {
-      Serial.println("PLAY_STOP");
+      Out.println("PLAY_STOP");
     } else {
-      Serial.println("PLAY_BUTTON");
+      Out.println("PLAY_BUTTON");
     }
   }
 }
 
 void handleUp(bool longPress) {
   wakeDisplay();
+  lastInputTime = millis();
   if (uiState == UI_HOME) {
     if (homeCount > 0) {
       homeIndex = (homeIndex - 1 + homeCount) % homeCount;
@@ -732,8 +907,8 @@ void handleUp(bool longPress) {
   } else if (uiState == UI_BURN_READY) {
     if (editingSpeed) {
       burnSpeedIndex = (burnSpeedIndex - 1 + SPEED_COUNT) % SPEED_COUNT;
-      Serial.print("SPEED:");
-      Serial.println(SPEED_MODES[burnSpeedIndex]);
+      Out.print("SPEED:");
+      Out.println(SPEED_MODES[burnSpeedIndex]);
       drawBurnReady();
     } else {
       burnModeIndex = (burnModeIndex - 1 + BURN_COUNT) % BURN_COUNT;
@@ -742,23 +917,24 @@ void handleUp(bool longPress) {
     }
   } else if (uiState == UI_PLAY) {
     if (audioPlayMode) {
-      Serial.println(displayRotation == 0 ? (longPress ? "REW:BIG" : "REW:10") : (longPress ? "FF:BIG" : "FF:10"));
+      Out.println(displayRotation == 0 ? (longPress ? "REW:BIG" : "REW:10") : (longPress ? "FF:BIG" : "FF:10"));
       return;
     }
     rewSpeedIndex = 0;
     if (longPress) {
-      Serial.println("FF:BIG");
+      Out.println("FF:BIG");
     } else {
       ffSpeedIndex = (ffSpeedIndex + 1) % 4;
       int seek_sec[] = {10, 20, 30, 60};
-      Serial.print("FF:");
-      Serial.println(seek_sec[ffSpeedIndex]);
+      Out.print("FF:");
+      Out.println(seek_sec[ffSpeedIndex]);
     }
   }
 }
 
 void handleDown(bool longPress) {
   wakeDisplay();
+  lastInputTime = millis();
   if (uiState == UI_HOME) {
     if (homeCount > 0) {
       homeIndex = (homeIndex + 1) % homeCount;
@@ -768,8 +944,8 @@ void handleDown(bool longPress) {
   } else if (uiState == UI_BURN_READY) {
     if (editingSpeed) {
       burnSpeedIndex = (burnSpeedIndex + 1) % SPEED_COUNT;
-      Serial.print("SPEED:");
-      Serial.println(SPEED_MODES[burnSpeedIndex]);
+      Out.print("SPEED:");
+      Out.println(SPEED_MODES[burnSpeedIndex]);
       drawBurnReady();
     } else {
       burnModeIndex = (burnModeIndex + 1) % BURN_COUNT;
@@ -778,22 +954,66 @@ void handleDown(bool longPress) {
     }
   } else if (uiState == UI_PLAY) {
     if (audioPlayMode) {
-      Serial.println(displayRotation == 0 ? (longPress ? "FF:BIG" : "FF:10") : (longPress ? "REW:BIG" : "REW:10"));
+      Out.println(displayRotation == 0 ? (longPress ? "FF:BIG" : "FF:10") : (longPress ? "REW:BIG" : "REW:10"));
       return;
     }
     ffSpeedIndex = 0;
     if (longPress) {
-      Serial.println("REW:BIG");
+      Out.println("REW:BIG");
     } else {
       rewSpeedIndex = (rewSpeedIndex + 1) % 4;
       int seek_sec[] = {10, 20, 30, 60};
-      Serial.print("REW:");
-      Serial.println(seek_sec[rewSpeedIndex]);
+      Out.print("REW:");
+      Out.println(seek_sec[rewSpeedIndex]);
     }
   }
 }
 
 void loop() {
+  if (!wifiInitDone && millis() > 3000) {
+    wifiInitDone = true;
+    initWiFi();
+  }
+
+  if (credsJustSaved) {
+    drawWifiReset();
+    delay(600);
+    ESP.restart();
+  }
+
+  if (portalActive) {
+    wm.process();
+    if (WiFi.status() == WL_CONNECTED) onWifiUp();
+  }
+
+  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();
+      Out.setClient(&tcpClient);
+    }
+    if (tcpClient && !tcpClient.connected()) {
+      tcpClient.stop();
+      Out.setClient(nullptr);
+    }
+    if (tcpClient && tcpClient.available()) {
+      String tmsg = tcpClient.readStringUntil('\n');
+      if (tmsg.length() > 0) parseMessage(tmsg);
+    }
+  }
+
   if (Serial.available()) {
     String msg = Serial.readStringUntil('\n');
     parseMessage(msg);
@@ -814,8 +1034,8 @@ void loop() {
     int nextVolume = readPercent();
     if (abs(nextVolume - playVolume) >= 3) {
       playVolume = nextVolume;
-      Serial.print("POT:");
-      Serial.println(playVolume);
+      Out.print("POT:");
+      Out.println(playVolume);
       drawPlay();
     }
   }
@@ -825,11 +1045,26 @@ void loop() {
     if (sel && !selectDown && millis() - selectLastDebounce > DEBOUNCE_MS) {
       selectDown = true;
       selectDownAt = millis();
+      wifiResetArmed = false;
+    }
+    // 10s hold on HOME/SETUP/STANDBY = wipe Wi-Fi creds + reboot to portal.
+    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;
     }
   }
 
@@ -878,14 +1113,11 @@ void loop() {
     if (!displayBlank) drawLoading();
   }
 
-  if (displayOk && uiState == UI_STANDBY && !displayBlank &&
-      (long)(millis() - standbyStartTime) >= STANDBY_BLANK_MS) {
+  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);
   }
 
   if (uiState != UI_DISCONNECTED &&
@@ -893,28 +1125,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/c6/secrets.h.example

@@ -0,0 +1,14 @@
+// Optional build-time Wi-Fi override for the ESP32-C6 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"