aioccl 2024.8.1__tar.gz → 2024.8.3__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. {aioccl-2024.8.1 → aioccl-2024.8.3}/PKG-INFO +1 -1
  2. {aioccl-2024.8.1 → aioccl-2024.8.3}/aioccl/sensor.py +15 -12
  3. {aioccl-2024.8.1 → aioccl-2024.8.3}/aioccl/server.py +1 -1
  4. {aioccl-2024.8.1 → aioccl-2024.8.3}/aioccl.egg-info/PKG-INFO +1 -1
  5. {aioccl-2024.8.1 → aioccl-2024.8.3}/setup.py +1 -1
  6. {aioccl-2024.8.1 → aioccl-2024.8.3}/LICENSE +0 -0
  7. {aioccl-2024.8.1 → aioccl-2024.8.3}/README.md +0 -0
  8. {aioccl-2024.8.1 → aioccl-2024.8.3}/aioccl/__init__.py +0 -0
  9. {aioccl-2024.8.1 → aioccl-2024.8.3}/aioccl/device.py +0 -0
  10. {aioccl-2024.8.1 → aioccl-2024.8.3}/aioccl.egg-info/SOURCES.txt +0 -0
  11. {aioccl-2024.8.1 → aioccl-2024.8.3}/aioccl.egg-info/dependency_links.txt +0 -0
  12. {aioccl-2024.8.1 → aioccl-2024.8.3}/aioccl.egg-info/requires.txt +0 -0
  13. {aioccl-2024.8.1 → aioccl-2024.8.3}/aioccl.egg-info/top_level.txt +0 -0
  14. {aioccl-2024.8.1 → aioccl-2024.8.3}/setup.cfg +0 -0
{aioccl-2024.8.1 → aioccl-2024.8.3}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: aioccl
3
- Version: 2024.8.1
3
+ Version: 2024.8.3
4
4
  Summary: A Python library for CCL API server
5
5
  Home-page: https://github.com/fkiscd/aioccl
6
6
  Download-URL: https://github.com/fkiscd/aioccl
{aioccl-2024.8.1 → aioccl-2024.8.3}/aioccl/sensor.py RENAMED
@@ -38,7 +38,7 @@ class CCLSensor:
38
38
  def value(self):
39
39
  if self.sensor_type == CCLSensorTypes.CH_SENSOR_TYPE:
40
40
  return CCL_CH_SENSOR_TYPES.get(self._value)
41
- elif self.sensor_type == CCLSensorTypes.VOC:
41
+ elif self.sensor_type in CCL_LEVEL_SENSORS:
42
42
  return 'Lv ' + self._value
43
43
  return self._value
44
44
 
@@ -50,7 +50,7 @@ class CCLSensor:
50
50
  class CCLSensorPreset:
51
51
  name: str
52
52
  sensor_type: str
53
- compartment: str
53
+ compartment: str = None
54
54
  binary: bool = False
55
55
 
56
56
  class CCLSensorTypes(enum.Enum):
@@ -85,7 +85,7 @@ CCL_CH_SENSOR_TYPES: dict[str, str] = {
85
85
  '3': 'Pool',
86
86
  '4': 'Soil',
87
87
  }
