fix: BLE lacks stopAskingToStartCharging

Author: MikeBishop

lib/TWCManager/Vehicle/TeslaBLE.py

@@ -108,6 +108,12 @@ def __init__(self, master):
         # Retry statistics tracking
         self.retry_stats = {}
 
+        # Per-VIN flag: True once the car has confirmed it is already in the
+        # desired charge state (complete, is_charging, disconnected, etc.).
+        # Prevents re-sending a start command on every poll cycle.
+        # Reset to False when a stop-charge task arrives.
+        self._stopAskingToStartCharging = {}
+
         # Persistent D-Bus session daemon shared across all tesla-control calls.
         # dbus-launch only spawns a new daemon when DBUS_SESSION_BUS_ADDRESS is
         # absent from the environment. By starting one daemon here and passing its
@@ -193,13 +199,24 @@ def car_api_charge(self, task):
                 logger.error("Task missing required 'charge' key")
                 return False
 
+            # When stopping, reset per-VIN "stop asking" flags so the next
+            # start cycle starts fresh (mirrors TeslaAPI.car_api_charge).
+            if not charge:
+                self._stopAskingToStartCharging.clear()
+
             # If we know the VIN of the vehicle connected to the TWC Slave, we'll send the command
             # directly to that vehicle
             vin = task.get("vin", None)
             if vin:
                 logger.debug(f"BLE command for specific VIN: {vin}, charge: {charge}")
 
                 if charge:
+                    if self._stopAskingToStartCharging.get(vin):
+                        logger.debug(
+                            "BLE: not re-requesting charge start for %s: already in desired state"
+                            % vin
+                        )
+                        return True
                     if self._scheduleBlocksStart(vin):
                         logger.info(
                             f"{vin} is waiting on its in-car charging schedule; not sending BLE start"
@@ -231,6 +248,13 @@ def car_api_charge(self, task):
                 for vehicle in self.master.settings["Vehicles"].keys():
                     try:
                         if charge:
+                            if self._stopAskingToStartCharging.get(vehicle):
+                                logger.debug(
+                                    "BLE: not re-requesting charge start for %s: already in desired state"
+                                    % vehicle
+                                )
+                                success_count += 1
+                                continue
                             if self._scheduleBlocksStart(vehicle):
                                 logger.info(
                                     f"{vehicle} is waiting on its in-car charging schedule; not sending BLE start"
@@ -267,6 +291,18 @@ def car_api_charge(self, task):
             logger.error(f"BLE car_api_charge failed with exception: {e}")
             return False
 
+    def _is_already_satisfied(self, output):
+        """Return True if output indicates the car is already in the desired charge state."""
+        if not output:
+            return False
+        if isinstance(output, bytes):
+            output = output.decode("utf-8", errors="ignore")
+        output_lower = output.lower()
+        return any(
+            ("car could not execute command: " + reason) in output_lower
+            for reason in ("complete", "is_charging", "charging", "requested", "disconnected")
+        )
+
     def parseCommandOutput(self, output):
         """
         Enhanced command output parsing with detailed error categorization.
@@ -286,14 +322,21 @@ def parseCommandOutput(self, output):
             "Command executed successfully",
             "Vehicle responded",
             "Success",
-            # "Already in desired state" responses — car is charging or done; goal achieved
-            "car could not execute command: complete",
-            "car could not execute command: is_charging",
-            "car could not execute command: charging",
-            "car could not execute command: requested",
         ]
 
-        # Error indicators for detailed logging
+        output_lower = output.lower()
+
+        # Check for success
+        for indicator in success_indicators:
+            if indicator.lower() in output_lower:
+                logger.debug(f"BLE command success: {indicator}")
+                return True
+
+        if self._is_already_satisfied(output):
+            logger.debug("BLE command success: already in desired state")
+            return True
+
+        # Categorize errors for detailed logging
         error_indicators = {
             "timeout": ["timeout", "timed out", "no response"],
             "connection": ["connection failed", "unable to connect", "bluetooth error"],
@@ -306,15 +349,6 @@ def parseCommandOutput(self, output):
             "command_failed": ["command failed", "error executing", "operation failed"],
         }
 
-        output_lower = output.lower()
-
-        # Check for success
-        for indicator in success_indicators:
-            if indicator.lower() in output_lower:
-                logger.debug(f"BLE command success: {indicator}")
-                return True
-
-        # Categorize errors for better debugging
         error_type = "unknown"
         for category, indicators in error_indicators.items():
             for indicator in indicators:
@@ -586,6 +620,15 @@ def startCharging(self, vin):
                 return False
 
             success = self.parseCommandOutput(ret)
+
+            # If the car reported it is already in the desired state, record
+            # that so car_api_charge won't re-send the command next cycle
+            # (mirrors TeslaAPI's stopAskingToStartCharging logic).
+            if success and self._is_already_satisfied(ret):
+                self._stopAskingToStartCharging[vin] = True
+                logger.info(
+                    "BLE: %s already in desired charge state; will not re-request" % vin
+                )
             logger.info(
                 f"Start charging for {vin}: {'success' if success else 'failed'}"
             )