Index: leahi_dialin/common/__init__.py =================================================================== diff -u -r9ac39d94327325e5b882318bc0e5126668eec66e -r3715028b608b10e1d440a8a738c8a4f70d3d411b --- leahi_dialin/common/__init__.py (.../__init__.py) (revision 9ac39d94327325e5b882318bc0e5126668eec66e) +++ leahi_dialin/common/__init__.py (.../__init__.py) (revision 3715028b608b10e1d440a8a738c8a4f70d3d411b) @@ -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 -rafb299e7aca45969aed5075bc951b97058ddb2b6 -r3715028b608b10e1d440a8a738c8a4f70d3d411b --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision afb299e7aca45969aed5075bc951b97058ddb2b6) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 3715028b608b10e1d440a8a738c8a4f70d3d411b) @@ -329,7 +329,8 @@ 'D29_COND': 2, # Water, Bicarbonate, and Acid Collective Conductivity Sensor 'D43_COND': 3, # Self Test Conductivity Sensor (not used for dialysate conductivity) 'D74_COND': 4, # Water and Bicarbonate Collective Conductivity Sensor - 'NUM_OF_CONDUCTIVITY_SENSORS': 5 # Number of Conductivity Sensors + 'D98_COND': 5, # D98 Conductivity Sensor + 'NUM_OF_CONDUCTIVITY_SENSORS': 6 # Number of Conductivity Sensors } return unique(DialinEnum('DDConductivitySensorNames', members)) @@ -366,7 +367,8 @@ 'D6_LEVEL': 0, # floater switch low, medium and high status 'D63_LEVEL': 1, # bicarb level low or high status 'D46_LEVEL': 2, # Spent dialysate air separation chamber level low or high status - 'NUM_OF_LEVELS': 3, # Number of Level Sensors + 'D98_LEVEL': 3, # D98 Conductivity Level Sensor + 'NUM_OF_LEVELS': 4, # Number of Level Sensors } return unique(DialinEnum('DDLevelSensorNames', members)) @@ -399,7 +401,8 @@ 'D51_PRES': 2, # Spent Dialysate pressure (PDs) 'D18_PRES': 3, # Fresh Dialysate pressure (PDf) 'D41_PRES': 4, # Transmembrane pressure (Ptm) - 'NUM_OF_PRESSURE_SENSORS': 5, # Number of pressure sensors + 'D87_PRES': 5, # D87 Pressure Sensor + 'NUM_OF_PRESSURE_SENSORS': 6, # Number of pressure sensors } return unique(DialinEnum('DDPressureSensorNames', members)) @@ -437,36 +440,43 @@ 'D78_TEMP': 1, # Heat exchanger Outlet temperature sensor 'D4_TEMP': 2, # Hydraulics primary heater temperature sensor 'D50_TEMP': 3, # Trimmer heater temperature sensor - 'BRD_TEMP': 4, # Barometric temperature sensor - 'D16_TEMP': 5, # D16(D17) Conductivity sensor temperature value - 'D28_TEMP': 6, # D28(D27) Conductivity sensor temperature value - 'D30_TEMP': 7, # D30(D29) Conductivity sensor temperature value - 'D44_TEMP': 8, # D44(D43) Conductivity sensor temperature value - 'D75_TEMP': 9, # D75(D74) Conductivity sensor temperature value - 'D4_AVG_TEMP': 10, # D4 Filtered value - 'D50_AVG_TEMP': 11, # D50 Filtered value - 'D28_AVG_TEMP': 12, # D28 Filtered value - 'D30_AVG_TEMP': 13, # D30 Filtered value - 'D9_TEMP': 14, # D9 Pressure sensor temperature value - 'D66_TEMP': 15, # D66 Pressure sensor temperature value - 'D51_TEMP': 16, # D51 Pressure sensor temperature value - 'D18_TEMP': 17, # D18 Pressure sensor temperature value - 'D41_TEMP': 18, # D41 Pressure sensor temperature value - 'NUM_OF_TEMP_SENSORS': 19, # Number of Temperature Sensors + 'D99_TEMP': 4, # D98(D99) Conductivity sensor temperature value + 'BRD_TEMP': 5, # Barometric temperature sensor + 'D16_TEMP': 6, # D16(D17) Conductivity sensor temperature value + 'D28_TEMP': 7, # D28(D27) Conductivity sensor temperature value + 'D30_TEMP': 8, # D30(D29) Conductivity sensor temperature value + 'D44_TEMP': 9, # D44(D43) Conductivity sensor temperature value + 'D75_TEMP': 10, # D75(D74) Conductivity sensor temperature value + 'D4_AVG_TEMP': 11, # D4 Filtered value + 'D50_AVG_TEMP': 12, # D50 Filtered value + 'D99_AVG_TEMP': 13, # D99 Filtered value + 'D28_AVG_TEMP': 14, # D28 Filtered value + 'D30_AVG_TEMP': 15, # D30 Filtered value + 'D9_TEMP': 16, # D9 Pressure sensor temperature value + 'D66_TEMP': 17, # D66 Pressure sensor temperature value + 'D51_TEMP': 18, # D51 Pressure sensor temperature value + 'D18_TEMP': 19, # D18 Pressure sensor temperature value + 'D41_TEMP': 20, # D41 Pressure sensor temperature value + 'D87_TEMP': 21, # D87 Pressure sensor temperature value + 'NUM_OF_TEMP_SENSORS': 22, # Number of Temperature Sensors } created_enum = DialinEnum('DDTemperatureSensorNames', members) # Add aliases extend_enum(created_enum, 'FIRST_PRESSURE_SENSOR', created_enum.D9_TEMP.value) extend_enum(created_enum, 'LAST_PRESSURE_SENSOR', created_enum.D87_TEMP.value if GlobalVariables().HW_BETA_1_9 == True else created_enum.D41_TEMP.value) extend_enum(created_enum, 'FIRST_CONDUCTIVITY_SENSOR', created_enum.D16_TEMP.value) - extend_enum(created_enum, 'LAST_CONDUCTIVITY_SENSOR', created_enum.D99_TEMP.value if GlobalVariables().HW_BETA_1_9 == True else created_enum.D75_TEMP.value) + extend_enum(created_enum, 'LAST_CONDUCTIVITY_SENSOR', created_enum.D75_TEMP.value) + extend_enum(created_enum, 'FIRST_AVERAGE_SENSOR', created_enum.D4_AVG_TEMP.value) + extend_enum(created_enum, 'LAST_AVERAGE_SENSOR', created_enum.D30_AVG_TEMP.value) # Add aliases to be searchable (listed when pressed TAB) created_enum._member_names_.append('FIRST_PRESSURE_SENSOR') created_enum._member_names_.append('LAST_PRESSURE_SENSOR') created_enum._member_names_.append('FIRST_CONDUCTIVITY_SENSOR') created_enum._member_names_.append('LAST_CONDUCTIVITY_SENSOR') + created_enum._member_names_.append('FIRST_AVERAGE_SENSOR') + created_enum._member_names_.append('FIRST_AVERAGE_SENSOR') return created_enum @@ -488,7 +498,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/common/fp_defs.py =================================================================== diff -u -rc78812412148e14aaf2ab5d003dc140feda5a68c -r3715028b608b10e1d440a8a738c8a4f70d3d411b --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision c78812412148e14aaf2ab5d003dc140feda5a68c) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 3715028b608b10e1d440a8a738c8a4f70d3d411b) @@ -316,7 +316,8 @@ 'P8_PRES' : 1, # Water inlet pressure after regulator 'P13_PRES' : 2, # Water inlet pressure before the conductivity sensor 'P17_PRES' : 3, # Pressure before the RO filter - 'NUM_OF_FP_PRES_SENSORS' : 4, # Number of Pressure Sensors + 'P46_PRES' : 4, # Pressure after the RO filter + 'NUM_OF_FP_PRES_SENSORS' : 5, # Number of Pressure Sensors } return unique(DialinEnum('FPPressureSensorNames', members)) @@ -351,21 +352,22 @@ 'P8_TEMP' : 1, # Temperature before inlet conductivity sensor (P8) 'P13_TEMP' : 2, # Temperature before RO filter (P13) 'P17_TEMP' : 3, # Temperature after RO filter (P17) - 'P10_TEMP' : 4, # P10 temperature from inlet conductivity sensor. - 'P19_TEMP' : 5, # P19 temperature from outlet conductivity sensor. - 'P7_TEMP' : 6, # Temperature at p7 flow meter - 'P16_TEMP' : 7, # Temperature at p16 flow meter - 'P7_INTERNAL_TEMP' : 8, # Internal Temperature at p7 flow meter - 'P16_INTERNAL_TEMP' : 9, # Internal Temperature at p16 flow meter - 'NUM_OF_TEMPERATURE_SENSORS' : 10, # Number of Temperature Sensors + 'P46_TEMP' : 4, # Temperature after sediment filter (P46) + 'P10_TEMP' : 5, # P10 temperature from inlet conductivity sensor. + 'P19_TEMP' : 6, # P19 temperature from outlet conductivity sensor. + 'P7_TEMP' : 7, # Temperature at p7 flow meter + 'P16_TEMP' : 8, # Temperature at p16 flow meter + 'P7_INTERNAL_TEMP' : 9, # Interal Temperature at p7 flow meter + 'P16_INTERNAL_TEMP' : 10, # Interal Temperature at p16 flow meter + 'NUM_OF_TEMPERATURE_SENSORS' : 11, # Number of Temperature Sensors } # Create the enum created_enum = DialinEnum('FPTemperatureSensorNames', members) # Add aliases extend_enum(created_enum, 'FIRST_PRESSURE_SENSOR', created_enum.M3_TEMP.value) - extend_enum(created_enum, 'LAST_PRESSURE_SENSOR', created_enum.P46_TEMP.value if GlobalVariables().HW_BETA_1_9 == True else created_enum.P17_TEMP.value) + extend_enum(created_enum, 'LAST_PRESSURE_SENSOR', created_enum.P46_TEMP.value if GlobalVariables().HW_BETA_1_9 == True else created_enum.P46_TEMP.value) extend_enum(created_enum, 'FIRST_CONDUCTIVITY_SENSOR', created_enum.P10_TEMP.value) extend_enum(created_enum, 'LAST_CONDUCTIVITY_SENSOR', created_enum.P19_TEMP.value) extend_enum(created_enum, 'FIRST_FLOW_SENSOR', created_enum.P7_TEMP.value) Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -r38e8dd31728056dbb7f9304c98ab16d7147b75a2 -r3715028b608b10e1d440a8a738c8a4f70d3d411b --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 3715028b608b10e1d440a8a738c8a4f70d3d411b) @@ -55,10 +55,9 @@ dd_enum_repository.DDConductivitySensorNames.D27_COND.name: 0.0, dd_enum_repository.DDConductivitySensorNames.D29_COND.name: 0.0, dd_enum_repository.DDConductivitySensorNames.D43_COND.name: 0.0, - dd_enum_repository.DDConductivitySensorNames.D74_COND.name: 0.0 + dd_enum_repository.DDConductivitySensorNames.D74_COND.name: 0.0, + dd_enum_repository.DDConductivitySensorNames.D98_COND.name: 0.0 } - if GlobalVariables().HW_BETA_1_9: - self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = 0.0 self.dd_conductivity_timestamp = 0.0 @@ -87,10 +86,7 @@ self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D74_COND.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - if GlobalVariables().HW_BETA_1_9: - if dd_enum_repository.DDConductivitySensorNames.D98_COND.name not in self.dd_conductivity: - self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = 0.0 - self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = struct.unpack('f', bytearray( + self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] self.dd_conductivity_timestamp = timestamp Index: leahi_dialin/dd/modules/levels.py =================================================================== diff -u -r38e8dd31728056dbb7f9304c98ab16d7147b75a2 -r3715028b608b10e1d440a8a738c8a4f70d3d411b --- leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2) +++ leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 3715028b608b10e1d440a8a738c8a4f70d3d411b) @@ -49,7 +49,8 @@ self.dd_level_sensors = { dd_enum_repository.DDLevelSensorNames.D6_LEVEL.name: 0, dd_enum_repository.DDLevelSensorNames.D63_LEVEL.name: 0, - dd_enum_repository.DDLevelSensorNames.D46_LEVEL.name: 0 + dd_enum_repository.DDLevelSensorNames.D46_LEVEL.name: 0, + dd_enum_repository.DDLevelSensorNames.D98_LEVEL.name: 0 } if GlobalVariables().HW_BETA_1_9: self.dd_level_sensors[dd_enum_repository.DDLevelSensorNames.D98_LEVEL.name] = 0.0 @@ -68,10 +69,7 @@ sensor_list =[] sensor_list.append((dd_enum_repository.DDLevelSensorNames.D6_LEVEL, 'i')) sensor_list.append((dd_enum_repository.DDLevelSensorNames.D63_LEVEL, 'i')) - if GlobalVariables().HW_BETA_1_9: - if dd_enum_repository.DDLevelSensorNames.D98_LEVEL.name not in self.dd_level_sensors: - self.dd_level_sensors[dd_enum_repository.DDTemperatureSensorNames.D98_LEVEL.name] = 0.0 - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D98_LEVEL, 'i')) + sensor_list.append((dd_enum_repository.DDLevelSensorNames.D98_LEVEL, 'i')) sensor_list.append((dd_enum_repository.DDLevelSensorNames.D46_LEVEL, 'i')) i = 1 Index: leahi_dialin/dd/modules/temperature_sensors.py =================================================================== diff -u -r38e8dd31728056dbb7f9304c98ab16d7147b75a2 -r3715028b608b10e1d440a8a738c8a4f70d3d411b --- leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2) +++ leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 3715028b608b10e1d440a8a738c8a4f70d3d411b) @@ -19,7 +19,6 @@ from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common.dd_defs import dd_enum_repository -from leahi_dialin.common.global_vars import GlobalVariables from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.protocols.CAN import DenaliChannels @@ -34,14 +33,15 @@ super().__init__() self.can_interface = can_interface - self.logger = logger + self.logger: Logger = logger # Dictionary of the temperature sensors self.dd_temperatures_timestamp = 0.0 self.dd_temperatures = { dd_enum_repository.DDTemperatureSensorNames.D1_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D78_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D4_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D50_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D99_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.BRD_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D16_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D28_TEMP.name: 0.0, @@ -50,17 +50,15 @@ dd_enum_repository.DDTemperatureSensorNames.D75_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D4_AVG_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D50_AVG_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D28_AVG_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D30_AVG_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D66_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D51_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D18_TEMP.name: 0.0, - dd_enum_repository.DDTemperatureSensorNames.D41_TEMP.name: 0.0 + dd_enum_repository.DDTemperatureSensorNames.D41_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D87_TEMP.name: 0.0 } - if GlobalVariables().HW_BETA_1_9: - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D99_TEMP.name] = 0.0 - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP.name] = 0.0 - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D87_TEMP.name] = 0.0 if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id @@ -82,10 +80,7 @@ sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D78_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D4_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D50_TEMP, 'f')) - if GlobalVariables().HW_BETA_1_9: - if dd_enum_repository.DDTemperatureSensorNames.D99_TEMP.name not in self.dd_temperatures: - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D99_TEMP.name] = 0.0 - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D99_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D99_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.BRD_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D16_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D28_TEMP, 'f')) @@ -94,21 +89,15 @@ sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D75_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D4_AVG_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D50_AVG_TEMP, 'f')) - if GlobalVariables().HW_BETA_1_9: - if dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP.name not in self.dd_temperatures: - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP.name] = 0.0 - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D28_AVG_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D30_AVG_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D9_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D66_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D51_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D18_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D41_TEMP, 'f')) - if GlobalVariables().HW_BETA_1_9: - if dd_enum_repository.DDTemperatureSensorNames.D87_TEMP.name not in self.dd_temperatures: - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D87_TEMP.name] = 0.0 - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D87_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D87_TEMP, 'f')) i = 1 for sensor in sensor_list: @@ -158,6 +147,13 @@ modified_index= sensor_index - dd_enum_repository.DDTemperatureSensorNames.FIRST_CONDUCTIVITY_SENSOR.value message_id = MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST + # DD Conductivity Sensors' Average Temperature Reading Override + elif dd_enum_repository.DDTemperatureSensorNames.FIRST_AVERAGE_SENSOR.value <= sensor_index <= dd_enum_repository.DDTemperatureSensorNames.LAST_AVERAGE_SENSOR.value: + modified_index= sensor_index - dd_enum_repository.DDTemperatureSensorNames.FIRST_AVERAGE_SENSOR.value + message_id = 'Unknown' + self.logger.info('No Msg ID is present for Conductivity sensor Average override! Skipping...') + return False + # DD Pressure Sensors' Temperature Reading Override elif dd_enum_repository.DDTemperatureSensorNames.FIRST_PRESSURE_SENSOR.value <= sensor_index <= dd_enum_repository.DDTemperatureSensorNames.LAST_PRESSURE_SENSOR.value: modified_index= sensor_index - dd_enum_repository.DDTemperatureSensorNames.FIRST_PRESSURE_SENSOR.value Index: leahi_dialin/dd/modules/valves.py =================================================================== diff -u -r38e8dd31728056dbb7f9304c98ab16d7147b75a2 -r3715028b608b10e1d440a8a738c8a4f70d3d411b --- leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2) +++ leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 3715028b608b10e1d440a8a738c8a4f70d3d411b) @@ -78,7 +78,7 @@ self.d3_valv = {"id": dd_enum_repository.DDValveNames.D3_VALV.value, "state": DEENERGIZED} self.d80_valv = {"id": dd_enum_repository.DDValveNames.D80_VALV.value, "state": DEENERGIZED} self.d81_valv = {"id": dd_enum_repository.DDValveNames.D81_VALV.value, "state": DEENERGIZED} - self.rsvrd1 = {"id": dd_enum_repository.DDValveNames.RSRVD_SPACE1.value, "state": DEENERGIZED} + self.d85_valv = {"id": dd_enum_repository.DDValveNames.D85_VALV.value, "state": DEENERGIZED} self.d23_valv = {"id": dd_enum_repository.DDValveNames.D23_VALV.value, "state": DEENERGIZED} self.d19_valv = {"id": dd_enum_repository.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), @@ -197,7 +197,7 @@ "d3_valv", "d80_valv", "d81_valv", - "rsvrd1", + "d85_valv", "d23_valv", "d19_valv", "d25_valv", @@ -207,7 +207,7 @@ "d26_valv", "d22_valv", "d79_pmp_valv", - "D83_valv", + "d83_valv", "d91_valv", "spare3_valv", "spare4_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) @@ -258,14 +258,14 @@ self.d22_valv["state"] = self._binary_to_valve_state(bcv[0] & 128) spv = struct.unpack('B', bytearray(message['message'][self.START_POS_SPARE_VALVES_STATES:self.END_POS_SPARE_VALVES_STATES])) - self.d79_pmp_valv["state"] = self._binary_to_valve_state(bcv[0] & 1) - self.d83_valv["state"] = self._binary_to_valve_state(bcv[0] & 2) - self.d91_valv["state"] = self._binary_to_valve_state(bcv[0] & 4) - self.spare3_valv["state"] = self._binary_to_valve_state(bcv[0] & 8) - self.spare4_valv["state"] = self._binary_to_valve_state(bcv[0] & 16) - self.spare5_valv["state"] = self._binary_to_valve_state(bcv[0] & 32) - self.d100_valv["state"] = self._binary_to_valve_state(bcv[0] & 64) - self.spare7_valv["state"] = self._binary_to_valve_state(bcv[0] & 128) + self.d79_pmp_valv["state"] = self._binary_to_valve_state(spv[0] & 1) + self.d83_valv["state"] = self._binary_to_valve_state(spv[0] & 2) + self.d91_valv["state"] = self._binary_to_valve_state(spv[0] & 4) + self.spare3_valv["state"] = self._binary_to_valve_state(spv[0] & 8) + self.spare4_valv["state"] = self._binary_to_valve_state(spv[0] & 16) + self.spare5_valv["state"] = self._binary_to_valve_state(spv[0] & 32) + self.d100_valv["state"] = self._binary_to_valve_state(spv[0] & 64) + self.spare7_valv["state"] = self._binary_to_valve_state(spv[0] & 128) start = self.END_POS_SPARE_VALVES_STATES end = start + 1 Index: leahi_dialin/fp/filtration_purification.py =================================================================== diff -u -r38e8dd31728056dbb7f9304c98ab16d7147b75a2 -r3715028b608b10e1d440a8a738c8a4f70d3d411b --- leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2) +++ leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision 3715028b608b10e1d440a8a738c8a4f70d3d411b) @@ -328,7 +328,7 @@ channel_id = DenaliChannels.dialin_to_fp_ch_id, msg_id = MsgIds.MSG_ID_FP_SET_OP_MODE_REQUEST, entity_name = 'FP Operation Mode', - override_text = FPOpModes(new_mode).name, + override_text = fp_enum_repository.FPOpModes(new_mode).name, logger = self.logger, can_interface = self.can_interface) Index: leahi_dialin/fp/modules/temperatures.py =================================================================== diff -u -r38e8dd31728056dbb7f9304c98ab16d7147b75a2 -r3715028b608b10e1d440a8a738c8a4f70d3d411b --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 3715028b608b10e1d440a8a738c8a4f70d3d411b) @@ -18,7 +18,6 @@ from logging import Logger from leahi_dialin.common.constants import NO_RESET -from leahi_dialin.common.global_vars import GlobalVariables from leahi_dialin.common.fp_defs import fp_enum_repository, BETA_IOFP_COND_SENSOR_OFFSET, BETA_IOFP_PRES_SENSOR_OFFSET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override @@ -52,9 +51,8 @@ fp_enum_repository.FPTemperatureSensorNames.P16_TEMP.name: 0.0, fp_enum_repository.FPTemperatureSensorNames.P7_INTERNAL_TEMP.name: 0.0, fp_enum_repository.FPTemperatureSensorNames.P16_INTERNAL_TEMP.name: 0.0, + fp_enum_repository.FPTemperatureSensorNames.P46_TEMP.name: 0.0 } - if GlobalVariables().HW_BETA_1_9: - self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P46_TEMP.name] = 0.0 @publish(["msg_id_fp_temperature_data", "fp_temperatures", "fp_temperatures_timestamp"]) @@ -76,10 +74,7 @@ sensor_list.append((fp_enum_repository.FPTemperatureSensorNames.P16_TEMP, 'f')) sensor_list.append((fp_enum_repository.FPTemperatureSensorNames.P7_INTERNAL_TEMP, 'f')) sensor_list.append((fp_enum_repository.FPTemperatureSensorNames.P16_INTERNAL_TEMP, 'f')) - if GlobalVariables().HW_BETA_1_9: - if fp_enum_repository.FPTemperatureSensorNames.P46_TEMP.name not in self.fp_enum_repository: - self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P46_TEMP.name] = 0.0 - sensor_list.append((fp_enum_repository.FPTemperatureSensorNames.P46_TEMP, 'f')) + sensor_list.append((fp_enum_repository.FPTemperatureSensorNames.P46_TEMP, 'f')) i = 1 for sensor in sensor_list: Index: leahi_dialin/fp/modules/valves.py =================================================================== diff -u -r38e8dd31728056dbb7f9304c98ab16d7147b75a2 -r3715028b608b10e1d440a8a738c8a4f70d3d411b --- leahi_dialin/fp/modules/valves.py (.../valves.py) (revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2) +++ leahi_dialin/fp/modules/valves.py (.../valves.py) (revision 3715028b608b10e1d440a8a738c8a4f70d3d411b) @@ -164,11 +164,12 @@ start = self.END_FP_VALVES_STATES end = start + 1 for valve_id in self.valves_sensed_states: + if valve_id.lower().startswith('num'): + continue valve_state_number = struct.unpack('B', bytearray(message['message'][start:end]))[0] self.valves_sensed_states[valve_id] = fp_enum_repository.FPValveStates(valve_state_number).name start = end end += 1 - self.fp_valves_states_timestamp = timestamp Index: leahi_dialin/protocols/__init__.py =================================================================== diff -u -r126c206228086fbd13e820980c2fbb2fb58131bb -r3715028b608b10e1d440a8a738c8a4f70d3d411b --- leahi_dialin/protocols/__init__.py (.../__init__.py) (revision 126c206228086fbd13e820980c2fbb2fb58131bb) +++ leahi_dialin/protocols/__init__.py (.../__init__.py) (revision 3715028b608b10e1d440a8a738c8a4f70d3d411b) @@ -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/td/modules/ejector.py =================================================================== diff -u -r38e8dd31728056dbb7f9304c98ab16d7147b75a2 -r3715028b608b10e1d440a8a738c8a4f70d3d411b --- leahi_dialin/td/modules/ejector.py (.../ejector.py) (revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2) +++ leahi_dialin/td/modules/ejector.py (.../ejector.py) (revision 3715028b608b10e1d440a8a738c8a4f70d3d411b) @@ -22,6 +22,7 @@ from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.common.td_defs import td_enum_repository from leahi_dialin.protocols.CAN import DenaliChannels +from leahi_dialin.protocols.CAN import DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray Index: leahi_dialin/utils/__init__.py =================================================================== diff -u -r126c206228086fbd13e820980c2fbb2fb58131bb -r3715028b608b10e1d440a8a738c8a4f70d3d411b --- leahi_dialin/utils/__init__.py (.../__init__.py) (revision 126c206228086fbd13e820980c2fbb2fb58131bb) +++ leahi_dialin/utils/__init__.py (.../__init__.py) (revision 3715028b608b10e1d440a8a738c8a4f70d3d411b) @@ -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}" )