From 4b931b0aad4bdc4a8d1223c9c9aefcab9b397724 Mon Sep 17 00:00:00 2001
From: Michele Bigi <mikbigi@gmail.com>
Date: Mon, 6 Jul 2026 16:18:19 +0200
Subject: [PATCH] Add tuner controls to the embedded setup web UI.

Extends the gzipped page with DAB/FM tune, service list, play, and FM seek
against the /api/tuner endpoints.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 Software/components/net/www/index.html    | 286 ++++++++++++++++++++--
 Software/components/net/www/index.html.gz | Bin 1730 -> 3436 bytes
 2 files changed, 263 insertions(+), 23 deletions(-)
diff --git a/Software/components/net/www/index.html b/Software/components/net/www/index.html
index 9c7e85c..c4f45c6 100644
--- a/Software/components/net/www/index.html
+++ b/Software/components/net/www/index.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>DigiRadio Setup</title>
+  <title>DigiRadio</title>
   <style>
     :root {
       --space-1: 0.5rem;
@@ -30,7 +30,7 @@
       color: var(--text);
       min-height: 100vh;
       display: flex;
-      align-items: center;
+      align-items: flex-start;
       justify-content: center;
       padding: var(--space-3);
     }
@@ -38,19 +38,20 @@
       background: var(--surface);
       border-radius: var(--radius);
       padding: var(--space-4);
-      max-width: 28rem;
+      max-width: 36rem;
       width: 100%;
       border-top: 3px solid var(--accent);
     }
     h1 { font-size: var(--text-xl); font-weight: 600; margin-bottom: var(--space-2); }
-    p { color: var(--muted); margin-bottom: var(--space-3); }
+    h2 { font-size: var(--text-lg); font-weight: 600; margin-bottom: var(--space-2); }
+    p { color: var(--muted); margin-bottom: var(--space-2); }
     label {
       display: block;
       font-size: 0.875rem;
       color: var(--muted);
       margin-bottom: var(--space-1);
     }
