Return to existing code

Author: bouwew

plugwise_usb/nodes/circle.py

@@ -966,30 +966,23 @@ async def node_info_update(
             await self.save_cache()
 
         if self._current_log_address is not None and (
-            # This can be the case after an energy-reset
             self._current_log_address > node_info.current_logaddress_pointer
-            or (self._current_log_address < node_info.current_logaddress_pointer and self._current_log_address == 0)
+            or self._current_log_address == 1
         ):
+            # Rollover of log address
+            _LOGGER.debug(
+                "Rollover log address from %s into %s for node %s",
+                self._current_log_address,
+                node_info.current_logaddress_pointer,
+                self._mac_in_str,
+            )
 
-        if self._current_log_address is not None and (
-            # Change note: _curr_log_addr lags behind c_l_a__pointer so must be < instead of >
-            self._current_log_address < node_info.current_logaddress_pointer
-            # Change note: rollover is from 6015 to 0 so must be 6015 instead of 0
-            or self._current_log_address == 6015
-        ):
-            if self._current_log_address != node_info.current_logaddress_pointer:
-                # Rollover of log address
-                _LOGGER.debug(
-                    "Rollover log address from %s into %s for node %s",
-                    self._current_log_address,
-                    node_info.current_logaddress_pointer,
-                    self._mac_in_str,
-                )
-                self._current_log_address = node_info.current_logaddress_pointer
-                self._set_cache(
-                    CACHE_CURRENT_LOG_ADDRESS, node_info.current_logaddress_pointer
-                )
-                await self.save_cache()
+        if self._current_log_address != node_info.current_logaddress_pointer:
+            self._current_log_address = node_info.current_logaddress_pointer
+            self._set_cache(
+                CACHE_CURRENT_LOG_ADDRESS, node_info.current_logaddress_pointer
+            )
+            await self.save_cache()
 
         return self._node_info