aioccl 2024.7__py3-none-any.whl → 2024.7.2__py3-none-any.whl

aioccl/device.py

@@ -5,7 +5,7 @@ import logging
 import time
 from typing import Callable
 
-from .sensor import CCLSensor
+from .sensor import CCLSensor, CCL_SENSORS
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -17,14 +17,13 @@ class CCLDevice:
         _LOGGER.debug('Initializing CCL Device: %s', self)
         self._passkey = passkey
         
-        self.serial_no: str | None
-        self.mac_address: str | None
-        self.model: str | None
-        self.version: str | None
-
-        self.last_updated_time: float = -10.0 # Offset
-        
-        self.sensors: dict[str, CCLSensor] | None = {}
+        self._serial_no: str | None
+        self._mac_address: str | None
+        self._model: str | None
+        self._version: str | None
+        self._binary_sensors: dict[str, CCLSensor] | None = {}
+        self._sensors: dict[str, CCLSensor] | None = {}
+        self.last_updated_time: float | None
 
         self._new_sensors: list[CCLSensor] | None = []
         
@@ -36,26 +35,56 @@ class CCLDevice:
         return self._passkey
     
     @property
-    def device_id(self) -> str:
-        return self.mac_address.replace(":", "").lower()[-6:]
+    def device_id(self) -> str | None:
+        return self._mac_address.replace(":", "").lower()[-6:]
+    
+    @property
+    def serial_no(self) -> str | None:
+        return self._serial_no
+    
+    @property
+    def mac_address(self) -> str | None:
+        return self._mac_address
+    
+    @property
+    def model(self) -> str | None:
+        return self._model
+    
+    @property
+    def version(self) -> str | None:
+        return self._version
+    
+    @property
+    def binary_sensors(self) -> dict[str, CCLSensor] | None:
+        return self._binary_sensors
+    
+    @property
+    def sensors(self) -> dict[str, CCLSensor] | None:
+        return self._sensors
     
     def update_info(self, info: dict[str, None | str]) -> None:
         """Add or update device info."""
-        self.serial_no = info.get('serial_no')
-        self.mac_address = info.get('mac_address')
-        self.model = info.get('model')
-        self.version = info.get('version')
+        self._serial_no = info.get('serial_no')
+        self._mac_address = info.get('mac_address')
+        self._model = info.get('model')
+        self._version = info.get('version')
     
     def update_sensors(self, sensors: dict[str, None | str | int | float]) -> None:
         """Add or update all sensor values."""
-        for sensor, value in sensors.items():
-            if not self.sensors.get(sensor):
-                self.sensors[sensor] = CCLSensor(sensor)
-                self._new_sensors.append(self.sensors[sensor])
-            self.sensors[sensor].value = value
+        for key, value in sensors.items():
+            if CCL_SENSORS[key].binary:
+                if not self._binary_sensors.get(key):
+                    self._binary_sensors[key] = CCLSensor(key)
+                    self._new_sensors.append(self._binary_sensors[key])
+                self._binary_sensors[key].value = value
+            else:
+                if not self._sensors.get(key):
+                    self._sensors[key] = CCLSensor(key)
+                    self._new_sensors.append(self.sensors[key])
+                self._sensors[key].value = value
         self._publish_new_sensors()
         self._publish_updates()
-        self.last_updated_time = time.monotonic()
+        self._last_updated_time = time.monotonic()
         _LOGGER.debug("Sensors Updated: %s", self.last_updated_time)
 
     def register_update_cb(self, callback: Callable[[], None]) -> None:
@@ -87,7 +116,6 @@ class CCLDevice:
         try:
             for sensor in self._new_sensors:
                 _LOGGER.debug("Publishing new sensor: %s", sensor)
-                _LOGGER.debug("Sensors remaining: %s", self._new_sensors)
                 for callback in self._new_sensor_callbacks:
                     callback(sensor)
             self._new_sensors.clear()

aioccl/sensor.py

@@ -9,27 +9,38 @@ class CCLSensor:
     
     def __init__(self, key: str):
         """Initialize a CCL sensor."""
-        self.value: None | str | int | float
+        self._value: None | str | int | float
     
         if key in CCL_SENSORS.keys():
             self._key = key
     
     @property
-    def key(self):
+    def key(self) -> str:
         return self._key
     
     @property
-    def name(self):
+    def name(self) -> str:
         return CCL_SENSORS[self._key].name
     
     @property
-    def sensor_type(self):
+    def sensor_type(self) -> CCLSensorTypes:
         return CCL_SENSORS[self._key].sensor_type
