aioccl 2024.8.4__tar.gz → 2024.8.5__tar.gz

{aioccl-2024.8.4 → aioccl-2024.8.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioccl
-Version: 2024.8.4
+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.4 → aioccl-2024.8.5}/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
@@ -36,12 +36,18 @@ class CCLSensor:
         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):
@@ -153,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.4 → aioccl-2024.8.5}/aioccl.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioccl
-Version: 2024.8.4
+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.4 → aioccl-2024.8.5}/setup.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 from setuptools import find_packages, setup
 
-VERSION = "2024.8.4"
+VERSION = "2024.8.5"
 
 ROOT_DIR = Path(__file__).parent.resolve()