aioccl 2024.8.3__py3-none-any.whl → 2024.8.5__py3-none-any.whl

aioccl/device.py

@@ -72,7 +72,7 @@ class CCLDevice:
         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._fw_ver = info.get('fw_ver')
     
     def update_sensors(self, sensors: dict[str, None | str | int | float]) -> None:
         """Add or update all sensor values."""

aioccl/sensor.py

@@ -9,7 +9,7 @@ class CCLSensor:
     
     def __init__(self, key: str):
         """Initialize a CCL sensor."""
-        self._value: None | str | int | float
+        self._value: None | str | int | float = None
     
         if key in CCL_SENSORS.keys():
             self._key = key
@@ -27,20 +27,27 @@ class CCLSensor:
         return CCL_SENSORS[self._key].sensor_type
     
     @property
-    def compartment(self) -> str:
-        return CCL_SENSORS[self._key].compartment.value
+    def compartment(self) -> None | str:
+        if CCL_SENSORS[self._key].compartment is not None:
+            return CCL_SENSORS[self._key].compartment.value
     
     @property
     def binary(self) -> bool:
         return CCL_SENSORS[self._key].binary
 
     @property
-    def value(self):
+    def value(self) -> None | str | int | float:
         if self.sensor_type == CCLSensorTypes.CH_SENSOR_TYPE:
             return CCL_CH_SENSOR_TYPES.get(self._value)
         elif self.sensor_type in CCL_LEVEL_SENSORS:
             return 'Lv ' + self._value
-        return self._value
+        try:
+            return int(self._value)
+        except ValueError:
+            try:
+                return float(self._value)
+            except ValueError:
+                return self._value
     
     @value.setter
     def value(self, new_value):
@@ -50,7 +57,7 @@ class CCLSensor:
 class CCLSensorPreset:
     name: str
     sensor_type: str
-    compartment: str = None
+    compartment: None | CCLDeviceCompartment = None
     binary: bool = False
     
 class CCLSensorTypes(enum.Enum):
@@ -152,8 +159,8 @@ CCL_SENSORS: dict[str, CCLSensorPreset] = {
     't234c7bat': CCLSensorPreset('Battery: CH7', CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True),
     't11bat': CCLSensorPreset('Battery: CO', CCLSensorTypes.BATTERY, CCLDeviceCompartment.STATUS),
     't10bat': CCLSensorPreset('Battery: CO\u2082', CCLSensorTypes.BATTERY, CCLDeviceCompartment.STATUS),
-    'inbat': CCLSensorPreset('Battery: Console', CCLSensorTypes.BATTERY_BINARY, True),
-    't9bat': CCLSensorPreset('Battery:Formaldehyde/VOC', CCLSensorTypes.BATTERY, CCLDeviceCompartment.STATUS),
+    'inbat': CCLSensorPreset('Battery: Console', CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True),
+    't9bat': CCLSensorPreset('Battery: Formaldehyde/VOC', CCLSensorTypes.BATTERY, CCLDeviceCompartment.STATUS),
     't6c1bat': CCLSensorPreset('Battery: Leakage CH1', CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True),
     't1bat': CCLSensorPreset('Battery: Main Sensor Array', CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True),
     't8bat': CCLSensorPreset('Battery: PM2.5/10', CCLSensorTypes.BATTERY, CCLDeviceCompartment.STATUS),

{aioccl-2024.8.3.dist-info → aioccl-2024.8.5.dist-info}/METADATA

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

aioccl-2024.8.5.dist-info/RECORD

@@ -0,0 +1,9 @@
+aioccl/__init__.py,sha256=iL1OC2F_rf3qkswi-bO8Y_uj2-lf284LCnyxwqdLUU8,137
+aioccl/device.py,sha256=Cr33h7HrM2YS-u9BxoJASd2X5nBba37_fC85XunhVcs,5132
+aioccl/sensor.py,sha256=JGYiTbKMJSqjDmxIiRUb3CWU8o7Is7h49iVwoYANHzA,10629
+aioccl/server.py,sha256=-ZDii20CLqj4_jqVVqRMlnvg-CCtJiZjuMMDamem0DE,3717
+aioccl-2024.8.5.dist-info/LICENSE,sha256=PBRsTHchx7o0TQ2R2ktEAfFmn1iNHTxcOP_xaeuSAuo,11349
+aioccl-2024.8.5.dist-info/METADATA,sha256=NaIY0V17xuYQcsH12ZIcZrPrWG1JbLg6nXJ4NGSwbio,769
+aioccl-2024.8.5.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+aioccl-2024.8.5.dist-info/top_level.txt,sha256=-xIJfyfXTaW_EH7XCIHyxjSSSwjLmawa2qhsrHZH1vA,7
+aioccl-2024.8.5.dist-info/RECORD,,

aioccl-2024.8.3.dist-info/RECORD

@@ -1,9 +0,0 @@
-aioccl/__init__.py,sha256=iL1OC2F_rf3qkswi-bO8Y_uj2-lf284LCnyxwqdLUU8,137
-aioccl/device.py,sha256=OIUzb4wpADkbAekpWKYXCVoigNlLA-3W8aRnxHAN9D8,5134
-aioccl/sensor.py,sha256=acEWOlQVkcxBIas7LQkbVd-VpdH2wohOo-lS5gTpPk0,10296
-aioccl/server.py,sha256=-ZDii20CLqj4_jqVVqRMlnvg-CCtJiZjuMMDamem0DE,3717
-aioccl-2024.8.3.dist-info/LICENSE,sha256=PBRsTHchx7o0TQ2R2ktEAfFmn1iNHTxcOP_xaeuSAuo,11349
-aioccl-2024.8.3.dist-info/METADATA,sha256=Sjg1FWskDNmi2B8198g4FQYb5VZ681A7fe93q3g2zwg,769
-aioccl-2024.8.3.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-aioccl-2024.8.3.dist-info/top_level.txt,sha256=-xIJfyfXTaW_EH7XCIHyxjSSSwjLmawa2qhsrHZH1vA,7
-aioccl-2024.8.3.dist-info/RECORD,,