-    input {
+    input, select {
       width: 100%;
       padding: var(--space-1) var(--space-2);
       margin-bottom: var(--space-2);
@@ -71,6 +72,11 @@
       font-weight: 600;
       cursor: pointer;
     }
+    button.secondary {
+      background: transparent;
+      color: var(--accent);
+      border: 1px solid var(--accent);
+    }
     button:disabled { opacity: 0.6; cursor: wait; }
     .status {
       display: flex;
@@ -94,26 +100,128 @@
       padding: 0.1em 0.35em;
       border-radius: 0.25rem;
     }
+    section + section {
+      margin-top: var(--space-4);
+      padding-top: var(--space-3);
+      border-top: 1px solid #333;
+    }
+    .row { display: flex; gap: var(--space-2); margin-bottom: var(--space-2); }
+    .row button { flex: 1; }
+    .tuner-status {
+      background: var(--bg);
+      border-radius: var(--radius);
+      padding: var(--space-2);
+      font-size: 0.875rem;
+      margin-bottom: var(--space-2);
+      white-space: pre-wrap;
+      word-break: break-word;
+    }
+    .panel { display: none; }
+    .panel.active { display: block; }
+    ul.services {
+      list-style: none;
+      margin-bottom: var(--space-2);
+      max-height: 12rem;
+      overflow-y: auto;
+    }
+    ul.services li {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      gap: var(--space-2);
+      padding: var(--space-1) 0;
+      border-bottom: 1px solid #2a2d33;
+      font-size: 0.875rem;
+    }
+    ul.services button {
+      width: auto;
+      padding: 0.35rem 0.75rem;
+      font-size: 0.8rem;
+    }
   </style>
 </head>
 <body>
   <main>
     <h1>DigiRadio</h1>
-    <p>Connect this radio to your Wi‑Fi network.</p>
     <div class="status" id="health">
       <span class="dot" aria-hidden="true"></span>
       <span>Checking health…</span>
     </div>
-    <form id="wifi-form">
-      <label for="ssid">Network name (SSID)</label>
-      <input id="ssid" name="ssid" autocomplete="off" required maxlength="32">
-      <label for="password">Password</label>
-      <input id="password" name="password" type="password" autocomplete="off" maxlength="63">
-      <button type="submit" id="save-btn">Save &amp; connect</button>
-    </form>
-    <p class="msg" id="msg" aria-live="polite"></p>
+
+    <section id="wifi-section">
+      <h2>Wi‑Fi</h2>
+      <p>Connect this radio to your network (setup mode).</p>
+      <form id="wifi-form">
+        <label for="ssid">Network name (SSID)</label>
+        <input id="ssid" name="ssid" autocomplete="off" required maxlength="32">
+        <label for="password">Password</label>
+        <input id="password" name="password" type="password" autocomplete="off" maxlength="63">
+        <button type="submit" id="save-btn">Save &amp; connect</button>
+      </form>
+      <p class="msg" id="wifi-msg" aria-live="polite"></p>
+    </section>
+
+    <section id="tuner-section">
+      <h2>Radio</h2>
+      <p>Control the DAB/FM tuner (available after companion chips boot).</p>
+      <div class="tuner-status" id="tuner-status">No status yet.</div>
+      <div class="row">
+        <button type="button" class="secondary" id="refresh-status">Refresh status</button>
+      </div>
+
+      <label for="band">Band</label>
+      <select id="band">
+        <option value="dab">DAB</option>
+        <option value="fm">FM</option>
+      </select>
+
+      <div id="panel-dab" class="panel active">
+        <label for="dab-index">Ensemble index (0–37)</label>
+        <input id="dab-index" type="number" min="0" max="37" value="12">
+        <button type="button" id="tune-dab">Tune DAB</button>
+        <div class="row" style="margin-top: var(--space-2);">
+          <button type="button" class="secondary" id="load-services">Load services</button>
+        </div>
+        <ul class="services" id="service-list"></ul>
+      </div>
+
+      <div id="panel-fm" class="panel">
+        <label for="fm-khz">Frequency (kHz)</label>
+        <input id="fm-khz" type="number" min="64000" max="108000" step="100" value="101500">
+        <button type="button" id="tune-fm">Tune FM</button>
+        <div class="row" style="margin-top: var(--space-2);">
+          <button type="button" class="secondary" id="seek-fm">Seek up</button>
+        </div>
+      </div>
+
+      <p class="msg" id="tuner-msg" aria-live="polite"></p>
+    </section>
   </main>
   <script>
+    function showMsg(el, text, ok) {
+      el.textContent = text;
+      el.className = "msg " + (ok ? "ok" : "err");
+    }
+
+    function formatTunerStatus(s) {
+      var lines = [
+        "Booted: " + s.booted,
+        "Band: " + s.band,
+        "Locked: " + s.locked,
+        "Volume: " + s.volume
+      ];
+      if (s.dab) {
+        lines.push("DAB index: " + (s.dab.freq_index != null ? s.dab.freq_index : "—"));
+        if (s.dab.fic_quality != null) lines.push("FIC: " + s.dab.fic_quality);
+      }
+      if (s.fm) {
+        if (s.fm.frequency_khz != null) lines.push("FM: " + s.fm.frequency_khz + " kHz");
+        if (s.fm.rssi_dbuv != null) lines.push("RSSI: " + s.fm.rssi_dbuv + " dBµV");
+        if (s.fm.stereo != null) lines.push("Stereo: " + s.fm.stereo);
+      }
+      return lines.join("\n");
+    }
+
     fetch("/api/health")
       .then(function (r) { return r.json(); })
       .then(function (d) {
@@ -128,10 +236,9 @@
     document.getElementById("wifi-form").addEventListener("submit", function (e) {
       e.preventDefault();
       var btn = document.getElementById("save-btn");
-      var msg = document.getElementById("msg");
+      var msg = document.getElementById("wifi-msg");
       btn.disabled = true;
-      msg.textContent = "Saving…";
-      msg.className = "msg";
+      showMsg(msg, "Saving…", true);
       fetch("/api/wifi", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
@@ -143,20 +250,153 @@
         .then(function (r) { return r.json().then(function (d) { return { ok: r.ok, d: d }; }); })
         .then(function (res) {
           if (res.ok && res.d.status === "saved") {
-            msg.textContent = "Saved. Rebooting in " + res.d.reboot_in_sec + "s…";
-            msg.className = "msg ok";
+            showMsg(msg, "Saved. Rebooting in " + res.d.reboot_in_sec + "s…", true);
           } else {
-            msg.textContent = "Error: " + (res.d.reason || "unknown");
-            msg.className = "msg err";
+            showMsg(msg, "Error: " + (res.d.reason || "unknown"), false);
             btn.disabled = false;
           }
         })
         .catch(function () {
-          msg.textContent = "Request failed.";
-          msg.className = "msg err";
+          showMsg(msg, "Request failed.", false);
           btn.disabled = false;
         });
     });
+
+    document.getElementById("band").addEventListener("change", function () {
+      var dab = document.getElementById("panel-dab");
+      var fm = document.getElementById("panel-fm");
+      if (this.value === "dab") {
+        dab.classList.add("active");
+        fm.classList.remove("active");
+      } else {
+        fm.classList.add("active");
+        dab.classList.remove("active");
+      }
+    });
+
+    function refreshTunerStatus() {
+      var msg = document.getElementById("tuner-msg");
+      return fetch("/api/tuner/status")
+        .then(function (r) { return r.json().then(function (d) { return { ok: r.ok, d: d }; }); })
+        .then(function (res) {
+          if (res.ok && res.d.booted != null) {
+            document.getElementById("tuner-status").textContent = formatTunerStatus(res.d);
+            if (res.d.band === "fm") {
+              document.getElementById("band").value = "fm";
+              document.getElementById("band").dispatchEvent(new Event("change"));
+            }
+            showMsg(msg, "", true);
+          } else {
+            showMsg(msg, "Status error: " + (res.d.reason || "unknown"), false);
+          }
+        })
+        .catch(function () { showMsg(msg, "Status request failed.", false); });
+    }
+
+    document.getElementById("refresh-status").addEventListener("click", refreshTunerStatus);
+
+    document.getElementById("tune-dab").addEventListener("click", function () {
+      var msg = document.getElementById("tuner-msg");
+      var idx = parseInt(document.getElementById("dab-index").value, 10);
+      fetch("/api/tuner/tune", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ band: "dab", freq_index: idx })
+      })
+        .then(function (r) { return r.json().then(function (d) { return { ok: r.ok, d: d }; }); })
+        .then(function (res) {
+          if (res.ok && res.d.booted != null) {
+            document.getElementById("tuner-status").textContent = formatTunerStatus(res.d);
+            showMsg(msg, "DAB tuned.", true);
+          } else {
+            showMsg(msg, "Tune failed: " + (res.d.reason || "unknown"), false);
+          }
+        })
+        .catch(function () { showMsg(msg, "Tune request failed.", false); });
+    });
+
+    document.getElementById("tune-fm").addEventListener("click", function () {
+      var msg = document.getElementById("tuner-msg");
+      var khz = parseInt(document.getElementById("fm-khz").value, 10);
+      fetch("/api/tuner/tune", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ band: "fm", frequency_khz: khz })
+      })
+        .then(function (r) { return r.json().then(function (d) { return { ok: r.ok, d: d }; }); })
+        .then(function (res) {
+          if (res.ok && res.d.booted != null) {
+            document.getElementById("tuner-status").textContent = formatTunerStatus(res.d);
+            showMsg(msg, "FM tuned.", true);
+          } else {
+            showMsg(msg, "Tune failed: " + (res.d.reason || "unknown"), false);
+          }
+        })
+        .catch(function () { showMsg(msg, "Tune request failed.", false); });
+    });
+
+    document.getElementById("seek-fm").addEventListener("click", function () {
+      var msg = document.getElementById("tuner-msg");
+      fetch("/api/tuner/seek", { method: "POST" })
+        .then(function (r) { return r.json().then(function (d) { return { ok: r.ok, d: d }; }); })
+        .then(function (res) {
+          if (res.ok && res.d.frequency_khz != null) {
+            document.getElementById("fm-khz").value = res.d.frequency_khz;
+            showMsg(msg, "Seeked to " + res.d.frequency_khz + " kHz.", true);
+            refreshTunerStatus();
+          } else {
+            showMsg(msg, "Seek failed: " + (res.d.reason || "unknown"), false);
+          }
+        })
+        .catch(function () { showMsg(msg, "Seek request failed.", false); });
+    });
+
+    document.getElementById("load-services").addEventListener("click", function () {
+      var msg = document.getElementById("tuner-msg");
+      var list = document.getElementById("service-list");
+      list.innerHTML = "";
+      fetch("/api/tuner/services")
+        .then(function (r) { return r.json().then(function (d) { return { ok: r.ok, d: d }; }); })
+        .then(function (res) {
+          if (!res.ok || !res.d.services) {
+            showMsg(msg, "Services error: " + (res.d.reason || "unknown"), false);
+            return;
+          }
+          res.d.services.forEach(function (svc) {
+            var li = document.createElement("li");
+            var label = document.createElement("span");
+            label.textContent = svc.label || ("SID " + svc.service_id);
+            var btn = document.createElement("button");
+            btn.textContent = "Play";
+            btn.addEventListener("click", function () {
+              fetch("/api/tuner/play", {
+                method: "POST",
+                headers: { "Content-Type": "application/json" },
+                body: JSON.stringify({
+                  service_id: svc.service_id,
+                  component_id: svc.component_id
+                })
+              })
+                .then(function (r) { return r.json(); })
+                .then(function (d) {
+                  if (d.status === "playing") {
+                    showMsg(msg, "Playing " + (svc.label || svc.service_id), true);
+                  } else {
+                    showMsg(msg, "Play failed: " + (d.reason || "unknown"), false);
+                  }
+                })
+                .catch(function () { showMsg(msg, "Play request failed.", false); });
+            });
+            li.appendChild(label);
+            li.appendChild(btn);
+            list.appendChild(li);
+          });
+          showMsg(msg, res.d.services.length + " service(s).", true);
+        })
+        .catch(function () { showMsg(msg, "Services request failed.", false); });
+    });
+
+    refreshTunerStatus();
   </script>
 </body>
 </html>
diff --git a/Software/components/net/www/index.html.gz b/Software/components/net/www/index.html.gz
index 5cdd88a6e939dbc6a5a52c136e3f460be629d8bb..94aae6d55885efc729f95d8c57e31b12645876f1 100644
GIT binary patch
literal 3436
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
Og8u@LrCWbEH~;`<-lePn

literal 1730
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
Y4?b+^l7y>J`oCoV0_*gA5;hY60Ais|ZU6uP

