aioccl 2024.9.5__py3-none-any.whl → 2024.9.6__py3-none-any.whl

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 (7) hide show
  1. aioccl/sensor.py +8 -11
  2. {aioccl-2024.9.5.dist-info → aioccl-2024.9.6.dist-info}/METADATA +1 -1
  3. aioccl-2024.9.6.dist-info/RECORD +9 -0
  4. {aioccl-2024.9.5.dist-info → aioccl-2024.9.6.dist-info}/WHEEL +1 -1
  5. aioccl-2024.9.5.dist-info/RECORD +0 -9
  6. {aioccl-2024.9.5.dist-info → aioccl-2024.9.6.dist-info}/LICENSE +0 -0
  7. {aioccl-2024.9.5.dist-info → aioccl-2024.9.6.dist-info}/top_level.txt +0 -0
aioccl/sensor.py CHANGED
@@ -39,8 +39,6 @@ class CCLSensor:
39
39
  def value(self) -> None | str | int | float:
40
40
  if self.sensor_type.name in CCL_SENSOR_VALUES:
41
41
  return CCL_SENSOR_VALUES[self.sensor_type.name].get(self._value)
42
- elif self.sensor_type in CCL_LEVEL_SENSORS:
43
- return 'Lv ' + str(self._value)
44
42
  elif self.sensor_type == CCLSensorTypes.BATTERY_BINARY:
45
43
  try:
46
44
  return int(self._value) - 1
@@ -85,6 +83,7 @@ class CCLSensorTypes(enum.Enum):
85
83
  LIGHTNING_DISTANCE = 22
86
84
  LIGHTNING_DURATION = 23
87
85
  LIGHTNING_FREQUENCY = 24
86
+ BATTERY_VOLTAGE = 25
88
87
 
89
88
  class CCLDeviceCompartment(enum.Enum):
90
89
  MAIN = 'Console and Sensor Array'
@@ -103,8 +102,6 @@ CCL_SENSOR_VALUES: dict[str, dict[str, str]] = {
103
102
  }
104
103
  }
105
104
 
