More fixes and improvements

Author: bouwew

plugwise_usb/__init__.py

@@ -212,6 +212,7 @@ async def set_accept_join_request(self, state: bool) -> bool:
 
     async def energy_reset_request(self, mac: str) -> bool:
         """Send an energy-reset request to a Node."""
+        _LOGGER.debug("Resetting energy logs for %s", mac)
         try:
             await self._network.energy_reset_request(mac)
         except (MessageError, NodeError) as exc:

plugwise_usb/messages/requests.py

@@ -764,7 +764,7 @@ def __init__(
         day_of_week = Int(dt.weekday(), 2)
         if reset:
             self._args += [
-                this_date,       
+                this_date,
                 LogAddr(0, 8, False),
                 this_time,
                 day_of_week,

plugwise_usb/network/__init__.py

@@ -13,6 +13,7 @@
 from ..api import NodeEvent, NodeType, PlugwiseNode, StickEvent
 from ..connection import StickController
 from ..constants import UTF8
+from ..helpers.util import validate_mac
 from ..exceptions import CacheError, MessageError, NodeError, StickError, StickTimeout
 from ..messages.requests import (
     CircleClockSetRequest,
@@ -546,6 +547,12 @@ async def allow_join_requests(self, state: bool) -> None:
 
     async def energy_reset_request(self, mac: str) -> None:
         """Send an energy-reset to a Node."""
+        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-resetting not supported for {self._nodes[mac].node_info.node_type.name}"
@@ -575,6 +582,12 @@ async def set_energy_intervals(
         Default: consumption = 60, production = 0.
         For logging energy in both directions set both to 60.
         """
+        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"Setting energy-intervals not supported for {self._nodes[mac].node_info.node_type.name}"