aioccl 2024.9.1__tar.gz → 2024.9.3__tar.gz

{aioccl-2024.9.1 → aioccl-2024.9.3}/PKG-INFO

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

{aioccl-2024.9.1 → aioccl-2024.9.3}/aioccl/device.py

@@ -9,7 +9,7 @@ from .sensor import CCLSensor, CCL_SENSORS
 
 _LOGGER = logging.getLogger(__name__)
 
-CCL_DEVICE_INFO_TYPES = ("serial_no", "mac_address", "model", "version")
+CCL_DEVICE_INFO_TYPES = ("serial_no", "mac_address", "model", "fw_ver")
 
 class CCLDevice:
     def __init__(self, passkey: str):
@@ -43,10 +43,6 @@ class CCLDevice:
     def name(self) -> str | None:
         return self._model + " - " + self.device_id
     
-    @property
-    def serial_no(self) -> str | None:
-        return self._serial_no
-    
     @property
     def mac_address(self) -> str | None:
         return self._mac_address
@@ -69,7 +65,6 @@ class CCLDevice:
     
     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._fw_ver = info.get('fw_ver')

{aioccl-2024.9.1 → aioccl-2024.9.3}/aioccl/sensor.py

@@ -39,18 +39,15 @@ class CCLSensor:
     def value(self) -> None | str | int | float:
         if self.sensor_type.name in CCL_SENSOR_VALUES:
             return CCL_SENSOR_VALUES[self.sensor_type.name].get(self._value)
-        elif self.sensor_type == CCLSensorTypes.BATTERY_BINARY:
-            return self._value - 1
         elif self.sensor_type in CCL_LEVEL_SENSORS:
             return 'Lv ' + self._value
-        
-        try:
-            return int(self._value)
-        except ValueError:
+        elif self.sensor_type == CCLSensorTypes.BATTERY_BINARY:
             try:
-                return float(self._value)
+                return int(self._value) - 1
             except ValueError:
-                return self._value
+                pass
+        else:
+            return self._value
     
     @value.setter
     def value(self, new_value):
@@ -85,9 +82,9 @@ class CCLSensorTypes(enum.Enum):
     AQI = 19
     LEAKAGE = 20
     BATTERY = 21
-    DISTANCE = 22
-    DURATION = 23
-    FREQUENCY_NU = 24
+    LIGHTNING_DISTANCE = 22
+    LIGHTNING_DURATION = 23
+    LIGHTNING_FREQUENCY = 24
     
 class CCLDeviceCompartment(enum.Enum):
     MAIN = 'Console and Sensor Array'
@@ -101,8 +98,8 @@ CCL_SENSOR_VALUES: dict[str, dict[str, str]] = {
         '4': 'Soil',
     },
     'LEAKAGE': {
-        '0': 'Leaking',
-        '1': 'No Leak',
+        '0': 'No Leak',
+        '1': 'Leaking',
     }
 }
 
@@ -170,10 +167,14 @@ CCL_SENSORS: dict[str, CCLSensorPreset] = {
     't6c5wls': CCLSensorPreset('Leakage CH5', CCLSensorTypes.LEAKAGE, CCLDeviceCompartment.OTHER),
     't6c6wls': CCLSensorPreset('Leakage CH6', CCLSensorTypes.LEAKAGE, CCLDeviceCompartment.OTHER),
     't6c7wls': CCLSensorPreset('Leakage CH7', CCLSensorTypes.LEAKAGE, CCLDeviceCompartment.OTHER),
-    't5lskm': CCLSensorPreset('Lightning Distance', CCLSensorTypes.DISTANCE, CCLDeviceCompartment.OTHER),
-    't5lst': CCLSensorPreset('Lightning: Last Strike', CCLSensorTypes.DURATION, CCLDeviceCompartment.OTHER),
-    't5lsf': CCLSensorPreset('Lightning: Hourly Strikes', CCLSensorTypes.FREQUENCY_NU, CCLDeviceCompartment.OTHER),
-    't5ls1dtc': CCLSensorPreset('Lightning: Daily Strikes', CCLSensorTypes.FREQUENCY_NU, CCLDeviceCompartment.OTHER),
+    't5lskm': CCLSensorPreset('Lightning Distance', CCLSensorTypes.LIGHTNING_DISTANCE, CCLDeviceCompartment.OTHER),
+    't5lst': CCLSensorPreset('Lightning: Last Strike', CCLSensorTypes.LIGHTNING_DURATION, CCLDeviceCompartment.OTHER),
+    't5lsf': CCLSensorPreset('Lightning: Past 60 mins Strikes', CCLSensorTypes.LIGHTNING_FREQUENCY, CCLDeviceCompartment.OTHER),
+    't5ls30mtc': CCLSensorPreset('Lightning: Strikes in 30 mins', CCLSensorTypes.LIGHTNING_FREQUENCY, CCLDeviceCompartment.OTHER),
+    't5ls5mtc': CCLSensorPreset('Lightning: Strikes in 5 mins', CCLSensorTypes.LIGHTNING_FREQUENCY, CCLDeviceCompartment.OTHER),
+    't5ls1dtc': CCLSensorPreset('Lightning: Strikes in day', CCLSensorTypes.LIGHTNING_FREQUENCY, CCLDeviceCompartment.OTHER),
+    't5ls1htc': CCLSensorPreset('Lightning: Strikes in hour', CCLSensorTypes.LIGHTNING_FREQUENCY, CCLDeviceCompartment.OTHER),
+    
     # Status 78-119
     't234c1bat': CCLSensorPreset('Battery: CH1', CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True),
     't234c2bat': CCLSensorPreset('Battery: CH2', CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True),

{aioccl-2024.9.1 → aioccl-2024.9.3}/aioccl.egg-info/PKG-INFO

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

{aioccl-2024.9.1 → aioccl-2024.9.3}/setup.py

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