debug and fix write bitflags, also fix offset bitflag reading

Author: HotNoob

classes/protocol_settings.py

@@ -1049,7 +1049,7 @@ def process_register_ushort(self, registry : dict[int, int], entry : registry_ma
                     for i in range(start_bit, end):  # Iterate over each bit position (0 to 15)
                         # Check if the i-th bit is set
                         if (val >> i) & 1:
-                            flag_index = "b"+str(i+offset)
+                            flag_index = "b"+str(i+offset-start_bit)
                             if flag_index in self.codes[entry.documented_name+"_codes"]:
                                 flags.append(self.codes[entry.documented_name+"_codes"][flag_index])
 

classes/transports/modbus_base.py

@@ -377,6 +377,7 @@ def evaluate_score(entry : registry_map_entry, val):
     def write_variable(self, entry : registry_map_entry, value : str, registry_type : Registry_Type = Registry_Type.HOLDING):
         """ writes a value to a ModBus register; todo: registry_type to handle other write functions"""
 
+        value = value.strip()
 
         temp_map = [entry]
         ranges = self.protocolSettings.calculate_registry_ranges(temp_map, self.protocolSettings.registry_map_size[registry_type], init=True) #init=True to bypass timechecks
@@ -443,10 +444,10 @@ def write_variable(self, entry : registry_map_entry, value : str, registry_type
             #16 bit flags
             flag_size : int = Data_Type.getSize(entry.data_type)
 
-            if re.match(r"^[0-1]{"+flag_size+"}$", current_value): #bitflag string
+            if re.match(rf"^[0-1]{{{flag_size}}}$", value): #bitflag string
                 #is string of 01... s
                 # Convert binary string to an integer
-                value = int(current_value, 2)
+                value = int(value[::-1], 2) #reverse string
 
                 # Ensure it fits within ushort range (0-65535)
                 if value > 65535:
@@ -456,7 +457,7 @@ def write_variable(self, entry : registry_map_entry, value : str, registry_type
 
             #apply bitmasks
             bit_index = entry.register_bit
-            bit_mask = ((1 << bit_size) - 1) << bit_index  # Create a mask for extracting X bits starting from bit_index
+            bit_mask = ((1 << flag_size) - 1) << bit_index  # Create a mask for extracting X bits starting from bit_index
             clear_mask = ~(bit_mask)  # Mask for clearing the bits to be updated
 
             # Clear the bits to be updated in the current_value

protocols/test.holding_registry_map.csv

@@ -15,7 +15,8 @@ variable name,data type,writable,register,documented name,description,values,uni
 ,8bit,W,12.b8,Time_Month,,1-12,,
 ,8bit,W,13,Time_Date,,1-31,,
 ,8bit,W,13.b8,Time_Hour,,0-23,,
-,8bit,W,14,Time_Minute,,0-59,,
+,8bit,W,14,Time_Minute,,0-59,,  
 ,8bit,W,14.b8,Time_Second,,0-59,,
 ,,W,21,decimal,,0-59,0.1,
-,8bit_flags,W,22.b8,bit_flags,,"{""b0"": ""bit 0"", ""b1"": ""bit 1"",""b2"": ""bit 2"",""b3"": ""bit 3"", ""b4"": ""bit 4"",""b5"": ""bit 5"", ""b6"": ""bit 6"", ""b7"": ""bit 7""}",,
+,8bit_flags,W,22,bit_flags1,,"{""b0"": ""bit 0"", ""b1"": ""bit 1"",""b2"": ""bit 2"",""b3"": ""bit 3"", ""b4"": ""bit 4"",""b5"": ""bit 5"", ""b6"": ""bit 6"", ""b7"": ""bit 7""}",,
+,8bit_flags,W,22.b8,bit_flags2,,"{""b0"": ""bit 0"", ""b1"": ""bit 1"",""b2"": ""bit 2"",""b3"": ""bit 3"", ""b4"": ""bit 4"",""b5"": ""bit 5"", ""b6"": ""bit 6"", ""b7"": ""bit 7""}",,