From 178d6b2dc61a4e008d004d828333674e25924328 Mon Sep 17 00:00:00 2001
From: Jan Svabenik <jan@svabi.ch>
Date: Thu, 19 Mar 2026 06:02:12 +0100
Subject: [PATCH] Update CFAR UI controls

---
 web/app.js     | 22 ++++++++++++++++++----
 web/index.html | 11 ++++++++++-
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/web/app.js b/web/app.js
index 86ed31e..c30bf18 100644
--- a/web/app.js
+++ b/web/app.js
@@ -29,7 +29,8 @@ const gainRange = qs('gainRange');
 const gainInput = qs('gainInput');
 const thresholdRange = qs('thresholdRange');
 const thresholdInput = qs('thresholdInput');
-const cfarToggle = qs('cfarToggle');
+const cfarModeSelect = qs('cfarModeSelect');
+const cfarWrapToggle = qs('cfarWrapToggle');
 const cfarGuardInput = qs('cfarGuardInput');
 const cfarTrainInput = qs('cfarTrainInput');
 const cfarRankInput = qs('cfarRankInput');
@@ -312,11 +313,14 @@ function applyConfigToUI(cfg) {
   gainInput.value = uiGain;
   thresholdRange.value = cfg.detector.threshold_db;
   thresholdInput.value = cfg.detector.threshold_db;
-  if (cfarToggle) cfarToggle.checked = !!cfg.detector.cfar_enabled;
+  if (cfarModeSelect) cfarModeSelect.value = cfg.detector.cfar_mode || 'OFF';
+  if (cfarWrapToggle) cfarWrapToggle.checked = cfg.detector.cfar_wrap_around !== false;
   if (cfarGuardInput) cfarGuardInput.value = cfg.detector.cfar_guard_cells ?? 2;
   if (cfarTrainInput) cfarTrainInput.value = cfg.detector.cfar_train_cells ?? 16;
   if (cfarRankInput) cfarRankInput.value = cfg.detector.cfar_rank ?? 24;
   if (cfarScaleInput) cfarScaleInput.value = cfg.detector.cfar_scale_db ?? 6;
+  const rankRow = cfarRankInput?.closest('.field');
+  if (rankRow) rankRow.style.display = (cfg.detector.cfar_mode === 'OS') ? '' : 'none';
   if (minDurationInput) minDurationInput.value = cfg.detector.min_duration_ms;
   if (holdInput) holdInput.value = cfg.detector.hold_ms;
   if (emaAlphaInput) emaAlphaInput.value = cfg.detector.ema_alpha ?? 0.2;
@@ -544,7 +548,10 @@ function drawSpectrumGrid(ctx, w, h, startHz, endHz) {
 }
 
 function drawCfarEdgeOverlay(ctx, w, h, startHz, endHz) {
-  if (!latest || !currentConfig?.detector?.cfar_enabled) return;
+  if (!latest) return;
+  const mode = currentConfig?.detector?.cfar_mode || 'OFF';
+  if (mode === 'OFF') return;
+  if (currentConfig?.detector?.cfar_wrap_around) return;
   const guard = currentConfig.detector.cfar_guard_cells ?? 0;
   const train = currentConfig.detector.cfar_train_cells ?? 0;
   const bins = guard + train;
@@ -1230,7 +1237,14 @@ thresholdInput.addEventListener('change', () => {
   }
 });
 
-if (cfarToggle) cfarToggle.addEventListener('change', () => queueConfigUpdate({ detector: { cfar_enabled: cfarToggle.checked } }));
+if (cfarModeSelect) cfarModeSelect.addEventListener('change', () => {
+  queueConfigUpdate({ detector: { cfar_mode: cfarModeSelect.value } });
+  const rankRow = cfarRankInput?.closest('.field');
+  if (rankRow) rankRow.style.display = (cfarModeSelect.value === 'OS') ? '' : 'none';
+});
+if (cfarWrapToggle) cfarWrapToggle.addEventListener('change', () => {
+  queueConfigUpdate({ detector: { cfar_wrap_around: cfarWrapToggle.checked } });
+});
 if (cfarGuardInput) cfarGuardInput.addEventListener('change', () => {
   const v = parseInt(cfarGuardInput.value, 10);
   if (Number.isFinite(v)) queueConfigUpdate({ detector: { cfar_guard_cells: v } });
diff --git a/web/index.html b/web/index.html
index 8c3a3e4..31104cf 100644
--- a/web/index.html
+++ b/web/index.html
@@ -195,8 +195,17 @@
               <label class="field"><span>Hysteresis (dB)</span><input id="hysteresisInput" type="number" step="1" min="0" /></label>
               <label class="field"><span>Min Stable Frames</span><input id="stableFramesInput" type="number" step="1" min="1" /></label>
               <label class="field"><span>Gap Tolerance (ms)</span><input id="gapToleranceInput" type="number" step="50" min="0" /></label>
+              <label class="field"><span>CFAR Mode</span>
+                <select id="cfarModeSelect">
+                  <option value="OFF">Off</option>
+                  <option value="CA">CA (Cell-Averaging)</option>
+                  <option value="OS">OS (Ordered-Statistic)</option>
+                  <option value="GOSCA">GOSCA (Greatest-Of)</option>
+                  <option value="CASO">CASO (Smallest-Of)</option>
+                </select>
+              </label>
               <div class="toggle-grid">
-                <label class="pill-toggle"><input id="cfarToggle" type="checkbox" /><span class="pt"><span class="pk"></span></span><span class="pl">CFAR</span></label>
+                <label class="pill-toggle"><input id="cfarWrapToggle" type="checkbox" checked /><span class="pt"><span class="pk"></span></span><span class="pl">Wrap-Around</span></label>
               </div>
             </div>