Implement inverter.py own logger / Python 3.9 retro-compatibility / R…

…estore .connected attribute (#35)
olivergregorius · Apr 3, 2024 · 99ef817 · 99ef817
1 parent 5c9634a
commit 99ef817
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 22 deletions.
diff --git a/sun2000_modbus/datatypes.py b/sun2000_modbus/datatypes.py
@@ -29,16 +29,15 @@ def decode_bitfield(value):
 
 
 def decode(value, data_type):
-    match data_type:
-        case DataType.STRING:
-            return decode_string(value)
-        case DataType.UINT16_BE | DataType.UINT32_BE:
-            return decode_uint_be(value)
-        case DataType.INT16_BE | DataType.INT32_BE:
-            return decode_int_be(value)
-        case DataType.BITFIELD16 | DataType.BITFIELD32:
-            return decode_bitfield(value)
-        case DataType.MULTIDATA:
-            return value
-        case _:
-            raise ValueError("Unknown register type")
+    if data_type == DataType.STRING:
+        return decode_string(value)
+    elif data_type == DataType.UINT16_BE or data_type == DataType.UINT32_BE:
+        return decode_uint_be(value)
+    elif data_type == DataType.INT16_BE or data_type == DataType.INT32_BE:
+        return decode_int_be(value)
+    elif data_type == DataType.BITFIELD16 or data_type == DataType.BITFIELD32:
+        return decode_bitfield(value)
+    elif data_type == DataType.MULTIDATA:
+        return value
+    else:
+        raise ValueError("Unknown register type")
diff --git a/sun2000_modbus/inverter.py b/sun2000_modbus/inverter.py
@@ -6,7 +6,12 @@
 
 from . import datatypes
 
-logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+logger.setLevel(logging.INFO)
+log_format = logging.Formatter('%(levelname)s:%(name)s:%(message)s')
+handler = logging.StreamHandler()
+handler.setFormatter(log_format)
+logger.addHandler(handler)
 
 
 class Sun2000:
@@ -20,10 +25,10 @@ def connect(self):
             self.inverter.connect()
             time.sleep(self.wait)
             if self.isConnected():
-                logging.info('Successfully connected to inverter')
+                logger.info('Successfully connected to inverter')
                 return True
             else:
-                logging.error('Connection to inverter failed')
+                logger.error('Connection to inverter failed')
                 return False
 
     def disconnect(self):
@@ -37,17 +42,21 @@ def isConnected(self):
         """Check if underlying tcp socket is open"""
         return self.inverter.is_socket_open()
 
+    @property
+    def connected(self):
+        return self.isConnected()
+
     def read_raw_value(self, register):
         if not self.isConnected():
             raise ValueError('Inverter is not connected')
 
         try:
             register_value = self.inverter.read_holding_registers(register.value.address, register.value.quantity, unit=self.unit)
             if type(register_value) == ModbusIOException:
-                logging.error("Inverter unit did not respond")
+                logger.error("Inverter unit did not respond")
                 raise register_value
         except ConnectionException:
-            logging.error("A connection error occurred")
+            logger.error("A connection error occurred")
             raise
 
         return datatypes.decode(register_value.encode()[1:], register.value.data_type)
@@ -60,11 +69,14 @@ def read(self, register):
         else:
             return raw_value / register.value.gain
 
-    def read_formatted(self, register):
+    def read_formatted(self, register, use_locale=False):
         value = self.read(register)
 
         if register.value.unit is not None:
-            return f'{value} {register.value.unit}'
+            if use_locale:
+                return f'{value:n} {register.value.unit}'
+            else:
+                return f'{value} {register.value.unit}'
         elif register.value.mapping is not None:
             return register.value.mapping.get(value, 'undefined')
         else:
@@ -86,10 +98,10 @@ def read_range(self, start_address, quantity=0, end_address=0):
         try:
             register_range_value = self.inverter.read_holding_registers(start_address, quantity, unit=self.unit)
             if type(register_range_value) == ModbusIOException:
-                logging.error("Inverter unit did not respond")
+                logger.error("Inverter unit did not respond")
                 raise register_range_value
         except ConnectionException:
-            logging.error("A connection error occurred")
+            logger.error("A connection error occurred")
             raise
 
         return datatypes.decode(register_range_value.encode()[1:], datatypes.DataType.MULTIDATA)