apds9960: Address Copilot review on auto-enable PR.

Author: nedseb

lib/apds9960/apds9960/device.py

@@ -230,9 +230,13 @@ def isLightAvailable(self):
 
         return val == APDS9960_BIT_AVALID
 
+    def isProximityAvailable(self):
+        val = self._read_reg(APDS9960_REG_STATUS)
+        return (val & APDS9960_BIT_PVALID) == APDS9960_BIT_PVALID
+
     def _ensure_light_enabled(self):
         enable = self.getMode()
-        if not (enable & (1 << APDS9960_MODE_AMBIENT_LIGHT)) or not (enable & 1):
+        if not (enable & (1 << APDS9960_MODE_AMBIENT_LIGHT)) or not (enable & APDS9960_BIT_PON):
             self.enableLightSensor(interrupts=False)
             for _ in range(50):
                 if self.isLightAvailable():
@@ -241,9 +245,12 @@ def _ensure_light_enabled(self):
 
     def _ensure_proximity_enabled(self):
         enable = self.getMode()
-        if not (enable & (1 << APDS9960_MODE_PROXIMITY)) or not (enable & 1):
+        if not (enable & (1 << APDS9960_MODE_PROXIMITY)) or not (enable & APDS9960_BIT_PON):
             self.enableProximitySensor(interrupts=False)
-            sleep_ms(50)
+            for _ in range(50):
+                if self.isProximityAvailable():
+                    return
+                sleep_ms(10)
 
     # reads the ambient (clear) light level as a 16-bit value
     def readAmbientLight(self):

tests/scenarios/apds9960.yaml

@@ -81,30 +81,48 @@ tests:
 
   # ----- Auto-enable -----
 
-  - name: "Ambient light readable without explicit enable"
+  - name: "Auto-enable writes ENABLE register for light"
     action: script
     script: |
       dev.disableLightSensor()
-      val = dev.readAmbientLight()
-      result = isinstance(val, int)
+      i2c.clear_write_log()
+      dev.readAmbientLight()
+      log = i2c.get_write_log()
+      wrote_enable = any(reg == 0x80 for reg, data in log)
+      enable_val = dev.getMode()
+      has_pon = bool(enable_val & 0x01)
+      has_aen = bool(enable_val & 0x02)
+      result = wrote_enable and has_pon and has_aen
     expect_true: true
     mode: [mock]
 
-  - name: "Proximity readable without explicit enable"
+  - name: "Auto-enable writes ENABLE register for proximity"
     action: script
     script: |
       dev.disableProximitySensor()
-      val = dev.readProximity()
-      result = isinstance(val, int)
+      i2c.clear_write_log()
+      dev.readProximity()
+      log = i2c.get_write_log()
+      wrote_enable = any(reg == 0x80 for reg, data in log)
+      enable_val = dev.getMode()
+      has_pon = bool(enable_val & 0x01)
+      has_pen = bool(enable_val & 0x04)
+      result = wrote_enable and has_pon and has_pen
     expect_true: true
     mode: [mock]
 
-  - name: "Red light readable after power off"
+  - name: "Auto-enable restores power for light read"
     action: script
     script: |
       dev.disablePower()
-      val = dev.readRedLight()
-      result = isinstance(val, int)
+      i2c.clear_write_log()
+      dev.readRedLight()
+      log = i2c.get_write_log()
+      wrote_enable = any(reg == 0x80 for reg, data in log)
+      enable_val = dev.getMode()
+      has_pon = bool(enable_val & 0x01)
+      has_aen = bool(enable_val & 0x02)
+      result = wrote_enable and has_pon and has_aen
     expect_true: true
     mode: [mock]