steami_config: Address PR #176 review comments.

Author: nedseb

lib/steami_config/examples/calibrate_temperature.py

@@ -6,6 +6,7 @@
 """
 
 import gc
+import sys
 from machine import I2C
 from time import sleep_ms
 
@@ -23,6 +24,7 @@
 print("Reference (WSEN-HIDS): {:.2f} C".format(ref_temp))
 config.set_temperature_calibration("wsen_hids", gain=1.0, offset=0.0)
 del WSEN_HIDS
+sys.modules.pop("wsen_hids.device", None)
 gc.collect()
 
 # Calibrate each sensor one at a time to save RAM
@@ -44,6 +46,7 @@
     config.set_temperature_calibration(config_name, gain=1.0, offset=offset)
     print("  {:10s}: {:6.2f} C -> offset {:+.2f}".format(config_name, raw, offset))
     del sensor, cls, mod
+    sys.modules.pop(module, None)
     gc.collect()
 
 config.save()
@@ -64,4 +67,5 @@
     config2.apply_temperature_calibration(sensor)
     print("  {:10s}: {:6.2f} C".format(config_name, getattr(sensor, method)()))
     del sensor, cls, mod
+    sys.modules.pop(module, None)
     gc.collect()

lib/steami_config/steami_config/device.py

@@ -33,10 +33,16 @@ def __init__(self, flash):
     # --------------------------------------------------
 
     def load(self):
-        """Load configuration from the config zone."""
+        """Load configuration from the config zone.
+
+        Falls back to empty config if the zone contains invalid JSON.
+        """
         raw = self._flash.read_config()
         if raw:
-            self._data = json.loads(raw)
+            try:
+                self._data = json.loads(raw)
+            except (ValueError, TypeError):
+                self._data = {}
         else:
             self._data = {}
 
@@ -56,7 +62,10 @@ def board_revision(self):
 
     @board_revision.setter
     def board_revision(self, value):
-        self._data["rev"] = int(value)
+        if value is None:
+            self._data.pop("rev", None)
+        else:
+            self._data["rev"] = int(value)
 
     @property
     def board_name(self):
@@ -65,7 +74,10 @@ def board_name(self):
 
     @board_name.setter
     def board_name(self, value):
-        self._data["name"] = str(value)
+        if value is None:
+            self._data.pop("name", None)
+        else:
+            self._data["name"] = str(value)
 
     # --------------------------------------------------
     # Temperature calibration
@@ -116,6 +128,8 @@ def apply_temperature_calibration(self, sensor_instance):
             sensor_instance: a driver instance (e.g. ``HTS221``).
         """
         class_name = type(sensor_instance).__name__.lower()
+        if class_name not in _SENSOR_KEYS:
+            return
         cal = self.get_temperature_calibration(class_name)
         if cal is None:
             return

tests/runner/mpremote_bridge.py

@@ -116,10 +116,7 @@ def run_script(
 
         The script has access to ``i2c`` and ``dev`` variables and must
         set a ``result`` variable.  The method returns the JSON-decoded
-        value of ``result``.
-
-        The script must not print anything: any additional output on
-        stdout will cause JSON parsing to fail.
+        value of ``result`` (only the last line of stdout is parsed).
 
         When ``hardware_init`` is provided it takes precedence over
         ``i2c_address`` for device construction.
@@ -143,9 +140,9 @@ def run_script(
         if mount_dir is None:
             mount_dir = self._driver_dir(driver_name)
         else:
-            # When mounting lib/, add sub-paths for each dependency
+            # When mounting lib/, add sub-paths for all driver directories
             extra_paths = "import sys\n"
-            for child in mount_dir.iterdir():
+            for child in sorted(mount_dir.iterdir()):
                 if child.is_dir() and not child.name.startswith("."):
                     extra_paths += f"sys.path.insert(0, '/remote/{child.name}')\n"
             code = extra_paths + code

tests/test_scenarios.py

@@ -74,6 +74,10 @@ def make_mock_instance(scenario):
         ns = {"i2c": fake_i2c}
         ns.update(vars(driver_module))
         exec(mock_init, ns)
+        if "dev" not in ns:
+            raise ValueError(
+                f"mock_init for '{driver_name}' must define a 'dev' variable"
+            )
         return ns["dev"], driver_name
 
     # Build extra constructor kwargs from mock_pins