From 933ea1bd05f5cec4c309cf2964bffc9f962d1920 Mon Sep 17 00:00:00 2001
From: Ivan Belokobylskiy <belokobylskij@gmail.com>
Date: Sat, 13 May 2023 23:14:41 +0200
Subject: [PATCH] qingping_cgdk2: refactor

---
 ble2mqtt/devices/qingping_cgdk2.py | 79 +++++++++++-------------------
 1 file changed, 29 insertions(+), 50 deletions(-)

diff --git a/ble2mqtt/devices/qingping_cgdk2.py b/ble2mqtt/devices/qingping_cgdk2.py
index e06f8bf..1d9c306 100644
--- a/ble2mqtt/devices/qingping_cgdk2.py
+++ b/ble2mqtt/devices/qingping_cgdk2.py
@@ -1,32 +1,21 @@
-import io
 import logging
-import struct
-import typing as ty
 import uuid
 from dataclasses import dataclass
 
-from bleak.backends.device import BLEDevice
-
-from ..protocols.xiaomi import parse_fe95_advert
-from ..utils import format_binary
 from .base import ConnectionMode
 from .uuids import BATTERY
 from .xiaomi_base import XiaomiHumidityTemperature
 
 _LOGGER = logging.getLogger(__name__)
 
-SERVICE_DATA_UUID = 'fdcd'
-
-MAC_START = 2
-MAC_END = 8
+SERVICE_DATA_UUID = uuid.UUID('0000fdcd-0000-1000-8000-00805f9b34fb')
 
 
 @dataclass
 class SensorState:
     battery: int = 0
-    temperature: float = 0
-    humidity: float = 0
-    mac: str = ""
+    temperature: float = 0.0
+    humidity: float = 0.0
 
 
 class QingpingTempRHMonitorLite(XiaomiHumidityTemperature):
@@ -38,39 +27,29 @@ class QingpingTempRHMonitorLite(XiaomiHumidityTemperature):
     SUPPORT_PASSIVE = True
     ACTIVE_CONNECTION_MODE = ConnectionMode.ACTIVE_POLL_WITH_DISCONNECT
 
-    def filter_notifications(self, sender):
-        return True
-
-    def handle_advert(self, scanned_device: BLEDevice, adv_data):
-        service_data = adv_data.service_data
-        adv_data = service_data.get(str("0000fdcd-0000-1000-8000-00805f9b34fb"))
-        if adv_data is  None :
-              return
-
-        data_str = format_binary(adv_data," ")
-        
-        # adv_data = bytes(adv_data)
-
-        preeamble = "cdfd88"
-        packetStart = data_str.find(preeamble)
-        offset = packetStart + len(preeamble)
-        strippedData_str = data_str[6:len(data_str)]
-        mac = ':'.join(list(reversed(strippedData_str[0:17].split(' '))))
-        dataIdentifier = data_str[(offset-2):offset].upper()
-
-        if dataIdentifier == "10":
-                data = io.BytesIO(adv_data)
-                data.seek(10)
-                temperature = int(format(struct.unpack("<H", data.read(2))[0], '02x'), base=16) /10
-                data.seek(12)
-                humidity = int(format(struct.unpack("<H", data.read(2))[0], '02x'), base=16) /10
-                data.seek(16)
-                batteryPercent = int(format_binary(data.read(2)),base=16)
-                self._state = self.SENSOR_CLASS(
-                    temperature=temperature,
-                    humidity=humidity,
-                    battery=batteryPercent,
-                    mac=mac
-                )
-
-        
+    PREAMBLE = b'\xcd\xfd'
+
+    def filter_notifications(self, sender, data):
+        packet_start = data.find(self.PREAMBLE)
+        if packet_start == -1:
+            return False
+        return data[packet_start + len(self.PREAMBLE) + 1] == 0x10
+
+    def process_data(self, data):
+        packet_start = data.find(self.PREAMBLE)
+        offset = packet_start + len(self.PREAMBLE)
+        value_data = data[offset:]
+
+        self._state = self.SENSOR_CLASS(
+            temperature=int.from_bytes(
+                value_data[10:12],
+                byteorder='little',
+                signed=True,
+            ) / 10,
+            humidity=int.from_bytes(
+                value_data[12:14],
+                byteorder='little',
+                signed=False,
+            ) / 10,
+            battery=value_data[16],
+        )