Index: leahi_dialin/common/__init__.py =================================================================== diff -u -r77740bc2ccace473a471515cadd4bc1353360cd6 -r8ad78a5baa403afceccf9627478285a2ec742c4a --- leahi_dialin/common/__init__.py (.../__init__.py) (revision 77740bc2ccace473a471515cadd4bc1353360cd6) +++ leahi_dialin/common/__init__.py (.../__init__.py) (revision 8ad78a5baa403afceccf9627478285a2ec742c4a) @@ -12,7 +12,7 @@ try: with open(file_name, 'r') as file: config = json.load(file); ok = config[sw_key] -except FileNotFoundError: print(f"Error ({module_name}): The file '{file_name}' was not found." ) +except FileNotFoundError: pass except KeyError : print(f"Error ({module_name}): The key '{sw_key}' was not found." ) except Exception as e : print(f"Error ({module_name}): An unexpected error occurred: {e}" ) Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -ra5b82c620e6a54f2b8559c54ffaa1a84e831d88e -r8ad78a5baa403afceccf9627478285a2ec742c4a --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision a5b82c620e6a54f2b8559c54ffaa1a84e831d88e) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 8ad78a5baa403afceccf9627478285a2ec742c4a) @@ -347,7 +347,7 @@ D3_VALV = 12 # Valve Hydraulics Inlet (D3) D80_VALV = 13 # Valve Dry Bicarb (D80) D81_VALV = 14 # Valve De-scaler (D81) - RSRVD_SPACE1 = 15 # This space has been reserved + D85_VALV = 15 # Valve De-scaler (D85) D23_VALV = 16 # Balancing chamber Valve 1 (D23) D19_VALV = 17 # Balancing chamber Valve 2 (D19) D25_VALV = 18 # Balancing chamber Valve 3 (D25) Index: leahi_dialin/dd/__init__.py =================================================================== diff -u -rbe6aa30cfb37a47935f3c114ecece9ee75809909 -r8ad78a5baa403afceccf9627478285a2ec742c4a --- leahi_dialin/dd/__init__.py (.../__init__.py) (revision be6aa30cfb37a47935f3c114ecece9ee75809909) +++ leahi_dialin/dd/__init__.py (.../__init__.py) (revision 8ad78a5baa403afceccf9627478285a2ec742c4a) @@ -12,7 +12,7 @@ try: with open(file_name, 'r') as file: config = json.load(file); ok = config[sw_key] -except FileNotFoundError: print(f"Error ({module_name}): The file '{file_name}' was not found." ) +except FileNotFoundError: pass except KeyError : print(f"Error ({module_name}): The key '{sw_key}' was not found." ) except Exception as e : print(f"Error ({module_name}): An unexpected error occurred: {e}" ) Index: leahi_dialin/dd/modules/valves.py =================================================================== diff -u -ra5b82c620e6a54f2b8559c54ffaa1a84e831d88e -r8ad78a5baa403afceccf9627478285a2ec742c4a --- leahi_dialin/dd/modules/valves.py (.../valves.py) (revision a5b82c620e6a54f2b8559c54ffaa1a84e831d88e) +++ leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 8ad78a5baa403afceccf9627478285a2ec742c4a) @@ -79,7 +79,7 @@ self.d3_valv = {"id": DDValveNames.D3_VALV.value, "state": DEENERGIZED} self.d80_valv = {"id": DDValveNames.D80_VALV.value, "state": DEENERGIZED} self.d81_valv = {"id": DDValveNames.D81_VALV.value, "state": DEENERGIZED} - self.rsvrd1 = {"id": DDValveNames.RSRVD_SPACE1.value, "state": DEENERGIZED} + self.d85_valv = {"id": DDValveNames.D85_VALV.value, "state": DEENERGIZED} self.d23_valv = {"id": DDValveNames.D23_VALV.value, "state": DEENERGIZED} self.d19_valv = {"id": DDValveNames.D19_VALV.value, "state": DEENERGIZED} @@ -128,7 +128,7 @@ self.d3_valv.get("state", None), self.d80_valv.get("state", None), self.d81_valv.get("state", None), - self.rsvrd1.get("state", None), + self.d85_valv.get("state", None), self.d23_valv.get("state", None), self.d19_valv.get("state", None), @@ -196,7 +196,7 @@ "d3_valv", "d80_valv", "d81_valv", - "rsvrd1", + "d85_valv", "d23_valv", "d19_valv", "d25_valv", @@ -245,7 +245,7 @@ self.d3_valv["state"] = self._binary_to_valve_state(vst[0] & 4096) self.d80_valv["state"] = self._binary_to_valve_state(vst[0] & 8192) self.d81_valv["state"] = self._binary_to_valve_state(vst[0] & 16384) - self.rsvrd1["state"] = self._binary_to_valve_state(vst[0] & 32768) + self.d85_valv["state"] = self._binary_to_valve_state(vst[0] & 32768) bcv = struct.unpack('B', bytearray(message['message'][self.START_POS_BCV_VALVES_STATES:self.END_POS_BCV_VALVES_STATES])) self.d23_valv["state"] = self._binary_to_valve_state(bcv[0] & 1) Index: leahi_dialin/fp/__init__.py =================================================================== diff -u -rf485dc0c84964939ae58374bab5b928f29689362 -r8ad78a5baa403afceccf9627478285a2ec742c4a --- leahi_dialin/fp/__init__.py (.../__init__.py) (revision f485dc0c84964939ae58374bab5b928f29689362) +++ leahi_dialin/fp/__init__.py (.../__init__.py) (revision 8ad78a5baa403afceccf9627478285a2ec742c4a) @@ -12,7 +12,7 @@ try: with open(file_name, 'r') as file: config = json.load(file); ok = config[sw_key] -except FileNotFoundError: print(f"Error ({module_name}): The file '{file_name}' was not found." ) +except FileNotFoundError: pass except KeyError : print(f"Error ({module_name}): The key '{sw_key}' was not found." ) except Exception as e : print(f"Error ({module_name}): An unexpected error occurred: {e}" ) Index: leahi_dialin/protocols/__init__.py =================================================================== diff -u -rbe6aa30cfb37a47935f3c114ecece9ee75809909 -r8ad78a5baa403afceccf9627478285a2ec742c4a --- leahi_dialin/protocols/__init__.py (.../__init__.py) (revision be6aa30cfb37a47935f3c114ecece9ee75809909) +++ leahi_dialin/protocols/__init__.py (.../__init__.py) (revision 8ad78a5baa403afceccf9627478285a2ec742c4a) @@ -9,7 +9,7 @@ try: with open(file_name, 'r') as file: config = json.load(file); ok = config[sw_key] -except FileNotFoundError: print(f"Error ({module_name}): The file '{file_name}' was not found." ) +except FileNotFoundError: pass except KeyError : print(f"Error ({module_name}): The key '{sw_key}' was not found." ) except Exception as e : print(f"Error ({module_name}): An unexpected error occurred: {e}" ) Index: leahi_dialin/utils/__init__.py =================================================================== diff -u -rbe6aa30cfb37a47935f3c114ecece9ee75809909 -r8ad78a5baa403afceccf9627478285a2ec742c4a --- leahi_dialin/utils/__init__.py (.../__init__.py) (revision be6aa30cfb37a47935f3c114ecece9ee75809909) +++ leahi_dialin/utils/__init__.py (.../__init__.py) (revision 8ad78a5baa403afceccf9627478285a2ec742c4a) @@ -13,7 +13,7 @@ try: with open(file_name, 'r') as file: config = json.load(file); ok = config[sw_key] -except FileNotFoundError: print(f"Error ({module_name}): The file '{file_name}' was not found." ) +except FileNotFoundError: pass except KeyError : print(f"Error ({module_name}): The key '{sw_key}' was not found." ) except Exception as e : print(f"Error ({module_name}): An unexpected error occurred: {e}" )