wip

Author: Guzz-T

luxtronik/__init__.py

@@ -74,7 +74,7 @@ def __del__(self):
                 "Disconnected from Luxtronik heatpump %s:%s", self._host, self._port
             )
 
-    def _lock_and_connect(self, func):
+    def _lock_and_connect(func):
         """
         Decorator around various read/write functions to connect first.
 
@@ -84,7 +84,7 @@ def _lock_and_connect(self, func):
         Luxtronik controller, which seems unstable otherwise.
         """
 
-        def inner(*args, **kwargs):
+        def inner(self, *args, **kwargs):
             with self._lock:
                 is_none = self._socket is None
                 if is_none:
@@ -94,33 +94,35 @@ def inner(*args, **kwargs):
                     LOGGER.info(
                         "Connected to Luxtronik heat pump %s:%s", self._host, self._port
                     )
-                return func(*args, **kwargs)
+
+                return func(self, *args, **kwargs)
 
         return inner
 
+    @_lock_and_connect
     def read(self):
         """
         Read data from heat pump.
         All available data will be read from the heat pump.
         """
-        decorated_read = self._lock_and_connect(self._read)
-        return decorated_read()
+        return self._read()
 
+    @_lock_and_connect
     def read_parameters(self):
         """Read parameters from heat pump."""
-        decorated_read = self._lock_and_connect(self._read_parameters)
-        return decorated_read()
+        return self._read_parameters()
 
+    @_lock_and_connect
     def read_calculations(self):
         """Read calculations from heat pump."""
-        decorated_read = self._lock_and_connect(self._read_calculations)
-        return decorated_read()
+        return self._read_calculations()
 
+    @_lock_and_connect
     def read_visibilities(self):
         """Read visibilities from heat pump."""
-        decorated_read = self._lock_and_connect(self._read_visibilities)
-        return decorated_read()
+        return self._read_visibilities()
 
+    @_lock_and_connect
     def write(self, parameters):
         """
         Write parameter to heat pump.
@@ -130,8 +132,7 @@ def write(self, parameters):
                           to the heatpump before reading all available data
                           from the heat pump.
         """
-        decorated_write = self._lock_and_connect(self._write)
-        return decorated_write(parameters)
+        return self._write(parameters)
 
     def _read(self):
         parameters = self._read_parameters()