Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r9f9a61478bd4c3bf5d83b148fbead2e3e5655530 -r9b92e44669522202bc4ab8263c89bdf381bfe8ff --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 9f9a61478bd4c3bf5d83b148fbead2e3e5655530) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 9b92e44669522202bc4ab8263c89bdf381bfe8ff) @@ -165,6 +165,11 @@ MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0 + MSG_ID_UI_ADJUST_DISPOSABLES_CONFIRM_REQUEST = 0X92 + MSG_ID_TD_ADJUST_DISPOSABLES_CONFIRM_RESPONSE = 0X93 + MSG_ID_UI_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_REQUEST = 0X94 + MSG_ID_TD_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_RESPONSE = 0X95 + MSG_ID_TD_TESTER_LOGIN_REQUEST = 0x8000 MSG_ID_TD_SOFTWARE_RESET_REQUEST = 0x8001 MSG_ID_TD_SEND_TEST_CONFIGURATION = 0x8002 @@ -320,6 +325,9 @@ MSG_ID_DD_VOLTAGE_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA051 MSG_ID_DD_MONITORED_VOLTAGE_OVERRIDE_REQUEST = 0xA052 MSG_ID_DD_RINSE_PUMP_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA053 + MSG_ID_DD_RINSE_PUMP_PWM_PERCENT_OVERRIDE_REQUEST = 0xA054 + MSG_ID_DD_RINSE_PUMP_TURN_ON_OFF_REQUEST = 0xA055 + MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA056 # Placeholder messages MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xAF03 @@ -380,6 +388,8 @@ MSG_ID_FP_SET_START_STOP_OVERRIDE_REQUEST = 0xB033 MSG_ID_FP_RO_REJECTION_RATIO_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB034 MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST = 0xB035 + MSG_ID_FP_DEF_STATUS_REQUEST = 0xB049 + MSG_ID_FP_DEF_STATUS_RESPONSE = 0xB04A MSG_ID_TD_DEBUG_EVENT = 0xFFF1 MSG_ID_DD_DEBUG_EVENT = 0xFFF2 Index: leahi_dialin/ui/td_messaging.py =================================================================== diff -u -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d -r9b92e44669522202bc4ab8263c89bdf381bfe8ff --- leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d) +++ leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 9b92e44669522202bc4ab8263c89bdf381bfe8ff) @@ -504,7 +504,7 @@ payload=payload) self.can_interface.send(message, 0) - + def td_treatment_time( self, tx_duration_s : int , tx_elapsed_s : int , @@ -595,6 +595,32 @@ self.can_interface.send(message, 0) + + def td_blood_prime_progress(self, + target_volume : float , + delivered_volume : float ): + """ + Broadcasts blood prime data (Msg ID: 0x97, 151) + Args: + @param target_volume (float) : Target Volume + @param delivered_volume (float) : Delivered Volume + @return: None + """ + + if not self.can_enabled: + raise ValueError("CAN Interface is not enabled") + + payload = conversions.float_to_bytearray (target_volume ) + payload += conversions.float_to_bytearray (delivered_volume ) + + message = CAN.DenaliMessage.build_message( + channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message_id=msg_ids.MsgIds.MSG_ID_TD_BLOOD_PRIME_PROGRESS_DATA.value, + payload=payload) + + self.can_interface.send(message, 0) + + def td_versions(self, major: int, minor: int, micro: int, build: int, fpga_id: int, fpga_major: int, fpga_minor: int, fpga_lab: int, compatibility_rev: int):