src/pyfroniusreg/froniusreg.py

@@ -30,23 +30,17 @@ class DataType():
 
 # helper functions for DataType constructors
 def decode_string8(decoder):
-    try:
+    return str(decoder.decode_string(8).decode('utf-8'))
-        return str(decoder.decode_string(8).decode('utf-8'))
-    except UnicodeDecodeError:
-        return decoder.decode_string(8)
 
 def decode_string16(decoder):
     try:
         return str(decoder.decode_string(16).decode('utf-8'))
     except UnicodeDecodeError:
-        return decoder.decode_string(16)
+        return str(decoder.decode_string(16))
     
 def decode_string32(decoder):
-    try:
+    return str(decoder.decode_string(32).decode('utf-8'))
-        return str(decoder.decode_string(32).decode('utf-8'))
+
-    except UnicodeDecodeError:
-        return decoder.decode_string(32)
-    
 def encode_16bit_int(encoder, value):
     return encoder.add_16bit_int(int(value))
 

src/pyfroniusreg/gen24_registers.py

@@ -16,9 +16,6 @@ Vr = froniusreg.FroniusReg(40045, froniusreg.string8, 1, "SW version")
 SN = froniusreg.FroniusReg(40068, froniusreg.string16, 1, "Serial Number")
 DA = froniusreg.FroniusReg(40069, froniusreg.uint16, 1, "Modbus Device Address")
 
-InputID = froniusreg.FroniusReg(40304, froniusreg.uint16, 1, "Input ID")
-InputIDString = froniusreg.FroniusReg(40305, froniusreg.string8, 1, "Input ID String")
-
 OutWRte = froniusreg.FroniusReg(40366, froniusreg.int16, 1, "DischargeRate")
 InWRte = froniusreg.FroniusReg(40367,  froniusreg.int16, 1, "ChargeRate")
 WRteSF = froniusreg.FroniusReg(40379, froniusreg.int16, 1, "ScalingFactor for storage Watts")

tests/test_regs.py

@@ -31,10 +31,9 @@ class TestRead(unittest.TestCase):
         Md = gen24_registers.Md.getValue(fronius1)
         assert Md == "Primo GEN24 5.0\x00"
 
-    # def test_read_sn(self):
+    def test_read_sn(self):
-        # This doesn't seem to return anything useful
+        SN = gen24_registers.SN.getValue(fronius1)
-        # SN = gen24_registers.SN.getValue(fronius1)
+        assert SN == "12345567"
-        # assert SN == "12345567"
 
     def test_write_direct(self):
         current = gen24_registers.OutWRte.getValue(fronius1)