88
-
88
+
89
89
  CCL_SENSORS: dict[str, CCLSensorPreset] = {
90
90
  # Main Sensors 12-34
91
91
  'abar': CCLSensorPreset('Air Pressure (Absolute)', CCLSensorTypes.PRESSURE),
@@ -105,20 +105,21 @@ CCL_SENSORS: dict[str, CCLSensorPreset] = {
105
105
  't1raindy': CCLSensorPreset('Rainfall: Daily', CCLSensorTypes.RAINFALL),
106
106
  't1rainwy': CCLSensorPreset('Rainfall: Weekly', CCLSensorTypes.RAINFALL),
107
107
  't1rainmth': CCLSensorPreset('Rainfall: Monthly', CCLSensorTypes.RAINFALL),
108
+ 't1rainyr': CCLSensorPreset('Rainfall: Yearly', CCLSensorTypes.RAINFALL),
108
109
  't1uvi': CCLSensorPreset('UV Index', CCLSensorTypes.UVI),
109
110
  't1wdir': CCLSensorPreset('Wind Direction', CCLSensorTypes.WIND_DIRECITON),
110
111
  't1wgust': CCLSensorPreset('Wind Gust', CCLSensorTypes.WIND_SPEED),
111
112
  't1ws': CCLSensorPreset('Wind Speed', CCLSensorTypes.WIND_SPEED),
112
113
  't1ws10mav': CCLSensorPreset('Wind Speed (10 mins AVG.)', CCLSensorTypes.WIND_SPEED),
113
114
  # Additional Sensors 35-77
114
- 't11co': CCLSensorPreset('Air quality: CO', CCLSensorTypes.CO, CCLDeviceCompartment.ADDITIONAL),
115
- 't10co2': CCLSensorPreset('Air quality: CO\u2082', CCLSensorTypes.CO2, CCLDeviceCompartment.ADDITIONAL),
116
- 't9hcho': CCLSensorPreset('Air quality: Formaldehyde', CCLSensorTypes.VOLATILE, CCLDeviceCompartment.ADDITIONAL),
117
- 't8pm10': CCLSensorPreset('Air quality: PM10', CCLSensorTypes.PM10, CCLDeviceCompartment.ADDITIONAL),
118
- 't8pm10ai': CCLSensorPreset('Air quality: PM10 AQI', CCLSensorTypes.AQI, CCLDeviceCompartment.ADDITIONAL),
119
- 't8pm25': CCLSensorPreset('Air quality: PM2.5', CCLSensorTypes.PM25, CCLDeviceCompartment.ADDITIONAL),
120
- 't8pm25ai': CCLSensorPreset('Air quality: PM2.5 AQI', CCLSensorTypes.AQI, CCLDeviceCompartment.ADDITIONAL),
121
- 't9voclv': CCLSensorPreset('Air quality: VOC Level', CCLSensorTypes.VOC, CCLDeviceCompartment.ADDITIONAL),
115
+ 't11co': CCLSensorPreset('Air Quality: CO', CCLSensorTypes.CO, CCLDeviceCompartment.ADDITIONAL),
116
+ 't10co2': CCLSensorPreset('Air Quality: CO\u2082', CCLSensorTypes.CO2, CCLDeviceCompartment.ADDITIONAL),
117
+ 't9hcho': CCLSensorPreset('Air Quality: Formaldehyde', CCLSensorTypes.VOLATILE, CCLDeviceCompartment.ADDITIONAL),
118
+ 't8pm10': CCLSensorPreset('Air Quality: PM10', CCLSensorTypes.PM10, CCLDeviceCompartment.ADDITIONAL),
119
+ 't8pm10ai': CCLSensorPreset('Air Quality: PM10 AQI', CCLSensorTypes.AQI, CCLDeviceCompartment.ADDITIONAL),
120
+ 't8pm25': CCLSensorPreset('Air Quality: PM2.5', CCLSensorTypes.PM25, CCLDeviceCompartment.ADDITIONAL),
121
+ 't8pm25ai': CCLSensorPreset('Air Quality: PM2.5 AQI', CCLSensorTypes.AQI, CCLDeviceCompartment.ADDITIONAL),
122
+ 't9voclv': CCLSensorPreset('Air Quality: VOC Level', CCLSensorTypes.VOC, CCLDeviceCompartment.ADDITIONAL),
122
123
  't234c1tem': CCLSensorPreset('CH1 Temperature', CCLSensorTypes.TEMPERATURE, CCLDeviceCompartment.ADDITIONAL),
123
124
  't234c1hum': CCLSensorPreset('CH1 Humidity', CCLSensorTypes.HUMIDITY, CCLDeviceCompartment.ADDITIONAL),
124
125
  't234c1tp': CCLSensorPreset('CH1 Type', CCLSensorTypes.CH_SENSOR_TYPE, CCLDeviceCompartment.ADDITIONAL),
@@ -140,7 +141,7 @@ CCL_SENSORS: dict[str, CCLSensorPreset] = {
140
141
  't234c7tem': CCLSensorPreset('CH7 Temperature', CCLSensorTypes.TEMPERATURE, CCLDeviceCompartment.ADDITIONAL),
141
142
  't234c7hum': CCLSensorPreset('CH7 Humidity', CCLSensorTypes.HUMIDITY, CCLDeviceCompartment.ADDITIONAL),
142
143
  't234c7tp': CCLSensorPreset('CH7 Type', CCLSensorTypes.CH_SENSOR_TYPE, CCLDeviceCompartment.ADDITIONAL),
143
- 't6c1wls': CCLSensorPreset('Leakage CH1', CCLSensorTypes.LEAKAGE, CCLDeviceCompartment.ADDITIONAL, True),
144
+ 't6c1wls': CCLSensorPreset('Leakage CH1', CCLSensorTypes.LEAKAGE, CCLDeviceCompartment.ADDITIONAL, True),
144
145
  # Status 78-119
145
146
  't234c1bat': CCLSensorPreset('Battery: CH1', CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True),
146
147
  't234c2bat': CCLSensorPreset('Battery: CH2', CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True),
@@ -170,3 +171,5 @@ CCL_SENSORS: dict[str, CCLSensorPreset] = {
170
171
  't1cn': CCLSensorPreset('Connection: Main Sensor Array', CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS, True),
171
172
  't8cn': CCLSensorPreset('Connection: PM2.5/10', CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS, True),
172
173
  }
174
+
175
+ CCL_LEVEL_SENSORS = (CCLSensorTypes.VOC, CCLSensorTypes.BATTERY)
{aioccl-2024.8.1 → aioccl-2024.8.3}/aioccl/server.py RENAMED
@@ -81,7 +81,7 @@ class CCLServer:
81
81
  finally:
82
82
  return web.Response(status=_status, text=_text)
83
83
 
84
- #app = web.Application()
84
+ app = web.Application()
85
85
 
86
86
  cors = aiohttp_cors.setup(app)
87
87
 
{aioccl-2024.8.1 → aioccl-2024.8.3}/aioccl.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: aioccl
3
- Version: 2024.8.1
3
+ Version: 2024.8.3
4
4
  Summary: A Python library for CCL API server
5
5
  Home-page: https://github.com/fkiscd/aioccl
6
6
  Download-URL: https://github.com/fkiscd/aioccl
{aioccl-2024.8.1 → aioccl-2024.8.3}/setup.py RENAMED
@@ -1,7 +1,7 @@
1
1
  from pathlib import Path
2
2
  from setuptools import find_packages, setup
3
3
 
4
- VERSION = "2024.8.1"
4
+ VERSION = "2024.8.3"
5
5
 
6
6
  ROOT_DIR = Path(__file__).parent.resolve()
7
7
 
{aioccl-2024.8.1 → aioccl-2024.8.3}/LICENSE RENAMED
File without changes
{aioccl-2024.8.1 → aioccl-2024.8.3}/README.md RENAMED
File without changes
{aioccl-2024.8.1 → aioccl-2024.8.3}/aioccl/__init__.py RENAMED
File without changes
{aioccl-2024.8.1 → aioccl-2024.8.3}/aioccl/device.py RENAMED
File without changes
{aioccl-2024.8.1 → aioccl-2024.8.3}/setup.cfg RENAMED
File without changes