plugwise 1.5.1__tar.gz → 1.5.1a3__tar.gz

{plugwise-1.5.1 → plugwise-1.5.1a3}/PKG-INFO

@@ -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 → plugwise-1.5.1a3}/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-1.5.1 → plugwise-1.5.1a3}/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 → plugwise-1.5.1a3}/plugwise.egg-info/PKG-INFO

@@ -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 → plugwise-1.5.1a3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "plugwise"
-version         = "1.5.1"
+version         = "1.5.1a3"
 license         = {file = "LICENSE"}
 description     = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3."
 readme          = "README.md"