plugwise 1.5.1__py3-none-any.whl → 1.5.1a3__py3-none-any.whl

plugwise/constants.py

@@ -123,7 +123,7 @@ P1_LEGACY_MEASUREMENTS: Final[dict[str, UOM]] = {
 # radiator_valve: 'uncorrected_temperature', 'temperature_offset'
 
 DEVICE_MEASUREMENTS: Final[dict[str, DATA | UOM]] = {
-    "humidity": UOM(NONE),  # Specific for a Jip
+    "humidity": UOM(PERCENTAGE),  # Specific for a Jip
     "illuminance": UOM(UNIT_LUMEN),  # Specific for an Anna
     "temperature": UOM(TEMP_CELSIUS),  # HA Core thermostat current_temperature
     "thermostat": DATA("setpoint", TEMP_CELSIUS),  # HA Core thermostat setpoint
@@ -425,44 +425,44 @@ class SmileBinarySensors(TypedDict, total=False):
 class SmileSensors(TypedDict, total=False):
     """Smile Sensors class."""
 
-    battery: int
+    battery: float
     cooling_activation_outdoor_temperature: float
     cooling_deactivation_threshold: float
     dhw_temperature: float
     domestic_hot_water_setpoint: float
     temperature: float
-    electricity_consumed: float
-    electricity_consumed_interval: float
+    electricity_consumed: int
+    electricity_consumed_interval:int
     electricity_consumed_off_peak_cumulative: float
-    electricity_consumed_off_peak_interval: float
-    electricity_consumed_off_peak_point: float
+    electricity_consumed_off_peak_interval: int
+    electricity_consumed_off_peak_point: int
     electricity_consumed_peak_cumulative: float
-    electricity_consumed_peak_interval: float
-    electricity_consumed_peak_point: float
-    electricity_consumed_point: float
-    electricity_phase_one_consumed: float
-    electricity_phase_two_consumed: float
-    electricity_phase_three_consumed: float
-    electricity_phase_one_produced: float
-    electricity_phase_two_produced: float
-    electricity_phase_three_produced: float
-    electricity_produced: float
-    electricity_produced_interval: float
+    electricity_consumed_peak_interval: int
+    electricity_consumed_peak_point: int
+    electricity_consumed_point: int
+    electricity_phase_one_consumed: int
+    electricity_phase_two_consumed: int
+    electricity_phase_three_consumed: int
+    electricity_phase_one_produced: int
+    electricity_phase_two_produced: int
+    electricity_phase_three_produced: int
+    electricity_produced: int
+    electricity_produced_interval: int
     electricity_produced_off_peak_cumulative: float
-    electricity_produced_off_peak_interval: float
-    electricity_produced_off_peak_point: float
+    electricity_produced_off_peak_interval: int
+    electricity_produced_off_peak_point: int
     electricity_produced_peak_cumulative: float
-    electricity_produced_peak_interval: float
-    electricity_produced_peak_point: float
-    electricity_produced_point: float
+    electricity_produced_peak_interval: int
+    electricity_produced_peak_point: int
+    electricity_produced_point: int
     gas_consumed_cumulative: float
     gas_consumed_interval: float
     humidity: float
     illuminance: float
     intended_boiler_temperature: float
-    modulation_level: int
+    modulation_level: float
     net_electricity_cumulative: float
-    net_electricity_point: float
+    net_electricity_point: int
     outdoor_air_temperature: float
     outdoor_temperature: float
     return_temperature: float
@@ -470,7 +470,7 @@ class SmileSensors(TypedDict, total=False):
     setpoint_high: float
     setpoint_low: float
     temperature_difference: float
-    valve_position: int
+    valve_position: float
     voltage_phase_one: float
     voltage_phase_two: float
     voltage_phase_three: float

plugwise/util.py

@@ -173,8 +173,10 @@ def format_measure(measure: str, unit: str) -> float | int:
             result = float(f"{round(float_measure, 1):.1f}")
         elif abs(float_measure) < 10:
             result = float(f"{round(float_measure, 2):.2f}")
-        elif abs(float_measure) >= 10:
+        elif abs(float_measure) >= 10 and abs(float_measure) < 100:
             result = float(f"{round(float_measure, 1):.1f}")
+        elif abs(float_measure) >= 100:
+            result = int(round(float_measure))
 
     return result
 

{plugwise-1.5.1.dist-info → plugwise-1.5.1a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugwise
-Version: 1.5.1
+Version: 1.5.1a3
 Summary: Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3.
 Home-page: https://github.com/plugwise/python-plugwise
 Author: Plugwise device owners

{plugwise-1.5.1.dist-info → plugwise-1.5.1a3.dist-info}/RECORD

@@ -1,17 +1,17 @@
 plugwise/__init__.py,sha256=_AYvIt5rOBksqxp5Lrr7iv11i3mXXJpEQ6Q40pqtOPk,17147
 plugwise/common.py,sha256=WltDqYlW5D3KqIcm5U_gVY4izLZSk_Uk-MEJl6RDNbs,12592
-plugwise/constants.py,sha256=al6wKFQbcHftkwb4pGLOxfNcV7m1C9HnQZLaKvjSJPs,16756
+plugwise/constants.py,sha256=iGOBzNok11T5dk-AFVARwNR6qmfLQoOm2YWs5IG2u2o,16725
 plugwise/data.py,sha256=SgfwTGKwtZnXI8KGePTCoMODn8GQLq4YkKwf697--ds,10782
 plugwise/exceptions.py,sha256=Ce-tO9uNsMB-8FP6VAxBvsHNJ-NIM9F0onUZOdZI4Ys,1110
 plugwise/helper.py,sha256=nJ3wUZuQqJRhjjxk5dm5dGyQv1BK8KKvs5s7LQPtAEg,44386
 plugwise/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 plugwise/smile.py,sha256=BALKDMY730C-vHCnOadnaM9ezv0iIEnu-V-BsHJRewY,18729
-plugwise/util.py,sha256=WAhcQEvLw7ku-3VhKWdJR5lnO7Zodj5-0cG-dmDflnk,8065
+plugwise/util.py,sha256=Ls9ULWVH6vTv65ixkoWzGRmRCZ5AJ36gUWxzAiUJ-Rw,8181
 plugwise/legacy/data.py,sha256=8QRzW7TlOGTs1UdMRPMm2PZTJxYnmF3ARnW8_STV65A,3072
 plugwise/legacy/helper.py,sha256=HI9EvtTWfzKH5nX4G-YtLpn9Qvi50OLMRRIaN5v7rqU,18358
 plugwise/legacy/smile.py,sha256=E_Zc1muzylyRMeYYbP4QhGBUQf_KaUUnbPAuIhH8WxY,11208
-plugwise-1.5.1.dist-info/LICENSE,sha256=mL22BjmXtg_wnoDnnaqps5_Bg_VGj_yHueX5lsKwbCc,1144
-plugwise-1.5.1.dist-info/METADATA,sha256=EwcDfmPd80lqQzKJ6Zj6zZrUwWh5WXBKNZN87Fup_z8,9097
-plugwise-1.5.1.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-plugwise-1.5.1.dist-info/top_level.txt,sha256=MYOmktMFf8ZmX6_OE1y9MoCZFfY-L8DA0F2tA2IvE4s,9
-plugwise-1.5.1.dist-info/RECORD,,
+plugwise-1.5.1a3.dist-info/LICENSE,sha256=mL22BjmXtg_wnoDnnaqps5_Bg_VGj_yHueX5lsKwbCc,1144
+plugwise-1.5.1a3.dist-info/METADATA,sha256=NseSe1bvvUEFR1qE9R-RbtKOcX3a_V0o_GCyBQzbEdw,9099
+plugwise-1.5.1a3.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+plugwise-1.5.1a3.dist-info/top_level.txt,sha256=MYOmktMFf8ZmX6_OE1y9MoCZFfY-L8DA0F2tA2IvE4s,9
+plugwise-1.5.1a3.dist-info/RECORD,,

{plugwise-1.5.1.dist-info → plugwise-1.5.1a3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.5.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any