Index: dialin/ui/hd_simulator.py =================================================================== diff -u -r24ca8218a28a4ba18619ab6104adcde7c42547be -r6692626da4021b0ee8898c3e5add0aee6b55f2b7 --- dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 24ca8218a28a4ba18619ab6104adcde7c42547be) +++ dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 6692626da4021b0ee8898c3e5add0aee6b55f2b7) @@ -1122,7 +1122,8 @@ def cmd_set_treatment_states_data(self, sub_mode: int, uf_state: int, saline_state: int, heparin_state: int, rinseback_state: int, recirculate_state: int, blood_prime_state: int, - treatment_end_state: int, treatment_stop_state: int, dialysis_state: int) -> None: + treatment_end_state: int, treatment_stop_state: int, dialysis_state: int, + bloodLeakZeoringState: int) -> None: """ the Treatment States Data message setter/sender method | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | @@ -1140,9 +1141,9 @@ | #7:(U32) | #8:(U32) | #9:(U32) | |:--: |:--: |:--: | | \ref Data::vBloodPrimeState | \ref Data::mTreatmentEndState | \ref Data::mTreammentStopState | - | #9:(U32) || - |:--: || - | \ref Data::mDialysisState || + | #9:(U32) | #10:(U32) | + |:--: |:--: | + | \ref Data::mDialysisState | \ref Data::mBloodLeakZeroingState | @param sub_mode: (int) Sub-Mode @param uf_state: (int) UF State @@ -1154,6 +1155,7 @@ @param treatment_end_state: (int) Treatment End State @param treatment_stop_state: (int) Treatment Stop State @param dialysis_state: (int) Dialysis State + @param bloodLeakZeoringState : (int) Blood leak zeroing state @return: none """ @@ -1167,6 +1169,7 @@ payload += integer_to_bytearray(treatment_end_state) payload += integer_to_bytearray(treatment_stop_state) payload += integer_to_bytearray(dialysis_state) + payload += integer_to_bytearray(bloodLeakZeoringState) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, message_id=MsgIds.MSG_ID_TREATMENT_STATE_DATA.value, @@ -1209,7 +1212,13 @@ self.can_interface.send(message, 0) - def cmd_set_treatment_saline_bolus_data(self, target: int, cumulative: float, delivered: float) -> None: + def cmd_set_treatment_saline_bolus_data(self, + target: int, + cumulative: float, + delivered: float, + DPI2BLDVolML: float, + RSRVR2DPIVolML: float, + zeroingRqstStatus: int) -> None: """ the Treatment Saline Bolus Data message sender method | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(F32) | #3:(F32) | @@ -1222,9 +1231,12 @@ @return: none """ - payload = integer_to_bytearray(target) - payload += float_to_bytearray(cumulative) - payload += float_to_bytearray(delivered) + payload = integer_to_bytearray (target ) + payload += float_to_bytearray (cumulative ) + payload += float_to_bytearray (delivered ) + payload += float_to_bytearray (DPI2BLDVolML ) + payload += float_to_bytearray (RSRVR2DPIVolML ) + payload += integer_to_bytearray (zeroingRqstStatus ) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, message_id=MsgIds.MSG_ID_SALINE_BOLUS_DATA.value, @@ -2196,22 +2208,42 @@ "Compat: {4} " .format(ui_major, ui_minor, ui_micro, ui_build, ui_compatibility)) - def cmd_send_hd_blood_leak_data(self, blood_leak_status: int, blood_leak_state: int, - blood_leak_zero_status_counter: int, blood_leak_serial_state: int) -> None: + def cmd_send_hd_blood_leak_data(self, blood_leak_status: int, + blood_leak_state: int, + blood_leak_error_persistent_ctr: int, + blood_leak_serial_comm_state: int, + blood_leak_intensity: int, + blood_leak_blood_detect: int, + blood_leak_intensity_moving_average: float, + blood_leak_time_since_last_zero_ms: int, + blood_leak_in_range_drift_status: int, + blood_leak_upper_range_drift_status: int) -> None: """ A simulated HD broadcast message of blood leak data. @param blood_leak_status: (int) Blood leak status @param blood_leak_state: (int) Blood leak state - @param blood_leak_zero_status_counter: (int) Blood leak zero status counter - @param blood_leak_serial_state: (int) Blood leak serial comm state + @param blood_leak_error_persistent_ctr: (int) Blood leak zero status counter + @param blood_leak_serial_comm_state: (int) Blood leak serial comm state + @param blood_leak_intensity: (int) Blood leak intensity + @param blood_leak_blood_detect: (int) Blood leak detect + @param blood_leak_intensity_moving_average: (float) Blood leak intensity moving average + @param blood_leak_time_since_last_zero_ms: (int) Blood leak time since last zero + @param blood_leak_in_range_drift_status: (int) Blood leak in range drift status + @param blood_leak_upper_range_drift_status: (int) Blood leak upper range drift status @return: None """ payload = unsigned_integer_to_bytearray(blood_leak_status) payload += unsigned_integer_to_bytearray(blood_leak_state) - payload += unsigned_integer_to_bytearray(blood_leak_zero_status_counter) - payload += unsigned_integer_to_bytearray(blood_leak_serial_state) + payload += unsigned_integer_to_bytearray(blood_leak_error_persistent_ctr) + payload += unsigned_integer_to_bytearray(blood_leak_serial_comm_state) + payload += unsigned_integer_to_bytearray(blood_leak_intensity) + payload += unsigned_integer_to_bytearray(blood_leak_blood_detect) + payload += float_to_bytearray(blood_leak_intensity_moving_average) + payload += unsigned_integer_to_bytearray(blood_leak_time_since_last_zero_ms) + payload += unsigned_integer_to_bytearray(blood_leak_in_range_drift_status) + payload += unsigned_integer_to_bytearray(blood_leak_upper_range_drift_status) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, message_id=MsgIds.MSG_ID_HD_BLOOD_LEAK_DATA.value, @@ -2385,4 +2417,4 @@ message_id=MsgIds.MSG_ID_HD_INSTITUTIONAL_RECORD_RESPONSE.value, payload=payload) - self.can_interface.send(message, 0) \ No newline at end of file + self.can_interface.send(message, 0)