Merge pull request #1482 from rankjie/master

Fix Linptech ES3 sensor motion clear delay (#1481)

Author: Ernst79

custom_components/ble_monitor/binary_sensor.py

@@ -281,10 +281,10 @@ def __init__(
         self._key = key
         self._fkey = identifier_normalize(key)
         self._state = None
+        self._device_type = devtype
 
         self._device_settings = self.get_device_settings()
         self._device_name = self._device_settings["name"]
-        self._device_type = devtype
         self._device_firmware = firmware
         self._device_manufacturer = manufacturer \
             if manufacturer is not None \
@@ -380,7 +380,8 @@ def get_device_settings(self):
         # initial setup of device settings equal to integration settings
         dev_name = self._key
         dev_restore_state = self._config[CONF_RESTORE_STATE]
-        dev_reset_timer = DEFAULT_DEVICE_RESET_TIMER
+        # ES3 devices should have reset_timer disabled by default since they handle motion clear themselves
+        dev_reset_timer = 0 if self._device_type == "ES3" else DEFAULT_DEVICE_RESET_TIMER
 
         # in UI mode device name is equal to mac (but can be overwritten in UI)
         # in YAML mode device name is taken from config

custom_components/ble_monitor/ble_parser/xiaomi.py

@@ -817,12 +817,16 @@ def obj4840(xobj):
     return {"pressure not present time set": duration}
 
 
-def obj484e(xobj):
+def obj484e(xobj, device_type=None):
     """Occupancy Status"""
     (occupancy,) = struct.unpack("<B", xobj)
     if occupancy == 0:
-        # no motion is being taken care of by the timer in HA
-        return {}
+        # For ES3: if this is the only data object (no motion/illuminance), treat as motion clear
+        # For other devices: no motion is being taken care of by the timer in HA
+        if device_type == "ES3":
+            return {"motion": 0}
+        else:
+            return {}
     else:
         return {"motion": 1, "motion timer": 1}
 
@@ -1554,6 +1558,7 @@ def parse_xiaomi(self, data: bytes, mac: bytes):
                         "0x1001",
                         "0xf",
                         "0xb",
+                        "0x484e",
                         "0x4e0c",
                         "0x4e0d",
                         "0x4e0e",

custom_components/ble_monitor/test/test_xiaomi_parser.py

@@ -984,6 +984,33 @@ def test_linptech_ES3_motion(self):
         assert sensor_msg["motion timer"] == 1
         assert sensor_msg["rssi"] == -58
 
+    def test_linptech_ES3_data_only_motion_clear(self):
+        """Test Xiaomi parser for linptech ES3 data-only frame (implicit motion clear)."""
+        self.aeskeys = {}
+        # This is a real data-only frame for ES3 with MAC A4:C1:38:A4:88:8A
+        data_string = "043e29020100018a88a438c1a41d020106191695fe5859fb50328a88a438c1a4458a85b796000048fe13bac6"
+        data = bytes(bytearray.fromhex(data_string))
+
+        aeskey = "fb352ea2139ab095877a9e2ae600c912"
+
+        is_ext_packet = True if data[3] == 0x0D else False
+        mac = (data[8 if is_ext_packet else 7:14 if is_ext_packet else 13])[::-1]
+        mac_address = mac.hex()
+        p_mac = bytes.fromhex(mac_address.replace(":", "").lower())
+        p_key = bytes.fromhex(aeskey.lower())
+        self.aeskeys[p_mac] = p_key
+        # pylint: disable=unused-variable
+        ble_parser = BleParser(aeskeys=self.aeskeys)
+        sensor_msg, tracker_msg = ble_parser.parse_raw_data(data)
+
+        assert sensor_msg["firmware"] == "Xiaomi (MiBeacon V5 encrypted)"
+        assert sensor_msg["type"] == "ES3"
+        assert sensor_msg["mac"] == "A4C138A4888A"
+        assert sensor_msg["packet"] == 50
+        assert sensor_msg["data"]
+        assert sensor_msg["motion"] == 0  # Should be implicitly set to 0 for data-only frames
+        assert sensor_msg["rssi"] == -58
+
     def test_MJZNZ018H_bed_occupancy(self):
         """Test Xiaomi parser for MJZNZ018H bed occupancy sensor."""
         self.aeskeys = {}