Merge pull request #138 from engmung/dev

Dev

Author: engmung

firmware/README.md

@@ -53,6 +53,7 @@ firmware/patternflow/
     ├── core_color.h         # PFColor:: hsvToRgb, ColorStop, sampleRamp
     ├── core_noise.h         # PFNoise:: perlin2D, fractal2D
     ├── core_wifi.h          # Shared Wi-Fi bring-up (single WiFi.begin for all features)
+    ├── core_improv.h        # Improv-Serial Wi-Fi provisioning from the browser flasher
     ├── core_osc.h           # OSC sidechannel (UDP send when PF_OSC_ENABLED)
     ├── core_audio_ws.h      # Browser audio-react HTTP/WebSocket server
     ├── audio_index.h        # Built-in patternflow.local audio UI bundle
@@ -123,6 +124,16 @@ PatternflowOta::handle();  // first line of loop() — UDP poll, ~free when idle
 
 Shares Wi-Fi credentials and connection with OSC (if both are enabled, the connection is reused). When `PF_OTA_ENABLED` is 0 everything compiles to a no-op. See the [OTA Updates](#ota-updates-for-developers) section below for the user-facing workflow.
 
+### `core_improv.h` — PatternflowImprov
+Self-contained [Improv-Serial](https://www.improv-wifi.com/serial/) implementation so the **browser flasher** (ESP Web Tools, behind the website's "Flash" button) can set Wi-Fi over USB right after flashing — no rebuild, no `patternflow_secrets.h`. The main sketch only needs:
+
+```cpp
+PatternflowImprov::begin();   // in setup() — announces it speaks Improv
+PatternflowImprov::handle();  // in loop()  — drains Serial, drives provisioning
+```
+
+The flasher sends the SSID/password over serial; `core_wifi.h` stores them in NVS (separate `pf_wifi` namespace) and uses them in preference to the built-in `PF_WIFI_SSID/PASS` placeholders on every boot. Shares the debug USB Serial — the host parser scans for the `IMPROV` header and ignores `println()` noise. Compiled in only when Wi-Fi is actually used (one of OTA/OSC/audio enabled) and `PF_IMPROV_ENABLED` is 1; otherwise a no-op. Set `#define PF_IMPROV_ENABLED 0` in `patternflow_secrets.h` to drop it.
+
 ## Patterns
 
 Current registered patterns:

firmware/patternflow/net_config.h

@@ -38,6 +38,22 @@
 #define PF_WIFI_RETRY_INTERVAL_MS 5000
 #endif
 
+// ── Improv-Serial Wi-Fi provisioning ─────────────────────────
+// Lets the browser flasher (ESP Web Tools, behind the website's "Flash"
+// button) set Wi-Fi over USB serial right after flashing, instead of baking
+// credentials into the binary. The SSID/password are stored in NVS and used
+// in preference to the placeholders above on the next boot. See
+// src/core_improv.h. On by default; only compiled in when Wi-Fi is actually
+// used (i.e. at least one of OTA/OSC/audio is enabled).
+#ifndef PF_IMPROV_ENABLED
+#define PF_IMPROV_ENABLED 1
+#endif
+// Firmware version string reported to the flasher (Improv device-info RPC).
+// Keep in sync with web/public/flash/manifest.json.
+#ifndef PF_IMPROV_FW_VERSION
+#define PF_IMPROV_FW_VERSION "2.0.0"
+#endif
+
 // ── OTA (wireless flashing from Arduino IDE / espota.py) ─────
 // On by default. Loop cost is one UDP poll per frame when idle.
 #ifndef PF_OTA_ENABLED

firmware/patternflow/patternflow.ino

@@ -4,6 +4,7 @@
 #include "src/core_display.h"
 #include "src/core_encoders.h"
 #include "src/core_wifi.h"
+#include "src/core_improv.h"
 #include "src/core_osc.h"
 #include "src/core_ota.h"
 #include "src/core_audio_ws.h"
@@ -81,6 +82,10 @@ void setup() {
   // or not Wi-Fi is up yet.
   PatternflowWifi::begin();
 
+  // Improv-Serial: lets the browser flasher set Wi-Fi over USB after a web
+  // flash. Just listens on Serial; no Wi-Fi required to be up yet.
+  PatternflowImprov::begin();
+
   buildPatternList();   // presets first (pattern 1 = Origin), custom appended last
   for (int i = 0; i < NUM_PATTERNS; i++) {
     patterns[i].setup();
@@ -104,6 +109,23 @@ void drawCenteredText(const char* text, int y, uint16_t color, int textSize = 1)
   dma_display->print(text);
 }
 
+// Centered text on a small dark scrim band, so it stays legible drawn on top
+// of the live pattern the SELECT screen now previews behind the overlay.
+// One fillRect + one text draw per label — cheap enough not to slow the frame
+// (a per-glyph outline tripled the per-frame pixel writes and tore the
+// double-buffered panel).
+void drawCenteredTextScrim(const char* text, int y, uint16_t color, int textSize = 1) {
+  int16_t x1, y1;
+  uint16_t w, h;
+  dma_display->setTextSize(textSize);
+  dma_display->getTextBounds(text, 0, 0, &x1, &y1, &w, &h);
+  int x = (dma_display->width() - w) / 2;
+  dma_display->fillRect(x - 2, y - 2, w + 4, h + 4, 0);
+  dma_display->setTextColor(color);
+  dma_display->setCursor(x, y);
+  dma_display->print(text);
+}
+
 void drawContentNotice() {
   dma_display->fillRect(0, 18, dma_display->width(), 28, 0);
   drawCenteredText(currentContentName(), 30, dma_display->color565(255, 255, 255), 1);
@@ -156,32 +178,27 @@ void drawNetworkInfo() {
   drawCenteredText("HOLD K2 = EXIT", 57, dim, 1);
 }
 
+// Draws the SELECT overlay ON TOP of the live pattern preview the loop has
+// already rendered into the buffer (so no fillScreen here). Each label sits on
+// a small dark scrim so it stays readable over whatever pattern is behind it.
 void drawSelectingMode() {
-  dma_display->fillScreen(0);
-
-  uint16_t screenW = dma_display->width();
   uint16_t screenH = dma_display->height();
 
   char pageStr[16];
   snprintf(pageStr, sizeof(pageStr), "%d / %d", currentPatternIdx + 1, NUM_PATTERNS);
+  drawCenteredTextScrim(pageStr, 10, dma_display->color565(190, 190, 190), 1);
 
+  const char* name = patterns[currentPatternIdx].name;
+  int nameSize = strlen(name) > 8 ? 1 : 2;
   int16_t x1, y1;
   uint16_t w, h;
-  dma_display->setTextSize(1);
-  dma_display->setTextColor(dma_display->color565(100, 100, 100));
-  dma_display->getTextBounds(pageStr, 0, 0, &x1, &y1, &w, &h);
-  dma_display->setCursor((screenW - w) / 2, 10);
-  dma_display->print(pageStr);
-
-  const char* name = patterns[currentPatternIdx].name;
-  dma_display->setTextSize(strlen(name) > 8 ? 1 : 2);
-  dma_display->setTextColor(dma_display->color565(255, 255, 255));
+  dma_display->setTextSize(nameSize);
   dma_display->getTextBounds(name, 0, 0, &x1, &y1, &w, &h);
-  dma_display->setCursor((screenW - w) / 2, (screenH / 2) - (h / 2));
-  dma_display->print(name);
+  drawCenteredTextScrim(name, (screenH / 2) - (h / 2),
+                        dma_display->color565(255, 255, 255), nameSize);
 
-  const char* hint = "HOLD TO SELECT";
-  drawCenteredText(hint, screenH - 22, dma_display->color565(150, 150, 150), 1);
+  drawCenteredTextScrim("HOLD TO SELECT", screenH - 22,
+                        dma_display->color565(200, 200, 200), 1);
 }
 
 void readInputFrame(InputFrame& input) {
@@ -292,6 +309,11 @@ void loop() {
     Serial.println("[NET] services started");
   }
 
+  // Improv-Serial provisioning: drains any browser-flasher Wi-Fi setup
+  // traffic on Serial and reports connect success/failure back. Cheap when
+  // idle (one Serial.available() check).
+  PatternflowImprov::handle();
+
   // OTA must run early in the loop so a long pattern render doesn't
   // starve the upload handler. Cheap when no upload is in flight.
   PatternflowOta::handle();
@@ -391,7 +413,6 @@ void loop() {
     if (currentMode == MODE_RUNNING) {
       currentMode = MODE_SELECTING;
       contentNoticeTimer = 0.0f;
-      dma_display->setRotation(1);
       Serial.printf(">>> SELECT MODE ENTERED: %s\n", patterns[currentPatternIdx].name);
     } else {
       currentMode = MODE_RUNNING;
@@ -451,7 +472,23 @@ void loop() {
       Serial.printf("SELECTING: %s\n", patterns[currentPatternIdx].name);
     }
 
+    // Live preview behind the overlay so you can see what you're choosing.
+    // Render the pattern in the native landscape orientation (rotation 0, same
+    // as running mode) so present() fills the whole panel — then switch to the
+    // device's portrait orientation (rotation 1) for the SELECT text so it
+    // reads upright, exactly as before. Feed a neutral input frame (no knob
+    // deltas / buttons) so browsing with K4 doesn't drive the pattern's own
+    // parameters — it just animates over time.
+    dma_display->setRotation(0);
+    InputFrame preview = {};
+    preview.now = input.now;
+    for (int i = 0; i < 4; i++) preview.knobs[i] = input.knobs[i];
+    patterns[currentPatternIdx].update(dt, preview);
+    patterns[currentPatternIdx].draw();
+
+    dma_display->setRotation(1);
     drawSelectingMode();
+    dma_display->setRotation(0);  // back to landscape for the next frame
   }
 
   dma_display->flipDMABuffer();