From 496362dd21c9f3aac32aaa1f042502a1d03c7666 Mon Sep 17 00:00:00 2001
From: bohdan-s <bohdan-s@users.noreply.github.com>
Date: Tue, 13 Dec 2022 20:47:33 +1100
Subject: [PATCH] Fix type, Serial on initial run or lvl 3

---
 SunGather/sungather.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/SunGather/sungather.py b/SunGather/sungather.py
index d749ebc..a169f86 100644
--- a/SunGather/sungather.py
+++ b/SunGather/sungather.py
@@ -27,7 +27,7 @@ class SungrowInverter():
         self.inverter_config = {
             "slave":            config_inverter.get('slave'),
             "model":            config_inverter.get('model'),
-            "serial":            config_inverter.get('serial'),
+            "serial":           config_inverter.get('serial'),
             "level":            config_inverter.get('level'),
             "use_local_time":   config_inverter.get('use_local_time'),
             "smart_meter":      config_inverter.get('smart_meter'),
@@ -112,22 +112,22 @@ class SungrowInverter():
                     self.registers.pop()
                     break
 
-        if self.inverter_config.get('serial'):
-            logging.info(f"Bypassing Serial Detection, Using config: {self.inverter_config.get('serial')}")
+        if self.inverter_config.get('serial_number'):
+            logging.info(f"Bypassing Serial Detection, Using config: {self.inverter_config.get('serial_number')}")
         else:
-            # Load just the register to detect model, then we can load the rest of registers based on returned model
+            # Load just the register to detect serial number, then we can load the rest of registers based on returned model
             for register in registersfile['registers'][0]['read']:
-                if register.get('name') == "serial":
+                if register.get('name') == "serial_number":
                     register['type'] = "read"
                     self.registers.append(register)
-                    if self.load_registers(register['type'], register['address'] -1, 5): # Needs to be address -1
-                        if isinstance(self.latest_scrape.get('serial'),int):
-                            logging.warning(f"Unknown Type Code Detected: {self.latest_scrape.get('serial')}")
+                    if self.load_registers(register['type'], register['address'] -1, 10): # Needs to be address -1
+                        if isinstance(self.latest_scrape.get('serial_number'),int):
+                            logging.warning(f"Unknown Type Code Detected: {self.latest_scrape.get('serial_number')}")
                         else:
-                            self.inverter_config['model'] = self.latest_scrape.get('serial')
-                            logging.info(f"Detected Serial: {self.inverter_config.get('serial')}")
+                            self.inverter_config['serial_number'] = self.latest_scrape.get('serial_number')
+                            logging.info(f"Detected Serial: {self.inverter_config.get('serial_number')}")
                     else:
-                        logging.info(f'Serial detection failed, please set model in config.py')
+                        logging.info(f'Serial detection failed, please set serial number in config.py')
                     self.registers.pop()
                     break