Merge pull request #43 from mash2k3/dev

Dev

Author: mash2k3

README.md

@@ -16,7 +16,8 @@ This custom component integrates the Qingping Air Quality Monitors [CGS1/CGS2/CG
 
 - Automatic discovery of Qingping CGS1/CGS2/CGDN1 devices
 - Real-time updates of air quality data
-- Configurable temperature and humidity offsets
+- Configurable offsets
+- Configuration entites
 - Adjustable update interval
 - Automatic unit conversion for temperature
 - Device status monitoring
@@ -39,15 +40,15 @@ This custom component integrates the Qingping Air Quality Monitors [CGS1/CGS2/CG
 5. Search for "Qingping Pro AQM" and follow the configuration steps
 
 ## Configuration
-<img src="https://github.com/user-attachments/assets/3cc92957-3460-4ba4-b78f-17afab455f40" alt="Device Discovery" width="250" align="left">
+<img src="https://github.com/user-attachments/assets/a123e039-7ada-4062-a5aa-f2c7b2d20085" alt="Device Discovery" width="250" align="left">
 The integration supports automatic discovery of Qingping CGS1/CGS2/CGDN1 devices.
 <br />If your device is not discovered automatically, you can add it manually by providing the MAC address. 
 <br />⚠️ Do not include : in your MAC address. example: 532D38701E1F
 <br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br />
 
 
 ## How it Works
-<img src="https://github.com/user-attachments/assets/46567747-a8cb-443e-be23-78a87e741a42" alt="Device Discovery" width="275" align="right">
+<img src="https://github.com/user-attachments/assets/55a42477-59a7-48b6-b70b-f743c5e2a69a" alt="Device Discovery" width="275" align="right">
 
 1. **Device Discovery**: The integration uses MQTT to discover Qingping CGS1/CGS2/CGDN1 devices on your network. It listens for messages on the MQTT topic `qingping/#` to identify available devices.
 
@@ -62,6 +63,19 @@ The integration supports automatic discovery of Qingping CGS1/CGS2/CGDN1 devices
    - TVOC (ppb, ppm and mg/m³) `Only on CGS1`
    - eTVOC (ppb, VOC index and mg/m³) `Only on CGS2`
    - Noise level `Only on CGS2`
+   - Temp & Humidity Offsets
+   - PM2.5 Offsets
+   - PM10 Offsets
+   - TVOC Offsets `Only on CGS1`
+   - eTVOC Offsets `Only on CGS2`
+   - CO2 Offsets
+   - Auto Sliding `Only on CGDN1`
+   - Auto CO2 Calibration `Only on CGDN1`
+   - Manual Calibration `Only on CGDN1`
+   - Night Mode `Only on CGDN1`
+   - Power Off Time `Only on CGDN1`
+   - Screensaver `Only on CGDN1`
+   - Timezone `Only on CGDN1`
    - Battery level
    - Device status (online/offline)
    - Firmware version
@@ -73,12 +87,12 @@ The integration supports automatic discovery of Qingping CGS1/CGS2/CGDN1 devices
    - mg/m³ = ppb/218.77<br />
 
    **eTVOC Sensor**: The sensor can be set to 3 different measurement units, by default it is VOC index. The component converts from voc index to get ppb and mg/m³.
-   - ppb = (index * 5) + 35
-   - mg/m³ = (index * 0.023) + 0.124
+   - ppb = ( math.log ( 501 - voc_index ) - 6.24) * -2215.4
+   - mg/m³ = ( ppb * 4.5 * 10 + 5 ) / 10 / 1000
 
 5. **Data Updates**: The component subscribes to MQTT messages from the device. When new data is received, it updates the relevant sensors in Home Assistant.
 
-6. **Offset Adjustments**: The integration allows you to set offset values for temperature and humidity readings. These offsets are applied to the raw sensor data before it's displayed in Home Assistant.
+6. **Offset Adjustments**: The integration allows you to set offset values for sesor readings. These offsets are applied to the device before it's displayed in Home Assistant.
 
 7. **Update Interval**: You can configure how often the device should report new data. This is done through a number entity that allows you to set the update interval in seconds.
 

custom_components/qingping_cgs1/__init__.py

@@ -9,7 +9,7 @@
 
 from .const import DOMAIN, CONF_TEMPERATURE_OFFSET, CONF_HUMIDITY_OFFSET, DEFAULT_OFFSET, CONF_UPDATE_INTERVAL, DEFAULT_UPDATE_INTERVAL
 
-PLATFORMS: list[Platform] = [Platform.SENSOR, Platform.NUMBER, Platform.SELECT]
+PLATFORMS: list[Platform] = [Platform.SENSOR, Platform.NUMBER, Platform.SELECT, Platform.SWITCH, Platform.BUTTON, Platform.TIME]
 
 _LOGGER = logging.getLogger(__name__)
 

custom_components/qingping_cgs1/button.py

@@ -0,0 +1,73 @@
+"""Support for Qingping CGSx button entities."""
+from __future__ import annotations
+
+import json
+import logging
+
+from homeassistant.components import mqtt
+from homeassistant.components.button import ButtonEntity
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_NAME, CONF_MAC, CONF_MODEL
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity import EntityCategory
+from homeassistant.exceptions import HomeAssistantError
+
+from .const import DOMAIN, MQTT_TOPIC_PREFIX
+
+_LOGGER = logging.getLogger(__name__)
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up Qingping CGSx button entities from a config entry."""
+    mac = config_entry.data[CONF_MAC]
+    name = config_entry.data[CONF_NAME]
+    model = config_entry.data[CONF_MODEL]
+
+    device_info = {
+        "identifiers": {(DOMAIN, mac)},
+        "name": name,
+        "manufacturer": "Qingping",
+        "model": model,
+    }
+
+    buttons = []
+
+    # CGDN1-specific buttons
+    if model == "CGDN1":
+        buttons.append(
+            QingpingCGSxManualCalibrationButton(config_entry, mac, name, device_info)
+        )
+
+    if buttons:
+        async_add_entities(buttons)
+
+
+class QingpingCGSxManualCalibrationButton(ButtonEntity):
+    """Button to trigger manual CO2 calibration."""
+
+    def __init__(self, config_entry, mac, name, device_info):
+        """Initialize the button."""
+        self._config_entry = config_entry
+        self._mac = mac
+        self._attr_name = f"{name} Manual Calibration"
+        self._attr_unique_id = f"{mac}_manual_calibration"
+        self._attr_device_info = device_info
+        self._attr_entity_category = EntityCategory.CONFIG
+        self._attr_icon = "mdi:tune-vertical"
+
+    async def async_press(self) -> None:
+        """Handle the button press."""
+        try:
+            payload = {"type": "29"}
+            topic = f"{MQTT_TOPIC_PREFIX}/{self._mac}/down"
+            
+            _LOGGER.info("Triggering manual calibration for %s", self._mac)
+            await mqtt.async_publish(self.hass, topic, json.dumps(payload))
+            
+        except Exception as err:
+            _LOGGER.error("Failed to trigger manual calibration: %s", err)
+            raise HomeAssistantError(f"Failed to trigger calibration: {err}")

custom_components/qingping_cgs1/const.py

@@ -46,4 +46,25 @@
 DEFAULT_DURATION = "86400"
 
 QP_MODELS = ["CGS1", "CGS2", "CGDN1"]
-DEFAULT_MODEL = "CGS1"
+DEFAULT_MODEL = "CGS1"
+
+# Device-specific settings
+CONF_CO2_ASC = "co2_asc"
+CONF_CO2_OFFSET = "co2_offset"
+CONF_PM25_OFFSET = "pm25_offset"
+CONF_PM10_OFFSET = "pm10_offset"
+CONF_NOISE_OFFSET = "noise_offset"
+CONF_TVOC_OFFSET = "tvoc_zoom"
+CONF_TVOC_INDEX_OFFSET = "tvoc_index_zoom"
+
+# Default values for device settings
+DEFAULT_SENSOR_OFFSET = 0
+
+# CGDN1 specific settings
+CONF_POWER_OFF_TIME = "power_off_time"
+CONF_DISPLAY_OFF_TIME = "display_off_time"
+CONF_NIGHT_MODE_START_TIME = "night_mode_start_time"
+CONF_NIGHT_MODE_END_TIME = "night_mode_end_time"
+CONF_AUTO_SLIDING_TIME = "auto_slideing_time"
+CONF_SCREENSAVER_TYPE = "screensaver_type"
+CONF_TIMEZONE = "timezone"

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.5"
+  "version": "1.2.7"
 }