+    
+    @property
+    def binary(self) -> bool:
+        return CCL_SENSORS[self._key].binary
+
+    @property
+    def value(self):
+        if self.sensor_type == CCLSensorTypes.CH_SENSOR_TYPE:
+            return CCL_CH_SENSOR_TYPES[self.sensor_type]
+        return self._value
 
 @dataclass
 class CCLSensorPreset:
     name: str
     sensor_type: str
+    binary: bool = False
     
 class CCLSensorTypes(enum.Enum):
     PRESSURE = 1
@@ -37,6 +48,15 @@ class CCLSensorTypes(enum.Enum):
     HUMIDITY = 3
     WIND_DIRECITON = 4
     WIND_SPEED = 5
+    RAIN_RATE = 6
+    RAINFALL = 7
+    UVI = 8
+    RADIATION = 9
+    BATTERY_BINARY = 10
+    CONNECTION = 11
+    CH_SENSOR_TYPE = 12
+    
+CCL_CH_SENSOR_TYPES: list[str] = [None, None, 'Thermo-Hygro', 'Pool', 'Soil']
     
 CCL_SENSORS: dict[str, CCLSensorPreset] = {
     'rbar': CCLSensorPreset('Air Pressure', CCLSensorTypes.PRESSURE),
@@ -44,6 +64,32 @@ CCL_SENSORS: dict[str, CCLSensorPreset] = {
     'inhum': CCLSensorPreset('Indoor Humidity', CCLSensorTypes.HUMIDITY),
     't1tem': CCLSensorPreset('Outdoor Temperature', CCLSensorTypes.TEMPERATURE),
     't1hum': CCLSensorPreset('Outdoor Humidity', CCLSensorTypes.HUMIDITY),
-    't1wdir': CCLSensorPreset('Outdoor Wind Direction', CCLSensorTypes.WIND_DIRECITON),
-    't1ws': CCLSensorPreset('Outdoor Wind Speed', CCLSensorTypes.WIND_SPEED),
+    't1wdir': CCLSensorPreset('Wind Direction', CCLSensorTypes.WIND_DIRECITON),
+    't1ws': CCLSensorPreset('Wind Speed', CCLSensorTypes.WIND_SPEED),
+    't1ws10mav': CCLSensorPreset('Wind Speed (10 mins avg.)', CCLSensorTypes.WIND_SPEED),
+    't1wgust': CCLSensorPreset('Wind Gust', CCLSensorTypes.WIND_SPEED),
+    't1rainra': CCLSensorPreset('Rain Rate', CCLSensorTypes.RAIN_RATE),
+    't1rainhr': CCLSensorPreset('Hourly Rainfall', CCLSensorTypes.RAINFALL),
+    't1raindy': CCLSensorPreset('Daily Rainfall', CCLSensorTypes.RAINFALL),
+    't1rainwy': CCLSensorPreset('Weekly Rainfall', CCLSensorTypes.RAINFALL),
+    't1rainmth': CCLSensorPreset('Monthly Rainfall', CCLSensorTypes.RAINFALL),
+    't1uvi': CCLSensorPreset('UV Index', CCLSensorTypes.UVI),
+    't1solrad': CCLSensorPreset('Light Intensity', CCLSensorTypes.RADIATION),
+    't1bat': CCLSensorPreset('CH0 Battery', CCLSensorTypes.BATTERY_BINARY, True),
+    't1cn': CCLSensorPreset('CH0 Connection', CCLSensorTypes.CONNECTION),
+    't1feels': CCLSensorPreset('Feels Like', CCLSensorTypes.TEMPERATURE),
+    't1chill': CCLSensorPreset('Wind Chill', CCLSensorTypes.TEMPERATURE),
+    't1heat': CCLSensorPreset('Heat Index', CCLSensorTypes.TEMPERATURE),
+    't1dew': CCLSensorPreset('Dew Point', CCLSensorTypes.TEMPERATURE),
+    't1wbgt': CCLSensorPreset('WBGT Index', CCLSensorTypes.TEMPERATURE),
+    't234c1tem': CCLSensorPreset('CH1 Temperature', CCLSensorTypes.TEMPERATURE),
+    't234c1hum': CCLSensorPreset('CH1 Humidity', CCLSensorTypes.HUMIDITY),
+    't234c1bat': CCLSensorPreset('CH1 Battery', CCLSensorTypes.BATTERY_BINARY, True),
+    't234c1cn': CCLSensorPreset('CH1 Connection', CCLSensorTypes.CONNECTION, True),
+    't234c1tp': CCLSensorPreset('CH1 Sensor Type', CCLSensorTypes.CH_SENSOR_TYPE),
+    't234c2tem': CCLSensorPreset('CH2 Temperature', CCLSensorTypes.TEMPERATURE),
+    't234c2hum': CCLSensorPreset('CH2 Humidity', CCLSensorTypes.HUMIDITY),
+    't234c2bat': CCLSensorPreset('CH2 Battery', CCLSensorTypes.BATTERY_BINARY, True),
+    't234c2cn': CCLSensorPreset('CH2 Connection', CCLSensorTypes.CONNECTION, True),
+    't234c2tp': CCLSensorPreset('CH2 Sensor Type', CCLSensorTypes.CH_SENSOR_TYPE),
 }

aioccl/server.py

@@ -8,7 +8,7 @@ from aiohttp import web
 import aiohttp_cors
 
 from .device import CCLDevice, CCL_DEVICE_INFO_TYPES
-from .ccl_sensor import CCL_SENSORS
+from .sensor import CCL_SENSORS
 
 _LOGGER = logging.getLogger(__name__)
 

{aioccl-2024.7.dist-info → aioccl-2024.7.2.dist-info}/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2024 fkiscd@gmail.com
+   Copyright 2024 CCL Electronics Ltd
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

{aioccl-2024.7.dist-info → aioccl-2024.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioccl
-Version: 2024.7
+Version: 2024.7.2
 Summary: A Python library for CCL API server
 Home-page: https://github.com/fkiscd/aioccl
 Download-URL: https://github.com/fkiscd/aioccl

aioccl-2024.7.2.dist-info/RECORD

@@ -0,0 +1,9 @@
+aioccl/__init__.py,sha256=iL1OC2F_rf3qkswi-bO8Y_uj2-lf284LCnyxwqdLUU8,137
+aioccl/device.py,sha256=RzneGYQujYdQGRa7G382hIea1Q95V-LJ_gi5x7pmeSk,4380
+aioccl/sensor.py,sha256=jonbAEgs1QG6akjNBv_2Rd1DGscd3rV5yVs1zFjR5GY,3991
+aioccl/server.py,sha256=JPwhjp7pzQnm7J2RcHh3GiaqBc-jkRH2mQA4KHJzm28,3669
+aioccl-2024.7.2.dist-info/LICENSE,sha256=PBRsTHchx7o0TQ2R2ktEAfFmn1iNHTxcOP_xaeuSAuo,11349
+aioccl-2024.7.2.dist-info/METADATA,sha256=o3zif4UU7Bu7JCu_74WkfVPrhZGGPIzh_xJOToBYXbc,769
+aioccl-2024.7.2.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+aioccl-2024.7.2.dist-info/top_level.txt,sha256=-xIJfyfXTaW_EH7XCIHyxjSSSwjLmawa2qhsrHZH1vA,7
+aioccl-2024.7.2.dist-info/RECORD,,

{aioccl-2024.7.dist-info → aioccl-2024.7.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.0.4)
+Generator: setuptools (72.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

aioccl-2024.7.dist-info/RECORD

@@ -1,9 +0,0 @@
-aioccl/__init__.py,sha256=iL1OC2F_rf3qkswi-bO8Y_uj2-lf284LCnyxwqdLUU8,137
-aioccl/device.py,sha256=Wat8WNJQ3MNDXiW5gfs_GHSeamNgqAdZ-g1xmVYCHdc,3510
-aioccl/sensor.py,sha256=A6Puccd49P7h_o3J-v4R9eyvpIl4t342Y_rAMWTwtGs,1435
-aioccl/server.py,sha256=yu1LUwR3yslL92SYaTqey-itkFIPQjUeNYvZQ27kl5E,3673
-aioccl-2024.7.dist-info/LICENSE,sha256=zEe43d4DW7O2Oe1-zDY0peOCPTBDNpWJkDa8kxrpVn8,11346
-aioccl-2024.7.dist-info/METADATA,sha256=stAM0j5FVF7_RphsSlNz8BtrE0WgqUxudLSsu19LRj8,767
-aioccl-2024.7.dist-info/WHEEL,sha256=rWxmBtp7hEUqVLOnTaDOPpR-cZpCDkzhhcBce-Zyd5k,91
-aioccl-2024.7.dist-info/top_level.txt,sha256=-xIJfyfXTaW_EH7XCIHyxjSSSwjLmawa2qhsrHZH1vA,7
-aioccl-2024.7.dist-info/RECORD,,