Merge pull request #1337 from jbjornstedt/xm126_merge_fix

Add support for Acconeer XM126 distance sensor

Author: Ernst79

custom_components/ble_monitor/ble_parser/acconeer.py

@@ -8,11 +8,13 @@
 
 ACCONEER_SENSOR_IDS = {
     0x80: "Acconeer XM122",
+    0x90: "Acconeer XM126 Distance",
     0x91: "Acconeer XM126",
 }
 
 MEASUREMENTS = {
     0x80: ["presence", "temperature"],
+    0x90: ["distance_mm", "temperature"],
     0x91: ["presence", "temperature"],
 }
 
@@ -28,22 +30,51 @@ def parse_acconeer(self, data: bytes, mac: str):
     if msg_length == 19 and device_id in ACCONEER_SENSOR_IDS:
         # Acconeer Sensors
         device_type = ACCONEER_SENSOR_IDS[device_id]
-        measurements = MEASUREMENTS[device_id]
-        (battery_level, temperature, presence, _) = unpack("<HhHQ", xvalue)
 
-        if "presence" in measurements:
+        if "Distance" in device_type:
+            measurements = MEASUREMENTS[device_id]
+            (
+                battery_level,
+                temperature,
+                distance_mm,
+                reserved2
+            ) = unpack("<HhHQ", xvalue)
+
+            if "distance_mm" in measurements:
+                result.update({
+                    "distance mm": distance_mm,
+                })
+
+            if "temperature" in measurements:
+                result.update({
+                    "temperature": temperature,
+                })
+
             result.update({
-                "motion": 0 if presence == 0 else 1,
+                "battery": battery_level,
             })
+        else:
+            measurements = MEASUREMENTS[device_id]
+            (
+                battery_level,
+                temperature,
+                presence,
+                reserved2
+            ) = unpack("<HhHQ", xvalue)
+
+            if "presence" in measurements:
+                result.update({
+                    "motion": 0 if presence == 0 else 1,
+                })
+
+            if "temperature" in measurements:
+                result.update({
+                    "temperature": temperature,
+                })
 
-        if "temperature" in measurements:
             result.update({
-                "temperature": temperature,
+                "battery": battery_level,
             })
-
-        result.update({
-            "battery": battery_level,
-        })
     else:
         device_type = None
 

custom_components/ble_monitor/const.py

@@ -1858,6 +1858,7 @@ class BLEMonitorBinarySensorEntityDescription(
     'Laica Smart Scale'       : [["weight", "impedance", "rssi"], [], []],
     "Acconeer XM122"          : [["temperature", "battery", "rssi"], [], ["motion"]],
     "Acconeer XM126"          : [["temperature", "battery", "rssi"], [], ["motion"]],
+    "Acconeer XM126 Distance" : [["temperature", "battery", "rssi"], ["distance mm"], []],
     'K6 Sensor Beacon'        : [["temperature", "humidity", "acceleration", "voltage", "battery", "rssi"], [], []],
     'DSL-C08'                 : [["battery", "rssi", "voltage"], [], ["lock", "childlock"]],
     'SmartDry cloth dryer'    : [["temperature", "humidity", "voltage", "battery", "shake", "rssi"], [], ["switch"]],
@@ -1994,6 +1995,7 @@ class BLEMonitorBinarySensorEntityDescription(
     'Laica Smart Scale'       : 'Laica',
     'Acconeer XM122'          : 'Acconeer',
     'Acconeer XM126'          : 'Acconeer',
+    'Acconeer XM126 Distance' : 'Acconeer',
     'K6 Sensor Beacon'        : 'KKM',
     'SmartDry cloth dryer'    : 'SmartDry',
 }

custom_components/ble_monitor/test/test_acconeer_parser.py

@@ -44,3 +44,24 @@ def test_acconeer_xm126(self):
         assert sensor_msg["temperature"] == 22
         assert sensor_msg["motion"] == 1
         assert sensor_msg["rssi"] == -62
+
+
+    def test_acconeer_xm126_distance(self):
+        """Test acconeer parser for Acconeer XM126 Distance."""
+        data_string = "043e22020103013412b69009e01602010612ffc0ac906400160058050000000000000000c2"
+
+        data = bytes(bytearray.fromhex(data_string))
+
+        # pylint: disable=unused-variable
+        ble_parser = BleParser()
+        sensor_msg, tracker_msg = ble_parser.parse_raw_data(data)
+
+        assert sensor_msg["firmware"] == "Acconeer"
+        assert sensor_msg["type"] == "Acconeer XM126 Distance"
+        assert sensor_msg["mac"] == "E00990B61234"
+        assert sensor_msg["packet"] == "6400160058050000000000000000"
+        assert sensor_msg["data"]
+        assert sensor_msg["battery"] == 100
+        assert sensor_msg["temperature"] == 22
+        assert sensor_msg["distance mm"] == 1368
+        assert sensor_msg["rssi"] == -62