improve error handling for write bit and test write single bit

Author: HotNoob

classes/protocol_settings.py

@@ -1058,7 +1058,7 @@ def process_register_ushort(self, registry : dict[int, int], entry : registry_ma
             else:
                 flags : list[str] = []
                 if end_bit > 0:
-                    end : int = 16 if end_bit >= 16 else end_bit
+                    end : int = 16 if end_bit >= 16 else end_bit    
                     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:

classes/transports/modbus_base.py

@@ -390,12 +390,12 @@ def write_variable(self, entry : registry_map_entry, value : str, registry_type
 
         if not self.write_mode == TransportWriteMode.UNSAFE:
             if not self.protocolSettings.validate_registry_entry(entry, current_value):
-                self._log.error(f"WRITE_ERROR: Invalid value in register '{current_value}'. Unsafe to write")
+                return self._log.error(f"WRITE_ERROR: Invalid value in register '{current_value}'. Unsafe to write")
                 #raise ValueError(err)
 
             if not (entry.data_type == Data_Type._16BIT_FLAGS or entry.data_type == Data_Type._8BIT_FLAGS or entry.data_type == Data_Type._32BIT_FLAGS): #skip validation for write; validate further down
                 if not self.protocolSettings.validate_registry_entry(entry, value):
-                    self._log.error(f"WRITE_ERROR: Invalid new value, '{value}'. Unsafe to write")
+                    return self._log.error(f"WRITE_ERROR: Invalid new value, '{value}'. Unsafe to write")
 
         #handle codes
         if entry.variable_name+"_codes" in self.protocolSettings.codes:
@@ -419,8 +419,8 @@ def write_variable(self, entry : registry_map_entry, value : str, registry_type
             bit_size = Data_Type.getSize(entry.data_type)
 
             new_val = int(value)
-            if 0 > new_val or new_val > 2**bit_size:
-                raise ValueError("Invalid value")
+            if 0 > new_val or new_val > (2**bit_size -1): # Calculate max value for n bits: 2^n - 1
+                return self._log.error(f"WRITE_ERROR: Invalid new value, '{value}'. Exceeds value range. Unsafe to write")
 
             bit_index = entry.register_bit
             bit_mask = ((1 << bit_size) - 1) << bit_index  # Create a mask for extracting X bits starting from bit_index

protocols/test.holding_registry_map.csv

@@ -20,3 +20,7 @@ variable name,data type,writable,register,documented name,description,values,uni
 ,,W,21,decimal,,0-59,0.1,
 ,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""}",,
+,1bit,W,23.b4,1bit,,0~1,,
+,1bit,W,23.b5,1bit_1,,0~1,,
+,1bit,W,23.b6,1bit_2,,0~1,,
+,1bit,W,23.b7,1bit_3,,0~1,,