Merge pull request #264 from renaudallard/main

Some fixes for issues seen in logs

Author: kvanbiesen

custom_components/cardata/magic_soc.py

@@ -359,7 +359,7 @@ def anchor_driving_session(
             consumption_kwh_per_km=consumption,
             last_predicted_soc=anchor_soc,
             created_at=time.time(),
-            trip_start_soc=anchor_soc,
+            trip_start_soc=current_soc,
             trip_start_mileage=trip_start,
         )
 
@@ -381,7 +381,13 @@ def reanchor_driving_session(self, vin: str, new_soc: float, current_mileage: fl
         if session is None:
             return
         # Skip no-op re-anchors (duplicate SOC/mileage from MQTT bursts).
-        if session.anchor_soc == new_soc and session.anchor_mileage == current_mileage:
+        # Pre-compute what anchor would become after smoothing to detect true no-ops
+        # (smoothed anchor_soc won't match BMW integer, so raw comparison always fails).
+        if abs(new_soc - session.last_predicted_soc) < 0.5:
+            effective_anchor = session.last_predicted_soc
+        else:
+            effective_anchor = new_soc
+        if effective_anchor == session.anchor_soc and current_mileage == session.anchor_mileage:
             return
         old_anchor = session.anchor_soc
         # BMW sends integer SOC. If our sub-integer prediction rounds to that

custom_components/cardata/motion_detection.py

@@ -47,7 +47,7 @@ class MotionDetector:
     # Minimum time span (seconds) for the 3 park-confirming readings.
     # BMW sends GPS in bursts (3 readings within <1s at the same position).
     # Without this guard the burst immediately parks the car while driving.
-    MIN_PARK_SPAN_SECONDS: ClassVar[float] = 30.0
+    MIN_PARK_SPAN_SECONDS: ClassVar[float] = 90.0
 
     # Minutes without GPS update to consider GPS unavailable (switch to mileage fallback)
     # Longer than MOTION_ACTIVE_WINDOW to handle BMW's bursty GPS (every 2-3 min)
@@ -208,24 +208,31 @@ def update_location(self, vin: str, lat: float, lon: float) -> bool:
                         for r in park_readings[-3:]
                     )
                     if all_within_park:
-                        # Require readings to span a minimum time window to avoid
-                        # treating a single GPS burst as parking
-                        first_park_time = park_readings[-3][2]
-                        time_span = (now - first_park_time).total_seconds()
-                        if time_span < self.MIN_PARK_SPAN_SECONDS:
+                        # Require readings from at least 2 distinct MQTT bursts
+                        # separated by MIN_PARK_SPAN_SECONDS.  BMW sends GPS in
+                        # tight bursts (3-6 readings in <1s), so park_readings[-3]
+                        # is always from the current burst.  Instead, find the
+                        # latest reading that preceded the current burst by at
+                        # least MIN_PARK_SPAN_SECONDS — proving the car was already
+                        # in the park zone that long ago.
+                        has_old_reading = any(
+                            (now - r[2]).total_seconds() >= self.MIN_PARK_SPAN_SECONDS for r in park_readings
+                        )
+                        if not has_old_reading:
                             # Burst detection: readings too close together, not real parking
                             # Stay in driving mode
                             return True
 
                         # Vehicle has stopped - exit driving mode
                         # Backdate last movement to when the car first entered the park zone
+                        time_in_zone = (now - park_readings[0][2]).total_seconds()
                         _LOGGER.debug(
-                            "Motion: %s stopped (3 readings within park radius over %.0fs) - NOW PARKED",
+                            "Motion: %s stopped (readings in park zone for %.0fs) - NOW PARKED",
                             redact_vin(vin),
-                            time_span,
+                            time_in_zone,
                         )
                         self._is_driving[vin] = False
-                        self._last_location_change[vin] = first_park_time
+                        self._last_location_change[vin] = park_readings[0][2]
                         self._park_anchor[vin] = self._calculate_centroid(park_readings)
                         return False
             else: