Swap first and second lookup

Author: rjpearce

sofar2mqtt-v2.py

@@ -71,6 +71,9 @@ def __init__(self, daemon, retry, retry_delay, write_retry, write_retry_delay, r
             exit(1)
 
         protocol_file = self.raw_data.get('protocol')
+        if not protocol_file:
+            logging.error(f"Protocol file is None. Exiting")
+            exit(1)
         if not os.path.isfile(protocol_file):
             logging.error(f"Protocol file {protocol_file} does not exist. Exiting")
             exit(1)
@@ -526,28 +529,31 @@ def determine_serial_number(self):
         """ Determine the serial number from the inverter """
         serial_number = None
 
-        # Try first location: 0x2001 ... 0x2007
+        # Try second location: 0x0445 ... 0x044B (14 digits)
         try:
-            serial_number = ''.join([self.read_register(register, 'string', False, 1) for register in range(0x2001, 0x2008)])
+            serial_number = ''.join([self.read_register(register, 'string', False, 1) for register in range(0x0445, 0x044C)])
             if serial_number:
-                logging.info(f"Serial number found at first location: {serial_number}")
+                logging.info(f"Serial number found at second location: {serial_number}")
                 return serial_number
         except Exception:
-            logging.debug("Failed to read serial number from first location")
+            logging.debug("Failed to read serial number from second location")
 
-        # Try second location: 0x0445 ... 0x044B (14 digits)
+        # Try first location: 0x2001 ... 0x2007
         try:
-            serial_number = ''.join([self.read_register(register, 'string', False, 1) for register in range(0x0445, 0x044C)])
+            serial_number = ''.join([self.read_register(register, 'string', False, 1) for register in range(0x2001, 0x2008)])
             if serial_number:
-                logging.info(f"Serial number found at second location: {serial_number}")
+                logging.info(f"Serial number found at first location: {serial_number}")
                 return serial_number
         except Exception:
-            logging.debug("Failed to read serial number from second location")
+            logging.debug("Failed to read serial number from first location")
+
 
         # Try third location: 0x0445 ... 0x044C and 0x0470...0x0471 (20 digits)
         try:
             serial_number_part1 = ''.join([self.read_register(register, 'string', False, 1) for register in range(0x0445, 0x044C)])
             serial_number_part2 = ''.join([self.read_register(register, 'string', False, 1) for register in range(0x0470, 0x0472)])
+            logging.info(serial_number_part1)
+            logging.info(serial_number_part2)
             if serial_number_part2 and int(serial_number_part2) != 0:
                 serial_number = serial_number_part1 + serial_number_part2
                 logging.info(f"Serial number found at third location: {serial_number}")