Merge pull request #251 from plugwise/p1-3ph-II

Support 3-phase measurements

Author: bouwew

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+# v0.26.0: Smile P1: support 3-phase measurements
+
 # v0.25.14: Improve, bugfix
 - Anna+Elga: final solution for https://github.com/plugwise/plugwise-beta/issues/320
 - Related to https://github.com/home-assistant/core/issues/83068: handle actuator_functionality or sensor depending on which one is present

plugwise/__init__.py

@@ -1,6 +1,6 @@
 """Plugwise module."""
 
-__version__ = "0.25.14"
+__version__ = "0.26.0"
 
 from plugwise.smile import Smile
 from plugwise.stick import Stick

plugwise/constants.py

@@ -15,6 +15,7 @@
 ATTR_STATE_CLASS: Final = "state_class"
 ATTR_UNIT_OF_MEASUREMENT: Final = "unit_of_measurement"
 DEGREE: Final = "°"
+ELECTRIC_POTENTIAL_VOLT: Final = "V"
 ENERGY_KILO_WATT_HOUR: Final = "kWh"
 ENERGY_WATT_HOUR: Final = "Wh"
 PERCENTAGE: Final = "%"
@@ -29,7 +30,7 @@
 VOLUME_CUBIC_METERS: Final = "m³"
 VOLUME_CUBIC_METERS_PER_HOUR: Final = "m³/h"
 
-### Stick constants ###
+# --- Stick constants ---
 
 UTF8_DECODE: Final = "utf-8"
 
@@ -362,7 +363,7 @@
 }
 
 
-### Smile constants ###
+# --- Smile constants ---
 
 ACTUATOR_CLASSES: Final[tuple[str, ...]] = (
     "heater_central",
@@ -444,7 +445,16 @@
 P1_MEASUREMENTS: Final[dict[str, UOM]] = {
     "electricity_consumed": UOM(POWER_WATT),
     "electricity_produced": UOM(POWER_WATT),
+    "electricity_phase_one_consumed": UOM(POWER_WATT),
+    "electricity_phase_two_consumed": UOM(POWER_WATT),
+    "electricity_phase_three_consumed": UOM(POWER_WATT),
+    "electricity_phase_one_produced": UOM(POWER_WATT),
+    "electricity_phase_two_produced": UOM(POWER_WATT),
+    "electricity_phase_three_produced": UOM(POWER_WATT),
     "gas_consumed": UOM(VOLUME_CUBIC_METERS),
+    "voltage_phase_one": UOM(ELECTRIC_POTENTIAL_VOLT),
+    "voltage_phase_two": UOM(ELECTRIC_POTENTIAL_VOLT),
+    "voltage_phase_three": UOM(ELECTRIC_POTENTIAL_VOLT),
 }
 # Thermostat and Plug/Stretch related measurements
 # Excluded:
@@ -559,6 +569,12 @@
     "electricity_consumed_peak_interval",
     "electricity_consumed_peak_point",
     "electricity_consumed_point",
+    "electricity_phase_one_consumed",
+    "electricity_phase_two_consumed",
+    "electricity_phase_three_consumed",
+    "electricity_phase_one_produced",
+    "electricity_phase_two_produced",
+    "electricity_phase_three_produced",
     "electricity_produced",
     "electricity_produced_interval",
     "electricity_produced_off_peak_cumulative",
@@ -585,6 +601,9 @@
     "setpoint_low",
     "temperature_difference",
     "valve_position",
+    "voltage_phase_one",
+    "voltage_phase_two",
+    "voltage_phase_three",
     "water_pressure",
     "water_temperature",
 )
@@ -664,6 +683,12 @@ class SmileSensors(TypedDict, total=False):
     electricity_consumed_peak_interval: int
     electricity_consumed_peak_point: int
     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_produced_off_peak_cumulative: float
@@ -690,6 +715,9 @@ class SmileSensors(TypedDict, total=False):
     setpoint_low: float
     temperature_difference: float
     valve_position: float
+    voltage_phase_one: float
+    voltage_phase_two: float
+    voltage_phase_three: float
     water_pressure: float
     water_temperature: float
 

plugwise/exceptions.py

@@ -2,49 +2,49 @@
 
 
 class PlugwiseException(Exception):
-    """Base error class for this Plugwise library"""
+    """Base error class for this Plugwise library."""
 
 
-### Stick exceptions ###
+# --- Stick exceptions ---
 
 
 class PortError(PlugwiseException):
-    """Connection to USBstick failed"""
+    """Connection to USBstick failed."""
 
 
 class StickInitError(PlugwiseException):
-    """Initialization of USBstick failed"""
+    """Initialization of USBstick failed."""
 
 
 class NetworkDown(PlugwiseException):
-    """Zigbee network not online"""
+    """Zigbee network not online."""
 
 
 class CirclePlusError(PlugwiseException):
-    """Connection to Circle+ node failed"""
+    """Connection to Circle+ node failed."""
 
 
 class InvalidMessageLength(PlugwiseException):
-    """Invalid message length"""
+    """Invalid message length."""
 
 
 class InvalidMessageHeader(PlugwiseException):
-    """Invalid message header"""
+    """Invalid message header."""
 
 
 class InvalidMessageFooter(PlugwiseException):
-    """Invalid message footer"""
+    """Invalid message footer."""
 
 
 class InvalidMessageChecksum(PlugwiseException):
-    """Invalid data checksum"""
+    """Invalid data checksum."""
 
 
 class TimeoutException(PlugwiseException):
-    """Timeout expired while waiting for response from node"""
+    """Timeout expired while waiting for response from node."""
 
 
-### Smile exceptions ###
+# --- Smile exceptions ---
 
 
 class ConnectionFailedError(PlugwiseException):