Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -ra7e73b2d25806ea5742372124a7ae308753c7bfb -r55a8c10a40d37ca346976b11dd5fdc0c8ee76c97 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision a7e73b2d25806ea5742372124a7ae308753c7bfb) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 55a8c10a40d37ca346976b11dd5fdc0c8ee76c97) @@ -252,7 +252,7 @@ MSG_ID_DD_VALVE_SENSED_STATE_OVERRIDE_REQUEST = 0xA005 MSG_ID_DD_PRESSURE_SENSOR_READINGS_OVERRIDE_REQUEST = 0xA006 MSG_ID_DD_PRESSURE_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xA007 - MSG_ID_DD_PRESSURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST = 0xA008 + MSG_ID_DD_TREATMENT_PARAMS_OVERRIDE_REQUEST = 0xA008 MSG_ID_DD_PRESSURE_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST = 0xA009 MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA00A MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST = 0xA00B Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -r9636bffdc6b129ed07299d5bbf52056a31872769 -r55a8c10a40d37ca346976b11dd5fdc0c8ee76c97 --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 9636bffdc6b129ed07299d5bbf52056a31872769) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 55a8c10a40d37ca346976b11dd5fdc0c8ee76c97) @@ -20,6 +20,7 @@ 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 DenaliMessage, DenaliChannels Index: leahi_dialin/dd/modules/gen_dialysate.py =================================================================== diff -u -r26b51fdaa4392c915a1548bca456d4602b324be3 -r55a8c10a40d37ca346976b11dd5fdc0c8ee76c97 --- leahi_dialin/dd/modules/gen_dialysate.py (.../gen_dialysate.py) (revision 26b51fdaa4392c915a1548bca456d4602b324be3) +++ leahi_dialin/dd/modules/gen_dialysate.py (.../gen_dialysate.py) (revision 55a8c10a40d37ca346976b11dd5fdc0c8ee76c97) @@ -72,10 +72,24 @@ message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] self.dialysate_delivery_in_progress = struct.unpack('I', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.dialysate_good_to_deliver = struct.unpack('I', bytearray( + self.d6_level = struct.unpack('I', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.targetQd = struct.unpack('f', bytearray( + self.d63_level = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] + self.d46_level = struct.unpack('I', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] + self.d9_pressure = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] + self.d18_pressure = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] + self.d51_pressure = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] + self.dialysate_good_to_deliver = struct.unpack('I', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] + self.targetQd = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] + self.isBalancingChamberSwitchingActive = struct.unpack('I', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] self.dd_gen_dialysate_timestamp = timestamp Index: leahi_dialin/fp/filtration_purification.py =================================================================== diff -u -r9bfb4b489a4608541017c05660e111d8ef6b8b5f -r55a8c10a40d37ca346976b11dd5fdc0c8ee76c97 --- leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision 9bfb4b489a4608541017c05660e111d8ef6b8b5f) +++ leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision 55a8c10a40d37ca346976b11dd5fdc0c8ee76c97) @@ -246,24 +246,17 @@ @return: 1 if successful, zero otherwise """ + return cmd_generic_override( + payload = None, + reset = NO_RESET, + channel_id = DenaliChannels.dialin_to_fp_ch_id, + msg_id = MsgIds.MSG_ID_FP_DEF_STATUS_REQUEST, + entity_name = 'FP Defeatured Status', + override_text = '', + logger = self.logger, + can_interface = self.can_interface) - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, - message_id=MsgIds.MSG_ID_FP_DEF_STATUS_REQUEST.value) - self.logger.debug('Getting FP defeatured status') - received_message = self.can_interface.send(message) - - # If there is content... - if received_message is not None: - self.logger.debug("Received FW ACK after requesting FP defeatured configuration record.") - # response payload is OK or not OK - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.debug("Timeout!!!!") - return False - - - def cmd_op_mode_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the measured op mode broadcast interval override command