fix status polling data, null checks, settle timing, dac sweep edge case

Author: connorgallopo

Software/web-server/static/js/calibration.js

@@ -14,7 +14,8 @@ class CalibrationManager {
             camera1: false,
             camera2: false
         };
-        this.calibrationResults = {};  // Store results from calibration API
+        this.calibrationResults = {};
+        this.strobePollingTimer = null;
 
         this.init();
         this.setupPageCleanup();
@@ -796,7 +797,7 @@ class CalibrationManager {
 
         if (status.dac_setting !== undefined) {
             document.getElementById('strobe-result-dac').textContent =
-                '0x' + status.dac_setting.toString(16).toUpperCase().padStart(4, '0');
+                '0x' + status.dac_setting.toString(16).toUpperCase().padStart(2, '0');
         }
         if (status.led_current !== undefined) {
             document.getElementById('strobe-result-current').textContent = status.led_current.toFixed(2) + ' A';
@@ -873,10 +874,10 @@ class CalibrationManager {
             grid.innerHTML = '';
 
             const items = [
-                { label: 'LDO Voltage', value: data.ldo_voltage !== undefined ? data.ldo_voltage.toFixed(3) + ' V' : '--' },
-                { label: 'LED Current', value: data.led_current !== undefined ? data.led_current.toFixed(3) + ' A' : '--' },
-                { label: 'ADC CH0 Raw', value: data.adc_ch0_raw !== undefined ? data.adc_ch0_raw.toString() : '--' },
-                { label: 'ADC CH1 Raw', value: data.adc_ch1_raw !== undefined ? data.adc_ch1_raw.toString() : '--' }
+                { label: 'LDO Voltage', value: data.ldo_voltage != null ? data.ldo_voltage.toFixed(2) + ' V' : '--' },
+                { label: 'LED Current', value: data.led_current != null ? data.led_current.toFixed(2) + ' A' : '--' },
+                { label: 'ADC CH0 Raw', value: data.adc_ch0_raw != null ? data.adc_ch0_raw : '--' },
+                { label: 'ADC CH1 Raw', value: data.adc_ch1_raw != null ? data.adc_ch1_raw : '--' }
             ];
 
             items.forEach(item => {

Software/web-server/strobe_calibration_manager.py

@@ -108,6 +108,7 @@ def _close_hardware(self):
             try:
                 if name == "diag":
                     resource.off()
+                    time.sleep(0.1)
                 resource.close()
             except Exception:
                 logger.debug(f"Error closing {name}", exc_info=True)
@@ -260,7 +261,7 @@ def _calibrate(self, target_current: float):
             current_dac -= 1
 
         # Edge cases — sweep ran off either end
-        if current_dac < self.DAC_MIN:
+        if current_dac <= self.DAC_MIN:
             logger.debug(f"Reached DAC_MIN without crossing target")
             return False, -1, -1
         if current_dac >= self.DAC_MAX:
@@ -310,6 +311,9 @@ async def start_calibration(self, led_type: str = "v3",
                                 overwrite: bool = False) -> Dict[str, Any]:
         """Run full strobe calibration. Blocking I/O is offloaded to a thread."""
 
+        if self.status.get("state") == "calibrating":
+            return {"status": "error", "message": "Calibration already in progress"}
+
         # Validate board version
         board_version = self.config_manager.get_config("gs_config.strobing.kConnectionBoardVersion")
         if board_version is None or int(board_version) != 3:
@@ -353,16 +357,22 @@ def _run_calibration_sync(self, target: float) -> Dict[str, Any]:
 
             if success and final_dac > 0:
                 self.config_manager.set_config(self.DAC_CONFIG_KEY, final_dac)
-                self.status = {"state": "complete", "progress": 100,
-                               "message": f"DAC={final_dac:#04x}, current={led_current:.2f}A"}
-                return {"status": "success", "dac_setting": final_dac,
-                        "led_current": round(led_current, 2)}
+                self.status = {
+                    "state": "complete", "progress": 100,
+                    "message": f"DAC=0x{final_dac:02X}, current={led_current:.2f}A",
+                    "dac_setting": final_dac,
+                    "led_current": round(led_current, 2),
+                }
+                return self.status
+            elif self._cancel_requested:
+                self.status = {"state": "cancelled", "progress": 0,
+                               "message": "Calibration cancelled by user"}
+                return self.status
             else:
                 self._set_dac(self.SAFE_DAC_VALUE)
                 self.status = {"state": "failed", "progress": 0,
                                "message": "Calibration failed — DAC set to safe fallback"}
-                return {"status": "failed",
-                        "message": "Calibration failed. DAC set to safe fallback."}
+                return self.status
 
         except Exception as e:
             logger.error(f"Calibration exception: {e}")

Software/web-server/tests/test_strobe_calibration_manager.py

@@ -632,7 +632,7 @@ async def test_allows_overwrite_with_flag(self, _sleep):
         mgr._calibrate = Mock(return_value=(True, 0x80, 9.5))
 
         result = await mgr.start_calibration(led_type="v3", overwrite=True)
-        assert result["status"] == "success"
+        assert result["state"] == "complete"
 
     @pytest.mark.asyncio
     @patch("strobe_calibration_manager.time.sleep")
@@ -748,7 +748,7 @@ async def test_sets_safe_dac_on_failure(self, _sleep):
         mgr._set_dac = lambda v: dac_calls.append(v)
 
         result = await mgr.start_calibration(led_type="v3")
-        assert result["status"] == "failed"
+        assert result["state"] == "failed"
         assert 0x96 in dac_calls
 
     @pytest.mark.asyncio