Add constants and use

Author: bouwew

plugwise_usb/__init__.py

@@ -14,6 +14,7 @@
 
 from .api import NodeEvent, PlugwiseNode, StickEvent
 from .connection import StickController
+from .const import DEFAULT_CONS_INTERVAL, NO_PRODUCTION_INTERVAL
 from .exceptions import MessageError, NodeError, StickError, SubscriptionError
 from .network import StickNetwork
 
@@ -219,7 +220,11 @@ async def energy_reset_request(self, mac: str) -> bool:
             raise NodeError(f"{exc}") from exc
 
         # Follow up by an energy-intervals (re)set
-        if (result := await self.set_energy_intervals(mac, 60, 0)):
+        if (
+            result := await self.set_energy_intervals(
+                mac, DEFAULT_CONS_INTERVAL, NO_PRODUCTION_INTERVAL
+            )
+        ):
             return result
 
         return False

plugwise_usb/constants.py

@@ -31,7 +31,7 @@
 
 # Max timeout in seconds
 # Stick responds with timeout messages within 10s.
-STICK_TIME_OUT: Final = 11 
+STICK_TIME_OUT: Final = 11
 # In bigger networks a response from a Node could take up a while, so lets use 15 seconds.
 NODE_TIME_OUT: Final = 15
 
@@ -99,3 +99,10 @@
     8: ("Celsius",),
     9: ("Stealth",),
 }
+
+# Energy logging intervals
+DEFAULT_CONS_INTERVAL: Final[int] = 60
+NO_PRODUCTION_INTERVAL: Final[int] = 0
+
+# Energy Node types
+ENERGY_NODE_TYPES: tuple[int] = (1, 2, 9)

plugwise_usb/network/__init__.py

@@ -12,9 +12,9 @@
 
 from ..api import NodeEvent, NodeType, PlugwiseNode, StickEvent
 from ..connection import StickController
-from ..constants import UTF8
-from ..helpers.util import validate_mac
+from ..constants import ENERGY_NODE_TYPES, UTF8
 from ..exceptions import CacheError, MessageError, NodeError, StickError, StickTimeout
+from ..helpers.util import validate_mac
 from ..messages.requests import (
     CircleClockSetRequest,
     CircleMeasureIntervalRequest,
@@ -34,8 +34,6 @@
 from ..nodes import get_plugwise_node
 from .registry import StickNetworkRegister
 
-ENERGY_NODE_TYPES: tuple[int] = (1, 2, 9)
-
 _LOGGER = logging.getLogger(__name__)
 # endregion
 
@@ -596,10 +594,10 @@ def _validate_energy_node(self, mac: str) -> None:
         """Validate node for energy operations."""
         if not validate_mac(mac):
             raise NodeError(f"MAC '{mac}' invalid")
-        
+
         if mac not in self._nodes:
             raise NodeError(f"Node {mac} not present in network")
-        
+
         if self._nodes[mac].node_info.node_type.value not in ENERGY_NODE_TYPES:
             raise NodeError(
                 f"Energy operations not supported for {self._nodes[mac].node_info.node_type.name}"