106
- CCL_LEVEL_SENSORS = (CCLSensorTypes.VOC, CCLSensorTypes.BATTERY)
107
-
108
105
  CCL_SENSORS: dict[str, CCLSensorPreset] = {
109
106
  # Main Sensors 12-34
110
107
  'abar': CCLSensorPreset('Air Pressure (Absolute)', CCLSensorTypes.PRESSURE, CCLDeviceCompartment.MAIN),
@@ -168,7 +165,6 @@ CCL_SENSORS: dict[str, CCLSensorPreset] = {
168
165
  't6c6wls': CCLSensorPreset('Leakage CH6', CCLSensorTypes.LEAKAGE, CCLDeviceCompartment.OTHER),
169
166
  't6c7wls': CCLSensorPreset('Leakage CH7', CCLSensorTypes.LEAKAGE, CCLDeviceCompartment.OTHER),
170
167
  't5lskm': CCLSensorPreset('Lightning Distance', CCLSensorTypes.LIGHTNING_DISTANCE, CCLDeviceCompartment.OTHER),
171
- 't5lst': CCLSensorPreset('Lightning: Last Strike', CCLSensorTypes.LIGHTNING_DURATION, CCLDeviceCompartment.OTHER),
172
168
  't5lsf': CCLSensorPreset('Lightning: Past 60 mins Strikes', CCLSensorTypes.LIGHTNING_FREQUENCY, CCLDeviceCompartment.OTHER),
173
169
  't5ls30mtc': CCLSensorPreset('Lightning: Strikes in 30 mins', CCLSensorTypes.LIGHTNING_FREQUENCY, CCLDeviceCompartment.OTHER),
174
170
  't5ls5mtc': CCLSensorPreset('Lightning: Strikes in 5 mins', CCLSensorTypes.LIGHTNING_FREQUENCY, CCLDeviceCompartment.OTHER),
@@ -183,10 +179,10 @@ CCL_SENSORS: dict[str, CCLSensorPreset] = {
183
179
  't234c5bat': CCLSensorPreset('Battery: CH5', CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True),
184
180
  't234c6bat': CCLSensorPreset('Battery: CH6', CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True),
185
181
  't234c7bat': CCLSensorPreset('Battery: CH7', CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True),
186
- 't11bat': CCLSensorPreset('Battery: CO', CCLSensorTypes.BATTERY, CCLDeviceCompartment.STATUS),
187
- 't10bat': CCLSensorPreset('Battery: CO\u2082', CCLSensorTypes.BATTERY, CCLDeviceCompartment.STATUS),
182
+ 't11bat': CCLSensorPreset('Battery Level: CO', CCLSensorTypes.BATTERY, CCLDeviceCompartment.STATUS),
183
+ 't10bat': CCLSensorPreset('Battery Level: CO\u2082', CCLSensorTypes.BATTERY, CCLDeviceCompartment.STATUS),
188
184
  'inbat': CCLSensorPreset('Battery: Console', CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True),
189
- 't9bat': CCLSensorPreset('Battery: HCHO/VOC', CCLSensorTypes.BATTERY, CCLDeviceCompartment.STATUS),
185
+ 't9bat': CCLSensorPreset('Battery Level: HCHO/VOC', CCLSensorTypes.BATTERY, CCLDeviceCompartment.STATUS),
190
186
  't6c1bat': CCLSensorPreset('Battery: Leakage CH1', CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True),
191
187
  't6c2bat': CCLSensorPreset('Battery: Leakage CH2', CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True),
192
188
  't6c3bat': CCLSensorPreset('Battery: Leakage CH3', CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True),
@@ -195,8 +191,9 @@ CCL_SENSORS: dict[str, CCLSensorPreset] = {
195
191
  't6c6bat': CCLSensorPreset('Battery: Leakage CH6', CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True),
196
192
  't6c7bat': CCLSensorPreset('Battery: Leakage CH7', CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True),
197
193
  't5lsbat': CCLSensorPreset('Battery: Lightning Sensor', CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True),
198
- 't1bat': CCLSensorPreset('Battery: Main Sensor Array', CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True),
199
- 't8bat': CCLSensorPreset('Battery: PM2.5/10', CCLSensorTypes.BATTERY, CCLDeviceCompartment.STATUS),
194
+ 't1bat': CCLSensorPreset('Battery: Sensor Array', CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True),
195
+ 't1batvt': CCLSensorPreset('Battery Voltage: Sensor Array', CCLSensorTypes.BATTERY_VOLTAGE, CCLDeviceCompartment.STATUS, True),
196
+ 't8bat': CCLSensorPreset('Battery Level: PM2.5/10', CCLSensorTypes.BATTERY, CCLDeviceCompartment.STATUS),
200
197
  't234c1cn': CCLSensorPreset('Connection: CH1', CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS, True),
201
198
  't234c2cn': CCLSensorPreset('Connection: CH2', CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS, True),
202
199
  't234c3cn': CCLSensorPreset('Connection: CH3', CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS, True),
@@ -216,6 +213,6 @@ CCL_SENSORS: dict[str, CCLSensorPreset] = {
216
213
  't10cn': CCLSensorPreset('Connection: CO\u2082', CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS, True),
217
214
  't9cn': CCLSensorPreset('Connection: HCHO/VOC', CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS, True),
218
215
  't6c1cn': CCLSensorPreset('Connection: Leakage CH1', CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS, True),
219
- 't1cn': CCLSensorPreset('Connection: Main Sensor Array', CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS, True),
216
+ 't1cn': CCLSensorPreset('Connection: Sensor Array', CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS, True),
220
217
  't8cn': CCLSensorPreset('Connection: PM2.5/10', CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS, True),
221
218
  }
{aioccl-2024.9.5.dist-info → aioccl-2024.9.6.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: aioccl
3
- Version: 2024.9.5
3
+ Version: 2024.9.6
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.9.6.dist-info/RECORD ADDED
@@ -0,0 +1,9 @@
1
+ aioccl/__init__.py,sha256=iL1OC2F_rf3qkswi-bO8Y_uj2-lf284LCnyxwqdLUU8,137
2
+ aioccl/device.py,sha256=ALvK7qvGlG0duS1axPz7uQj85vHW1iyzezvX2bD2Zuc,4994
3
+ aioccl/sensor.py,sha256=VgyYko8npEfEO4kRyhsKpP7PA47gZY_6B4kdJpabBBY,14531
4
+ aioccl/server.py,sha256=-ZDii20CLqj4_jqVVqRMlnvg-CCtJiZjuMMDamem0DE,3717
5
+ aioccl-2024.9.6.dist-info/LICENSE,sha256=PBRsTHchx7o0TQ2R2ktEAfFmn1iNHTxcOP_xaeuSAuo,11349
6
+ aioccl-2024.9.6.dist-info/METADATA,sha256=T2Ub--gV09aYyQdcuwNFQr3yfVeUcQ2Qp1C2ZBT9QUw,769
7
+ aioccl-2024.9.6.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
8
+ aioccl-2024.9.6.dist-info/top_level.txt,sha256=-xIJfyfXTaW_EH7XCIHyxjSSSwjLmawa2qhsrHZH1vA,7
9
+ aioccl-2024.9.6.dist-info/RECORD,,
{aioccl-2024.9.5.dist-info → aioccl-2024.9.6.dist-info}/WHEEL RENAMED
@@ -1,5 +1,5 @@
1
1
  Wheel-Version: 1.0
2
- Generator: setuptools (74.1.2)
2
+ Generator: setuptools (75.1.0)
3
3
  Root-Is-Purelib: true
4
4
  Tag: py3-none-any
5
5
 
aioccl-2024.9.5.dist-info/RECORD DELETED
@@ -1,9 +0,0 @@
1
- aioccl/__init__.py,sha256=iL1OC2F_rf3qkswi-bO8Y_uj2-lf284LCnyxwqdLUU8,137
2
- aioccl/device.py,sha256=ALvK7qvGlG0duS1axPz7uQj85vHW1iyzezvX2bD2Zuc,4994
3
- aioccl/sensor.py,sha256=euef6f3_WV2LuE_cocV5PWR1UoJUeXjqbe8OnlioSDU,14641
4
- aioccl/server.py,sha256=-ZDii20CLqj4_jqVVqRMlnvg-CCtJiZjuMMDamem0DE,3717
5
- aioccl-2024.9.5.dist-info/LICENSE,sha256=PBRsTHchx7o0TQ2R2ktEAfFmn1iNHTxcOP_xaeuSAuo,11349
6
- aioccl-2024.9.5.dist-info/METADATA,sha256=aEYNvvilsQ6sATtWSuSEDgVps5VOu6i9BIrZqgAirGw,769
7
- aioccl-2024.9.5.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
8
- aioccl-2024.9.5.dist-info/top_level.txt,sha256=-xIJfyfXTaW_EH7XCIHyxjSSSwjLmawa2qhsrHZH1vA,7
9
- aioccl-2024.9.5.dist-info/RECORD,,