Merge pull request #65 from mash2k3/dev

Dev

Author: mash2k3

custom_components/qingping_cgs1/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "local_push",
   "issue_tracker": "https://github.com/mash2k3/qingping_cgs1/issues",
   "requirements": [],
-  "version": "1.2.8"
+  "version": "1.2.9"
 }

custom_components/qingping_cgs1/sensor.py

@@ -317,7 +317,9 @@ async def async_update_data():
     #sensors.append(QingpingDeviceSensor(coordinator, config_entry, mac, name, SENSOR_BATTERY, "Battery", PERCENTAGE, SensorDeviceClass.BATTERY, SensorStateClass.MEASUREMENT, device_info))
     if model in ["CGS1", "CGS2", "CGDN1", "CGP22C", "CGP22W", "CGP23W"]:
         sensors.append(battery_state)
-        sensors.append(QingpingDeviceSensor(coordinator, config_entry, mac, name, SENSOR_BATTERY, "Battery", PERCENTAGE, SensorDeviceClass.BATTERY, SensorStateClass.MEASUREMENT, device_info))
+        battery_sensor = QingpingDeviceSensor(coordinator, config_entry, mac, name, SENSOR_BATTERY, "Battery", PERCENTAGE, SensorDeviceClass.BATTERY, SensorStateClass.MEASUREMENT, device_info)
+        battery_sensor._attr_entity_category = EntityCategory.DIAGNOSTIC
+        sensors.append(battery_sensor)
     sensors.append(QingpingDeviceSensor(coordinator, config_entry, mac, name, SENSOR_TEMPERATURE, "Temperature", native_temp_unit, SensorDeviceClass.TEMPERATURE, SensorStateClass.MEASUREMENT, device_info))
     sensors.append(QingpingDeviceSensor(coordinator, config_entry, mac, name, SENSOR_HUMIDITY, "Humidity", PERCENTAGE, SensorDeviceClass.HUMIDITY, SensorStateClass.MEASUREMENT, device_info))
 
@@ -975,6 +977,11 @@ def icon(self):
 
     async def publish_config(self):
         """Publish configuration message to MQTT."""
+        # Check if entity has been added to hass yet
+        if not self.hass:
+            _LOGGER.debug(f"[{self._mac}] Sensor not yet added to hass, skipping config publish")
+            return
+            
         update_interval = self.coordinator.data.get(CONF_UPDATE_INTERVAL, 15)
         topic = f"{MQTT_TOPIC_PREFIX}/{self._mac}/down"
 

custom_components/qingping_cgs1/tlv_decoder.py

@@ -75,7 +75,7 @@ def tlv_unpack(byte_array: bytes) -> dict[str, Any]:
     }
 
 
-def decode_th_data(byte_array: bytes) -> dict[str, Any]:
+def decode_th_data(byte_array: bytes, product_id: int = 0) -> dict[str, Any]:
     """Decode temperature, humidity, pressure, and battery data."""
     if len(byte_array) < 6:
         _LOGGER.error("Byte array too short for TH data decoding")
@@ -84,19 +84,25 @@ def decode_th_data(byte_array: bytes) -> dict[str, Any]:
     th = bytes_to_int_little_endian(byte_array[0:3])
     temperature = ((th >> 12) - 500) / 10
     humidity = (th & 0xFFF) / 10
-    pressure = bytes_to_int_little_endian(byte_array[3:5]) / 100.0  # Convert to kPa
+    raw_3_5 = bytes_to_int_little_endian(byte_array[3:5])
     battery = byte_array[5]
 
-    return {
+    out: dict[str, Any] = {
         "dataType": "data",
         "timestamp": 0,
         "time": "",
         "temperature": temperature,
         "humidity": humidity,
-        "pressure": pressure,
         "battery": battery,
     }
 
+    if product_id == 51:
+        out["co2"] = raw_3_5
+    else:
+        out["pressure"] = raw_3_5 / 100.0  # Convert to kPa
+
+    return out
+
 
 def decode_realtime_data(byte_array: bytes, product_id: int = 0) -> dict[str, Any]:
     """Decode real-time sensor data."""
@@ -105,7 +111,7 @@ def decode_realtime_data(byte_array: bytes, product_id: int = 0) -> dict[str, An
         return {}
 
     timestamp = bytes_to_int_little_endian(byte_array[0:4])
-    realtime_data = decode_th_data(byte_array[4:])
+    realtime_data = decode_th_data(byte_array[4:], product_id)
     rssi = byte_array[10]
     if rssi >= 128:
         rssi = rssi - 256
@@ -134,7 +140,7 @@ def decode_history_data(byte_array: bytes, product_id: int = 0) -> list[dict[str
 
     while index + pack_len <= len(byte_array):
         history_pack = byte_array[index:index + pack_len]
-        history_data = decode_th_data(history_pack)
+        history_data = decode_th_data(history_pack, product_id)
         history_data["timestamp"] = timestamp + duration * i
         history_data["dataType"] = "data"
         history_data["time"] = fmt_timestamp(history_data["timestamp"])