Small things because fuck sd cards

orchestrateur/sensors/button.py

@@ -1,7 +1,7 @@
 import grovepi
 import time
 import threading
-from sensors.lock import grove_lock
+from sensors.lock import safe_grove_access
 from shared.logging import log
 
 button = 2
@@ -10,28 +10,25 @@ grovepi.pinMode(button, "INPUT")
 button_callback = None
 
 def read_button_state():
-    # Increase timeout slightly so the button thread can wait for long I2C sensor reads to finish
-    if not grove_lock.acquire(timeout=0.2):
-        return None
-    try:
-        val = grovepi.digitalRead(button)
-        # Force strict binary output (0 or 1)
-        return 1 if val == 1 else 0
-    except Exception as e:
-        log(f"BTN Error: {e}")
-        return None
-    finally:
-        grove_lock.release()
+    # Attempt to acquire the lock with a 0.2s timeout
+    with safe_grove_access(timeout=0.2) as acquired:
+        if not acquired:
+            return None
+        
+        try:
+            val = grovepi.digitalRead(button)
+            # Force strict binary output (0 or 1)
+            return 1 if val == 1 else 0
+        except Exception as e:
+            log(f"BTN Error: {e}")
+            return None
 
 def monitor_button():
     last_stable_state = 0
     candidate_state = 0
     consecutive_count = 0
     
-    # Require 3 consecutive identical reads (~60ms) to confirm a valid state change
     REQUIRED_CONSECUTIVE_READS = 3
-    
-    # Minimum time gap (in seconds) between allowed button triggers (cooldown)
     DEBOUNCE_COOLDOWN = 0.3
     last_trigger_time = 0
 
@@ -45,11 +42,9 @@ def monitor_button():
                 candidate_state = current_state
                 consecutive_count = 1
 
-            # State is confirmed stable across multiple reads
             if consecutive_count >= REQUIRED_CONSECUTIVE_READS:
                 now = time.time()
                 
-                # Rising edge detection (0 -> 1 transition) with cooldown timer
                 if candidate_state == 1 and last_stable_state == 0:
                     if (now - last_trigger_time) > DEBOUNCE_COOLDOWN:
                         last_trigger_time = now
@@ -63,7 +58,6 @@ def monitor_button():
 
             time.sleep(0.02)  # 20ms poll interval
         else:
-            # Lock was busy or read failed; reset candidate counter to reject noisy spikes
             consecutive_count = 0
             time.sleep(0.01)