fix overrides

Author: HotNoob

classes/protocol_settings.py

@@ -345,7 +345,7 @@ def load_registry_overrides(self, override_path, keys : list[str]):
             reader = csv.DictReader(csvfile)
             for row in reader:
                 for key in keys:
-                    key_value = row[key]
+                    key_value = row[key].strip().lower().replace(' ', '_')
                     if key_value:
                         overrides[key][key_value] = row
         return overrides
@@ -367,25 +367,25 @@ def load__registry(self, path, registry_type : Registry_Type = Registry_Type.INP
 
 
         overrides : dict[str, dict]  = None
-        override_keys = ['documented name', 'registry']
+        override_keys = ['documented name', 'register']
         overrided_keys = set()
         ''' list / set of keys that were used for overriding. to track unique entries'''
 
         #assuming path ends with .csv
-        overrides_path = path[:-4] + '.overrides.csv'
+        override_path = path[:-4] + '.override.csv'
 
-        if os.path.exists(overrides_path):
-            self._log.info("loading override file: " + overrides_path)
+        if os.path.exists(override_path):
+            self._log.info("loading override file: " + override_path)
 
-            overrides = self.load_registry_overrides(override_keys)
+            overrides = self.load_registry_overrides(override_path, override_keys)
 
         def determine_delimiter(first_row) -> str:
             if first_row.count(';') > first_row.count(','):
                 return ';'
             else:
                 return ','  
 
-        def process_row():
+        def process_row(row):
             # Initialize variables to hold numeric and character parts
             numeric_part = 1
             character_part = ''
@@ -409,24 +409,25 @@ def process_row():
             #clean up doc name, for extra parsing
             row['documented name'] = row['documented name'].strip().lower().replace(' ', '_')
 
-            #apply overrides using documented name or register
-            override_row = None
-            # Check each key in order until a match is found
-            for key in override_keys:
-                key_value = row.get(key)
-                if key_value and key_value in overrides[key]:
-                    override_row = overrides[key][key_value]
-                    overrided_keys.add(key_value)
-                    break
-            
-            # Apply non-empty override values if an override row is found
-            if override_row:
-                for field, override_value in override_row.items():
-                    if override_value:  # Only replace if override value is non-empty
-                        row[field] = override_value
+            if overrides != None:
+                #apply overrides using documented name or register
+                override_row = None
+                # Check each key in order until a match is found
+                for key in override_keys:
+                    key_value = row.get(key)
+                    if key_value and key_value in overrides[key]:
+                        override_row = overrides[key][key_value]
+                        overrided_keys.add(key_value)
+                        break
+                
+                # Apply non-empty override values if an override row is found
+                if override_row:
+                    for field, override_value in override_row.items():
+                        if override_value:  # Only replace if override value is non-empty
+                            row[field] = override_value
 
             variable_name = row['variable name'] if row['variable name'] else row['documented name']
-            variable_name = variable_name = variable_name.strip().lower().replace(' ', '_').replace('__', '_') #clean name
+            variable_name = variable_name.strip().lower().replace(' ', '_').replace('__', '_') #clean name
 
             if re.search(r"[^a-zA-Z0-9\_]", variable_name) :
                 self._log.warning("Invalid Name : " + str(variable_name) + " reg: " + str(row['register']) + " doc name: " + str(row['documented name']) + " path: " + str(path))
@@ -611,18 +612,25 @@ def process_row():
             for row in reader:
                 process_row(row)
 
-            # Add any unmatched overrides as new entries... probably need to add some better error handling to ensure entry isnt empty ect...
-            for key in override_keys:
-                applied = False
-                for key_value, override_row in overrides[key].items():
-                    if key_value not in overrided_keys:
-                        self._log.info("Loading unique entry from overrides")
-                        process_row(override_row)
-                        applied = True
-                        break
-
-                if applied: 
-                    continue
+            if overrides != None:
+                # Add any unmatched overrides as new entries... probably need to add some better error handling to ensure entry isnt empty ect...
+                for key in override_keys:
+                    applied = False
+                    for key_value, override_row in overrides[key].items():
+                        # Check if both keys are unique before applying
+                        if all(override_row.get(k) not in overrided_keys for k in override_keys):
+                            self._log.info("Loading unique entry from overrides for both unique keys")
+                            process_row(override_row)
+                            
+                            # Mark both keys as applied
+                            for k in override_keys:
+                                overrided_keys.add(override_row.get(k))
+                                
+                            applied = True
+                            break  # Exit inner loop after applying unique entry
+
+                    if applied: 
+                        continue
 
             for index in reversed(range(len(registry_map))):
                 item = registry_map[index]

protocols/growatt/v0.14.input_registry_map.override.csv

@@ -0,0 +1,5 @@
+variable name,data type,register,documented name,description,values,unit,,,,,,,,,,,
+,,0,System Status,System run state,{{system_status_codes}},1,,3: Fault,4: Flash,5: PV charge,6: AC charge,7: Combine charge,8:    Combine    charge and Bypass,9:    PV    charge    and Bypass,10:    AC    charge    and Bypass,  11: Bypass,12:    PV    charge    andDischarge
+OVERRIDE PV VOLTAGE,,,Vpv1,PV1 voltage,,0.1V,,,,,,,,,,,
+extra entry,,777,unique extra entry,PV1 voltage,,0.1V,,,,,,,,,,,
+extra entry broken,,,unique broken entry,,,-1,,,,,,,,,,,