Merge pull request #765 from WillCodeForCats/code-quality

Group fields and data lists

Author: WillCodeForCats

custom_components/solaredge_modbus_multi/hub.py

@@ -780,14 +780,6 @@ async def init_device(self) -> None:
                 unit=self.inverter_unit_id, address=40000, rcount=69
             )
 
-            uint16_fields = [
-                "C_SunSpec_DID",
-                "C_SunSpec_Length",
-                "C_Device_address",
-            ]
-
-            uint16_data = inverter_data.registers[2:4] + [inverter_data.registers[68]]
-
             self.decoded_common = OrderedDict(
                 [
                     (
@@ -800,6 +792,12 @@ async def init_device(self) -> None:
                 ]
             )
 
+            uint16_fields = [
+                "C_SunSpec_DID",
+                "C_SunSpec_Length",
+                "C_Device_address",
+            ]
+            uint16_data = inverter_data.registers[2:4] + [inverter_data.registers[68]]
             self.decoded_common.update(
                 OrderedDict(
                     zip(
@@ -1007,15 +1005,13 @@ async def read_modbus_data(self) -> None:
                 "I_DC_Current",
                 "I_DC_Voltage",
             ]
-
             uint16_data = (
                 inverter_data.registers[0:6]
                 + inverter_data.registers[7:13]
                 + [inverter_data.registers[16]]
                 + inverter_data.registers[26:28]
                 + [inverter_data.registers[29]]
             )
-
             self.decoded_model = OrderedDict(
                 zip(
                     uint16_fields,
@@ -1051,15 +1047,13 @@ async def read_modbus_data(self) -> None:
                 "I_Status",
                 "I_Status_Vendor",
             ]
-
             int16_data = (
                 [inverter_data.registers[6]]
                 + inverter_data.registers[13:16]
                 + inverter_data.registers[17:24]
                 + [inverter_data.registers[28]]
                 + inverter_data.registers[30:40]
             )
-
             self.decoded_model.update(
                 OrderedDict(
                     zip(
@@ -1129,11 +1123,9 @@ async def read_modbus_data(self) -> None:
                         "mmppt_DCWH_SF",
                         "mmppt_TmsPer",
                     ]
-
                     int16_data = inverter_data.registers[0:4] + [
                         inverter_data.registers[7]
                     ]
-
                     self.decoded_model.update(
                         OrderedDict(
                             zip(