Index: dialin/common/hd_defs.py =================================================================== diff -u -rbea9ebd2e6dd6ba909a7431044059a9aeb4ea0b5 -r78dd086f1f9a3ce19b8b6f7e9c2435cee3883522 --- dialin/common/hd_defs.py (.../hd_defs.py) (revision bea9ebd2e6dd6ba909a7431044059a9aeb4ea0b5) +++ dialin/common/hd_defs.py (.../hd_defs.py) (revision 78dd086f1f9a3ce19b8b6f7e9c2435cee3883522) @@ -79,9 +79,10 @@ HD_PRE_TREATMENT_PRIME_STATE = 5 # Prime blood and dialysate circuits and run wet self-tests state HD_PRE_TREATMENT_RECIRCULATE_STATE = 6 # Re-circulate blood and dialysate circuits state HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE = 7 # Patient connection state - NUM_OF_HD_PRE_TREATMENT_STATES = 8 # Number of pre-treatment mode states + HD_PRE_TREATMENT_WET_SELF_TEST_STATE = 8 + HD_PRE_TREATMENT_RSVR_STATE = 9 + NUM_OF_HD_PRE_TREATMENT_STATES = 10 # Number of pre-treatment mode states - @unique class PreTreatmentSampleWaterStates(DialinEnum): SAMPLE_WATER_SETUP_STATE = 0 # Sample water setup (flush filter) state Index: dialin/ui/hd_simulator.py =================================================================== diff -u -r565745de835f2efabbcc458aea51ced88fc63162 -r78dd086f1f9a3ce19b8b6f7e9c2435cee3883522 --- dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 565745de835f2efabbcc458aea51ced88fc63162) +++ dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 78dd086f1f9a3ce19b8b6f7e9c2435cee3883522) @@ -290,7 +290,7 @@ self.demoSelection = 0 # setup event to change state on demoTimer self.demoCount = 0 - if (msg_id == MsgIds.MSG_ID_UI_CONFIRMATION_RESULT_RESPONSE.value) and \ + elif (msg_id == MsgIds.MSG_ID_UI_CONFIRMATION_RESULT_RESPONSE.value) and \ (params.data_int[0] == 98): rsp_id = MsgIds.MSG_ID_HD_UI_CONFIRMATION_REQUEST rsp_payload = integer_to_bytearray(98) # TBD! Use const for 99 @@ -310,15 +310,15 @@ self.rinseback_volume_all_ml = self.rinseback_volume_out_ml # INITIATE A NEW TREATMENT SETUP ---------------------------------- - if msg_id == MsgIds.MSG_ID_UI_INITIATE_TREATMENT_REQUEST.value: + elif msg_id == MsgIds.MSG_ID_UI_INITIATE_TREATMENT_REQUEST.value: rsp_id = MsgIds.MSG_ID_HD_OP_MODE_DATA if params.data_int[0] == EResponse.Accepted: rsp_payload = integer_to_bytearray(HDOpModes.MODE_TPAR.value) else: rsp_payload = integer_to_bytearray(HDOpModes.MODE_STAN.value) rsp_payload += integer_to_bytearray(0) - if msg_id == MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS_REQUEST.value: + elif msg_id == MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS_REQUEST.value: rsp_id = MsgIds.MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE rsp_payload = struct.pack("<" + str(TreatmentParameters.NUM_OF_TREATMENT_PARAMS.value + 1) + "i", 1, @@ -365,11 +365,10 @@ # else: # self.demoSpeed = 1 - if msg_id == MsgIds.MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS_REQUEST.value: + elif msg_id == MsgIds.MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS_REQUEST.value: if params.data_int[0] == EResponse.Accepted: self.salineVolume_ml = 0.0 self.salineVolCum_ml = 0.0 - self.cmd_send_hd_operation_mode(HDOpModes.MODE_PRET.value,0) rsp_id = MsgIds.MSG_ID_PRE_TREATMENT_STATE_DATA rsp_payload = struct.pack( "<" + str(PreTreatmentSubModes.NUM_OF_HD_PRE_TREATMENT_STATES.value + 1) + "i", @@ -382,8 +381,8 @@ 0, # 5 Prime blood and dialysate circuits and run wet self-tests state 0, # 6 Re-circulate blood and dialysate circuits state 0, # 7 Patient connection state - 0, 0 #TBD! late add - + 0, + 0 ) self.demoSelection = 4 # TBD setup event to change to Filter Flush self.demoCount = 0 # immediately act on next timer tick @@ -395,7 +394,7 @@ rsp_payload += integer_to_bytearray(0) # WATER SAMPLING -------------------------------------------------- - if msg_id == MsgIds.MSG_ID_UI_SAMPLE_WATER_RESULT.value: # sample water completed, prime filter... + elif msg_id == MsgIds.MSG_ID_UI_SAMPLE_WATER_RESULT.value: # sample water completed, prime filter... if params.data_int[0] == EResponse.Accepted: ## TBD!!! FOLLOWING IS FUTILE ATTEMPT TO SET UF MAX calc_max_uf_volume = min(int(self.MAX_UF_RATE_ML_PER_SEC * self.treatment_time_sec/100.0)*100.0, self.MAX_UF_ML_PER_TX) @@ -416,7 +415,8 @@ 0, # 5 Prime blood and dialysate circuits and run wet self-tests state 0, # 6 Re-circulate blood and dialysate circuits state 0, # 7 Patient connection state - 0, 0 #TBD! late add + 0, + 0 ) self.demoSelection = 0 # Wait for user self.demoCount = 3 # TBD! setup quick action: 3 timer ticks each step @@ -435,13 +435,16 @@ 0, # 5 Prime blood and dialysate circuits and run wet self-tests state 0, # 6 Re-circulate blood and dialysate circuits state 0, # 7 TBD! Patient connection state - 0, 0 # TBD! late add + 0, + 0 ) self.demoSelection = 0 # Wait for user # PRETREATMENT INSTALL AND TESTS --------------------------------- - if msg_id == MsgIds.MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM_REQUEST.value: + elif msg_id == MsgIds.MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM_REQUEST.value: ## TBD!!! Does this work? + calc_max_uf_volume = min(int(self.MAX_UF_RATE_ML_PER_SEC * self.treatment_time_sec / 100.0) * 100.0, + self.MAX_UF_ML_PER_TX) self.cmd_send_uf_treatment_response(accepted=EResponse.Accepted, reason=RequestRejectReasons.REQUEST_REJECT_REASON_NONE.value, volume=calc_max_uf_volume) @@ -452,7 +455,7 @@ self.demoCounter = self.demoCount # immediate self.demoTimedIncValue = PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_PRIME_STATE.value # 1. TBD Note: this will be skipped as an output - if msg_id == MsgIds.MSG_ID_UI_INSTALLATION_CONFIRM_REQUEST.value: + elif msg_id == MsgIds.MSG_ID_UI_INSTALLATION_CONFIRM_REQUEST.value: ## TBD!! Is this needed to clear UI from presenting old data? self.cmd_set_treatment_saline_bolus_data(target=self.demo_treatment_params.data_int[ TreatmentParameters.TREATMENT_PARAM_SALINE_BOLUS_VOLUME_ML.value], @@ -467,20 +470,20 @@ self.demoGroupCounter = -self.demoCounter # start displayed timer progressing with the Counter self.demoGroupCount = PreTreatmentDrySelfTestsStates.NUM_OF_DRY_SELF_TESTS_STATES.value * self.demoCount # aggregate counter TBD! calc the 13 - if msg_id == MsgIds.MSG_ID_UI_START_PRIME_REQUEST.value: # _60 x3C 'Start Prime' + elif msg_id == MsgIds.MSG_ID_UI_START_PRIME_REQUEST.value: # _60 x3C 'Start Prime' self.demoSelection = 10 # continue on, picking up from previous state setup by selection 9 self.demoCount = 5 self.demoCounter = self.demoCount # TBD! creates illusion of starting self.demoGroupCount = PreTreatmentPrimeStates.NUM_OF_HD_PRIME_STATES.value * self.demoCount # aggregate counter self.demoGroupCounter = 0 # aggregate counter TBD SHOULD be handled by previous group end logic (?) # TREATMENT: PATIENT CONNECT -------------------------------------- - if msg_id == MsgIds.MSG_ID_UI_PATIENT_CONNECTION_BEGIN_REQUEST.value: # 100 x64 'Continue' Priming Complete + elif msg_id == MsgIds.MSG_ID_UI_PATIENT_CONNECTION_BEGIN_REQUEST.value: # 100 x64 'Continue' Priming Complete # TBD!!! Setup UF Range before this rsp_id = MsgIds.MSG_ID_PRE_TREATMENT_STATE_DATA rsp_payload = struct.pack( "<" + str(PreTreatmentSubModes.NUM_OF_HD_PRE_TREATMENT_STATES.value + 1) + "i", - PreTreatmentSubModes.HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE.value, + PreTreatmentSubModes.HD_PRE_TREATMENT_WATER_SAMPLE_STATE.value, 0, # 0 Water sample state 0, # 1 Consumable self-tests state 0, # 2 No cartridge self-tests state @@ -489,11 +492,12 @@ 0, # 5 Prime blood and dialysate circuits and run wet self-tests state 0, # 6 Re-circulate blood and dialysate circuits state 0, # 7 TBD! Patient connection state - 0, 0 # TBD! late add + 0, + 0 ) self.demoSelection = 0 # Wait for user - if msg_id == MsgIds.MSG_ID_UI_SET_UF_VOLUME_PARAMETER_REQUEST.value: # _79 x4F + elif msg_id == MsgIds.MSG_ID_UI_SET_UF_VOLUME_PARAMETER_REQUEST.value: # _79 x4F rsp_id = MsgIds.MSG_ID_HD_SET_UF_VOLUME_PARAMETER_RESPONSE rsp_payload = integer_to_bytearray(EResponse.Accepted) rsp_payload += integer_to_bytearray(RequestRejectReasons.REQUEST_REJECT_REASON_NONE.value) @@ -505,21 +509,21 @@ self.uf_rate_l_per_sec = 0 self.demoSelection = 0 # Wait for user - if msg_id == MsgIds.MSG_ID_UI_PATIENT_CONNECTION_CONFIRM_REQUEST.value: # 102 x66 + elif msg_id == MsgIds.MSG_ID_UI_PATIENT_CONNECTION_CONFIRM_REQUEST.value: # 102 x66 rsp_id = MsgIds.MSG_ID_HD_PATIENT_CONNECTION_CONFIRM_RESPONSE rsp_payload = integer_to_bytearray(EResponse.Accepted) rsp_payload += integer_to_bytearray(RequestRejectReasons.REQUEST_REJECT_REASON_NONE.value) self.demoSelection = 0 # Wait for user - if msg_id == MsgIds.MSG_ID_UI_START_TREATMENT_REQUEST.value: # 113 x71 + elif msg_id == MsgIds.MSG_ID_UI_START_TREATMENT_REQUEST.value: # 113 x71 rsp_id = MsgIds.MSG_ID_HD_START_TREATMENT_RESPONSE rsp_payload = integer_to_bytearray(EResponse.Accepted) rsp_payload += integer_to_bytearray(RequestRejectReasons.REQUEST_REJECT_REASON_NONE.value) self.demoSelection = 20 # Start Treatment self.demoCount = 0 # immediately # DIALYSIS --------------------------------------------------- - if msg_id == MsgIds.MSG_ID_USER_TREATMENT_TIME_CHANGE_REQUEST.value: # _22 x16 + elif msg_id == MsgIds.MSG_ID_USER_TREATMENT_TIME_CHANGE_REQUEST.value: # _22 x16 rsp_id = MsgIds.MSG_ID_USER_TREATMENT_TIME_CHANGE_RESPONSE if params.data_int[0] is not None: if params.data_int[0] == 4 * 60 + 30: # 'secret' means to force end if 0 duration is unavailable @@ -533,7 +537,7 @@ rsp_payload += integer_to_bytearray(int(self.treatment_time_sec / 60)) rsp_payload += float_to_bytearray(self.uf_volume_set_l * 1000.0) - if msg_id == MsgIds.MSG_ID_USER_SALINE_BOLUS_REQUEST.value: # _18 x12 + elif msg_id == MsgIds.MSG_ID_USER_SALINE_BOLUS_REQUEST.value: # _18 x12 rsp_id = MsgIds.MSG_ID_USER_SALINE_BOLUS_RESPONSE rsp_payload = integer_to_bytearray(EResponse.Accepted) rsp_payload += integer_to_bytearray(RequestRejectReasons.REQUEST_REJECT_REASON_NONE.value) @@ -544,7 +548,7 @@ else: self.demoSelection = 33 # Bolus Stop request - if msg_id == MsgIds.MSG_ID_UI_HEPARIN_PAUSE_RESUME_REQUEST.value: # _.. x4B + elif msg_id == MsgIds.MSG_ID_UI_HEPARIN_PAUSE_RESUME_REQUEST.value: # _.. x4B rsp_id = MsgIds.MSG_ID_HD_HEPARIN_PAUSE_RESUME_RESPONSE rsp_payload = integer_to_bytearray(EResponse.Accepted) rsp_payload += integer_to_bytearray(RequestRejectReasons.REQUEST_REJECT_REASON_NONE.value) @@ -553,7 +557,7 @@ else: self.heparin_pause = False # Heparin Resume - if msg_id == MsgIds.MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST.value: # _70 x46 + elif msg_id == MsgIds.MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST.value: # _70 x46 rsp_id = MsgIds.MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE rsp_payload = integer_to_bytearray(EResponse.Accepted) rsp_payload += integer_to_bytearray(RequestRejectReasons.REQUEST_REJECT_REASON_NONE.value) @@ -568,7 +572,7 @@ rsp_payload += integer_to_bytearray(params.data_int[1]) rsp_payload += integer_to_bytearray(params.data_int[2]) - if msg_id == MsgIds.MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_REQUEST.value: # _70 x46 + elif msg_id == MsgIds.MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_REQUEST.value: # _70 x46 rsp_id = MsgIds.MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_RESPONSE rsp_payload = integer_to_bytearray(EResponse.Accepted) rsp_payload += integer_to_bytearray(RequestRejectReasons.REQUEST_REJECT_REASON_NONE.value) @@ -583,7 +587,7 @@ rsp_payload += integer_to_bytearray(params.data_int[0]) # RINSEBACK ------------------------- - if msg_id == MsgIds.MSG_ID_UI_RINSEBACK_CMD_REQUEST.value: # _82 x52 + elif msg_id == MsgIds.MSG_ID_UI_RINSEBACK_CMD_REQUEST.value: # _82 x52 rsp_id = MsgIds.MSG_ID_HD_RINSEBACK_CMD_RESPONSE rsp_payload = integer_to_bytearray(EResponse.Accepted) rsp_payload += integer_to_bytearray(RequestRejectReasons.REQUEST_REJECT_REASON_NONE.value) @@ -619,19 +623,19 @@ elif params.data_int[0] == 9: # TBD!! Additional not implemented 9 = return to treatment rsp_payload = integer_to_bytearray(EResponse.Rejected) - if msg_id == MsgIds.MSG_ID_UI_PATIENT_DISCONNECTION_CONFIRM_REQUEST.value or \ + elif msg_id == MsgIds.MSG_ID_UI_PATIENT_DISCONNECTION_CONFIRM_REQUEST.value or \ msg_id == MsgIds.MSG_ID_UI_TREATMENT_LOG_DATA_REQUEST.value: # _74 x4A # rsp_id = MsgIds.MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE self._send_treatment_log() - if msg_id == MsgIds.MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM_REQUEST.value: # 115 x73 + elif msg_id == MsgIds.MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM_REQUEST.value: # 115 x73 rsp_id = MsgIds.MSG_ID_HD_DISPOSABLE_REMOVAL_CONFIRM_RESPONSE rsp_payload = integer_to_bytearray(EResponse.Accepted) rsp_payload += integer_to_bytearray(RequestRejectReasons.REQUEST_REJECT_REASON_NONE.value) self.demoSelection = 1 # Reset to beginning (rather than Disinfect choices '= 50') self.demoCount = 0 # immediately - if msg_id == MsgIds.MSG_ID_UI_POST_TX_NEXT_REQUEST.value: # 0x6 + elif msg_id == MsgIds.MSG_ID_UI_POST_TX_NEXT_REQUEST.value: # 0x6 rsp_id = MsgIds.MSG_ID_HD_POST_TX_NEXT_CMD_RESPONSE rsp_payload = integer_to_bytearray(EResponse.Accepted) rsp_payload += integer_to_bytearray(RequestRejectReasons.REQUEST_REJECT_REASON_NONE.value) @@ -704,7 +708,7 @@ rsp_payload = integer_to_bytearray(HDOpModes.MODE_PRET.value) rsp_payload += integer_to_bytearray(PreTreatmentSubModes.HD_PRE_TREATMENT_WATER_SAMPLE_STATE.value) self.demoSelection = 5 # = PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_COMPLETE_STATE.value: self.demoSelection = 7 # TBD! setup event to change to @@ -762,10 +767,10 @@ 0, # 5 Prime blood and dialysate circuits and run wet self-tests state 0, # 6 Re-circulate blood and dialysate circuits state 0, # 7 Patient connection state - 0, 0 # TBD! late add - + 0, + 0 ) - self.demoCountdownId = MsgIds.MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS + self.demoCountdownId = MsgIds.MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS_DATA self.demoSelection = 8 # Setup event to change to HD_PRE_TREATMENT_CART_INSTALL_STATE self.demoCount = 30 @@ -782,8 +787,8 @@ 0, # 5 Prime blood and dialysate circuits and run wet self-tests state 0, # 6 Re-circulate blood and dialysate circuits state 0, # 7 Patient connection state - 0, 0 # TBD! late add - + 0, + 0 ) self.demoSelection = 0 # TBD! setup event to change to // Wait for user @@ -802,15 +807,15 @@ 0, # 5 Prime blood and dialysate circuits and run wet self-tests state 0, # 6 Re-circulate blood and dialysate circuits state 0, # 7 Patient connection state - 0, 0 # TBD! late add - + 0, + 0 ) if self.demoTimedIncValue >= PreTreatmentDrySelfTestsStates.NUM_OF_DRY_SELF_TESTS_STATES.value - 1: self.demoTimedIncValue = PreTreatmentPrimeStates.HD_PRIME_WAIT_FOR_USER_START_STATE.value - 1 # 1st pass is v+1 self.demoSelection = 10 # TBD! setup event to change to ... Wait for User self.demoCount = 0 # TBD! don't advance until user 'Start Prime' else: - self.demoCountdownId = MsgIds.MSG_ID_HD_DRY_SELF_TEST_PROGRESS + self.demoCountdownId = MsgIds.MSG_ID_HD_DRY_SELF_TEST_PROGRESS_DATA # TBD setup above: self.demoGroupCount = 14 * 4 # aggregate counter # DIALYSATE PRIME CIRCUITS ---------------------------------------- elif self.demoSelection == 10: # Prime circuits with dialysate @@ -826,8 +831,8 @@ self.demoTimedIncValue, # 5 Prime blood and dialysate circuits and run wet self-tests state 0, # 6 Re-circulate blood and dialysate circuits state 0, # 7 Patient connection state - 0, 0 # TBD! late add - + 0, + 0 ) self.demoCountdownId = MsgIds.MSG_ID_HD_PRIMING_STATUS_DATA self.demoGroupCount = PreTreatmentPrimeStates.NUM_OF_HD_PRIME_STATES.value * 5 # aggregate count up to TBD! cleanup numbers @@ -837,7 +842,7 @@ # TBD! could skip HD_PRIME_PAUSE? elif self.demoTimedIncValue >= PreTreatmentPrimeStates.NUM_OF_HD_PRIME_STATES.value - 1: self.demoTimedIncValue = None ## TBD!! - self.demoSelection = 11 # on next countdown transition + self.demoSelection = 12 # on next countdown transition self.demoCount = 0 # immediate timeout # TBD!! Hack to make counter neat self.demoGroupCounter = self.demoGroupCount # aggregate counter # TBD else: @@ -857,12 +862,50 @@ PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, # 6 Re-circulate blood and dialysate circuits state 0, # 7 Patient connection state - 0, 0 # TBD! late add + 0, + 0 + ) + self.demoSelection = 0 # Then wait for User + self.demoGroupCount = None # clear aggregate count + elif self.demoSelection == 12: # Recirculate primed circuits + rsp_id = MsgIds.MSG_ID_PRE_TREATMENT_STATE_DATA + rsp_payload = struct.pack( + "<" + str(PreTreatmentSubModes.NUM_OF_HD_PRE_TREATMENT_STATES.value + 1) + "i", + PreTreatmentSubModes.HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE.value, + 0, # 0 Water sample state + 0, # 1 Consumable self-tests state + 0, # 2 No cartridge self-tests state + 0, # 3 Consumable and cartridge installation state + 0, # 4 Self-tests when the cartridge is dry state + 0, # 5 Prime blood and dialysate circuits and run wet self-tests state + 0, # 6 Re-circulate blood and dialysate circuits state + PreTreatmentPatientConnectionStates.PRE_TREATMENT_PAT_CONN_WAIT_FOR_UF_VOL_STATE.value, # 7 Patient connection state + 0, + 0 ) self.demoSelection = 0 # Then wait for User self.demoGroupCount = None # clear aggregate count + elif self.demoSelection == 13: # Recirculate primed circuits + rsp_id = MsgIds.MSG_ID_PRE_TREATMENT_STATE_DATA + rsp_payload = struct.pack( + "<" + str(PreTreatmentSubModes.NUM_OF_HD_PRE_TREATMENT_STATES.value + 1) + "i", + PreTreatmentSubModes.HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE.value, + 0, # 0 Water sample state + 0, # 1 Consumable self-tests state + 0, # 2 No cartridge self-tests state + 0, # 3 Consumable and cartridge installation state + 0, # 4 Self-tests when the cartridge is dry state + 0, # 5 Prime blood and dialysate circuits and run wet self-tests state + 0, # 6 Re-circulate blood and dialysate circuits state + PRE_TREATMENT_PAT_CONN_WAIT_FOR_UF_VOL_STATE.PRE_TREATMENT_PAT_CONN_WAIT_FOR_UF_VOL_STATE.value, # 7 Patient connection state + 0, + 0 + ) + self.demoSelection = 0 # Then wait for User + self.demoGroupCount = None # clear aggregate count + # ## START TREATMENT GROUP ----------------------------------------- elif self.demoSelection == 20: # Start Treatment @@ -907,10 +950,10 @@ venous_prs=self.venous_pressure_mmHg, blood_pump_occlusion=0, pressure_limit_state=0, - arterial_min_limt=arterial_pressure_mid_mmHg - ( self.demo_treatment_params.data_int[TreatmentParameters.TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW.value] / 2), - arterial_max_limt=arterial_pressure_mid_mmHg + ( self.demo_treatment_params.data_int[TreatmentParameters.TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW.value] / 2), - venous_min_limit=venous_pressure_mid_mmHg -( self.demo_treatment_params.data_int[TreatmentParameters.TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW.value] / 2), - venous_max_limit=venous_pressure_mid_mmHg + ( self.demo_treatment_params.data_int[TreatmentParameters.TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW.value] / 2), + arterial_min_limt=self.arterial_pressure_mid_mmHg - ( self.demo_treatment_params.data_int[TreatmentParameters.TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW.value] / 2), + arterial_max_limt=self.arterial_pressure_mid_mmHg + ( self.demo_treatment_params.data_int[TreatmentParameters.TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW.value] / 2), + venous_min_limit=self.venous_pressure_mid_mmHg -( self.demo_treatment_params.data_int[TreatmentParameters.TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW.value] / 2), + venous_max_limit=self.venous_pressure_mid_mmHg + ( self.demo_treatment_params.data_int[TreatmentParameters.TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW.value] / 2), arterial_long_filtered_pressure=self.arterial_pressure_mmHg, venous_long_filtered_pressure=self.venous_pressure_mmHg ) @@ -993,10 +1036,10 @@ venous_prs=self.venous_pressure_mmHg, blood_pump_occlusion=0, pressure_limit_state=0, - arterial_min_limt=arterial_pressure_mid_mmHg - ( self.demo_treatment_params.data_int[TreatmentParameters.TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW.value] / 2), - arterial_max_limt=arterial_pressure_mid_mmHg + ( self.demo_treatment_params.data_int[TreatmentParameters.TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW.value] / 2), - venous_min_limit=venous_pressure_mid_mmHg -( self.demo_treatment_params.data_int[TreatmentParameters.TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW.value] / 2), - venous_max_limit=venous_pressure_mid_mmHg + ( self.demo_treatment_params.data_int[TreatmentParameters.TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW.value] / 2), + arterial_min_limt=self.arterial_pressure_mid_mmHg - ( self.demo_treatment_params.data_int[TreatmentParameters.TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW.value] / 2), + arterial_max_limt=self.arterial_pressure_mid_mmHg + ( self.demo_treatment_params.data_int[TreatmentParameters.TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW.value] / 2), + venous_min_limit=self.venous_pressure_mid_mmHg -( self.demo_treatment_params.data_int[TreatmentParameters.TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW.value] / 2), + venous_max_limit=self.venous_pressure_mid_mmHg + ( self.demo_treatment_params.data_int[TreatmentParameters.TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW.value] / 2), arterial_long_filtered_pressure=self.arterial_pressure_mmHg, venous_long_filtered_pressure=self.venous_pressure_mmHg ) # MSG_ID_RTC_EPOCH @@ -2782,7 +2825,7 @@ payload += integer_to_bytearray(countdown) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id, - message_id=MsgIds.MSG_ID_HD_DRY_SELF_TEST_PROGRESS.value, + message_id=MsgIds.MSG_ID_HD_DRY_SELF_TEST_PROGRESS_DATA.value, payload=payload) self.can_interface.send(message, 0)