Index: dialin/ui/hd_simulator.py =================================================================== diff -u -r1e9de03223eeeec426716c6157ce88ddd60e4d5a -r691116a693026e10fdaf825d77107e1587ba66e9 --- dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 1e9de03223eeeec426716c6157ce88ddd60e4d5a) +++ dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 691116a693026e10fdaf825d77107e1587ba66e9) @@ -27,8 +27,8 @@ from math import copysign import threading as threads_here from time import time, sleep -from . import dd_ui_request_handler as uim -from . import dd_selection_handler as sel +from . import dd_ui_request_handler as uiHandler +from . import dd_selection_handler as demoSelctionHandler from . import pressure_ranges as pr def catch_exception(f): @@ -94,6 +94,7 @@ HDSimulator.instance_count = HDSimulator.instance_count + 1 + self.params = None self.demoCounter = 0 self.demoCount = 1 self.demoGroupCounter = 0 @@ -111,7 +112,7 @@ self.dialysate_flow_measured_ml_per_min = 229.9 # simulation self.dialysate_flow_set_point_ml_per_min = 250 # setting self.arterial_pressure_mmHg = -80.8 # simulation - self.arterial_pressure_mid_mmHg = -118.9 # setting + self.arterial_pressure_mid_mmHg = -118.9 # setting self.venous_pressure_mmHg = 213.3 # simulation self.venous_pressure_mid_mmHg = 185.2 # param self.treatment_time_sec = 60 * 100 # setting @@ -266,95 +267,94 @@ print(".", end='') else: print("generic handler:", MsgIds(msg_id).name, message) - params = self.get_message_list_data(message) # convert payload data + self.params = self.get_message_list_data(message) # convert payload data # UI RESET -------------------------------------------------------- if msg_id == MsgIds.MSG_ID_UI_POST_FINAL_TEST_RESULT.value: - rsp_id, rsp_payload = uim.ui_post_final_test_result(self, params) + rsp_id, rsp_payload = uiHandler.ui_post_final_test_result(self) # RESET/JUMP FORWARD DIALOG HANDLER ------------------------------- if (msg_id == MsgIds.MSG_ID_UI_CONFIRMATION_RESULT_RESPONSE.value) and \ - (params.data_int[0] == 99) and \ - (params.data_int[1] == EResponse.Accepted): # TBD! Use const for 99 - rsp_id, rsp_payload = uim.ui_confirmation_result_response_99(self, params) + (self.params.data_int[0] == 99) and \ + (self.params.data_int[1] == EResponse.Accepted): # TBD! Use const for 99 + rsp_id, rsp_payload = uiHandler.ui_confirmation_result_response_99(self) elif (msg_id == MsgIds.MSG_ID_UI_CONFIRMATION_RESULT_RESPONSE.value) and \ - (params.data_int[0] == 98): - rsp_id, rsp_payload = uim.ui_confirmation_result_98(self, params) + (self.params.data_int[0] == 98): + rsp_id, rsp_payload = uiHandler.ui_confirmation_result_98(self) elif (msg_id == MsgIds.MSG_ID_UI_CONFIRMATION_RESULT_RESPONSE.value) and \ - (params.data_int[0] == 6): - rsp_id, rsp_payload = uim.ui_confirmation_result_response_6(self, params) + (self.params.data_int[0] == 6): + rsp_id, rsp_payload = uiHandler.ui_confirmation_result_response_6(self) - # SERVICE MODE elif msg_id == MsgIds.MSG_ID_UI_SERVICE_MODE_REQUEST.value: # 0xB0 - rsp_id, rsp_payload = uim.ui_service_mode_request(self, params) + rsp_id, rsp_payload = uiHandler.ui_service_mode_request(self) # INITIATE A NEW TREATMENT SETUP ---------------------------------- elif msg_id == MsgIds.MSG_ID_UI_INITIATE_TREATMENT_REQUEST.value: - rsp_id, rsp_payload = uim.ui_initiate_treatment_request(self, params) + rsp_id, rsp_payload = uiHandler.ui_initiate_treatment_request(self) elif msg_id == MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS_REQUEST.value: - rsp_id, rsp_payload = uim.ui_new_treatment_params_request(self, params) + rsp_id, rsp_payload = uiHandler.ui_new_treatment_params_request(self) elif msg_id == MsgIds.MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS_REQUEST.value: - rsp_id, rsp_payload = uim.ui_user_confirm_treatment_request(self, params) + rsp_id, rsp_payload = uiHandler.ui_user_confirm_treatment_request(self) # WATER SAMPLING -------------------------------------------------- elif msg_id == MsgIds.MSG_ID_UI_SAMPLE_WATER_RESULT.value: # sample water completed, prime filter... - rsp_id, rsp_payload = uim.ui_sample_water_result(self, params) + rsp_id, rsp_payload = uiHandler.ui_sample_water_result(self) # PRETREATMENT INSTALL AND TESTS --------------------------------- elif msg_id == MsgIds.MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM_REQUEST.value: - rsp_id, rsp_payload = uim.ui_consumable_install_confirm_request(self, params) + rsp_id, rsp_payload = uiHandler.ui_consumable_install_confirm_request(self) elif msg_id == MsgIds.MSG_ID_UI_INSTALLATION_CONFIRM_REQUEST.value: - rsp_id, rsp_payload = uim.ui_installation_confirm_request(self, params) + rsp_id, rsp_payload = uiHandler.ui_installation_confirm_request(self) elif msg_id == MsgIds.MSG_ID_UI_START_PRIME_REQUEST.value: # _60 x3C 'Start Prime' - rsp_id, rsp_payload = uim.ui_start_prime_request(self, params) + rsp_id, rsp_payload = uiHandler.ui_start_prime_request(self) # TREATMENT: PATIENT CONNECT -------------------------------------- elif msg_id == MsgIds.MSG_ID_UI_PATIENT_CONNECTION_BEGIN_REQUEST.value: # 100 x64 'Continue' Priming Complete - rsp_id, rsp_payload = uim.ui_patient_connection_begin_request(self, params) + rsp_id, rsp_payload = uiHandler.ui_patient_connection_begin_request(self) elif msg_id == MsgIds.MSG_ID_UI_SET_UF_VOLUME_PARAMETER_REQUEST.value: # _79 x4F - rsp_id, rsp_payload = uim.ui_set_uf_volume_parameter_request(self, params) + rsp_id, rsp_payload = uiHandler.ui_set_uf_volume_parameter_request(self) elif msg_id == MsgIds.MSG_ID_UI_PATIENT_CONNECTION_CONFIRM_REQUEST.value: # 102 x66 - rsp_id, rsp_payload = uim.ui_patient_connection_confirm_request(self, params) + rsp_id, rsp_payload = uiHandler.ui_patient_connection_confirm_request(self) elif msg_id == MsgIds.MSG_ID_UI_START_TREATMENT_REQUEST.value: # 113 x71 - rsp_id, rsp_payload = uim.ui_start_treatment_request(self, params) + rsp_id, rsp_payload = uiHandler.ui_start_treatment_request(self) # DIALYSIS --------------------------------------------------- elif msg_id == MsgIds.MSG_ID_USER_TREATMENT_TIME_CHANGE_REQUEST.value: # _22 x16 - rsp_id, rsp_payload = uim.ui_user_treatment_time_change_request(self, params) + rsp_id, rsp_payload = uiHandler.ui_user_treatment_time_change_request(self) elif msg_id == MsgIds.MSG_ID_USER_SALINE_BOLUS_REQUEST.value: # _18 x12 - rsp_id, rsp_payload = uim.ui_user_saline_bolus_request(self, params) + rsp_id, rsp_payload = uiHandler.ui_user_saline_bolus_request(self) elif msg_id == MsgIds.MSG_ID_UI_HEPARIN_PAUSE_RESUME_REQUEST.value: # _.. x4B - rsp_id, rsp_payload = uim.ui_heparin_pause_resume_request(self, params) + rsp_id, rsp_payload = uiHandler.ui_heparin_pause_resume_request(self) elif msg_id == MsgIds.MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST.value: # _70 x46 - rsp_id, rsp_payload = uim.ui_pressure_limits_change_request(self, params) + rsp_id, rsp_payload = uiHandler.ui_pressure_limits_change_request(self) elif msg_id == MsgIds.MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_REQUEST.value: # _70 x46 - rsp_id, rsp_payload = uim.ui_user_blood_dial_rate_change_request(self, params) + rsp_id, rsp_payload = uiHandler.ui_user_blood_dial_rate_change_request(self) # RINSEBACK ------------------------- elif msg_id == MsgIds.MSG_ID_UI_RINSEBACK_CMD_REQUEST.value: # _82 x52 - rsp_id, rsp_payload = uim.ui_rinseback_cmd_request(self, params) + rsp_id, rsp_payload = uiHandler.ui_rinseback_cmd_request(self) elif msg_id == MsgIds.MSG_ID_UI_TREATMENT_LOG_DATA_REQUEST.value: # _74 x4A self._send_treatment_log() elif msg_id == MsgIds.MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM_REQUEST.value: # 115 x73 - rsp_id, rsp_payload = uim.ui_displosal_removal_confirm_request(self, params) + rsp_id, rsp_payload = uiHandler.ui_displosal_removal_confirm_request(self) elif msg_id == MsgIds.MSG_ID_UI_POST_TX_NEXT_REQUEST.value: # 0x6 - rsp_id, rsp_payload = uim.ui_post_tx_next_request(self, params) + rsp_id, rsp_payload = uiHandler.ui_post_tx_next_request(self) # # -------------------------------------------------- @@ -405,72 +405,72 @@ self.demoTimedIncValue += 1 # RESET INIT TO STANDBY ------------------------------------------- if self.demoSelection == 1: # TBD Reset to start INIT - rsp_id, rsp_payload = sel.reset(self) + rsp_id, rsp_payload = demoSelctionHandler.reset(self) elif self.demoSelection == 2: # TBD Auto transit to standby - rsp_id, rsp_payload = sel.auto_transit_to_standby(self) + rsp_id, rsp_payload = demoSelctionHandler.auto_transit_to_standby(self) # PRETREATMENT ---------------------------------------------------- elif self.demoSelection == 4: # = PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_COMPLETE_STATE.value: self.demoSelection = 7 # TBD! setup event to change to else: pass # repeat this selection elif self.demoSelection == 7: # No Cartridge Self Tests - rsp_id, rsp_payload = sel.cartridge_self_test(self) + rsp_id, rsp_payload = demoSelctionHandler.cartridge_self_test(self) elif self.demoSelection == 8: # Cartridge Installation - rsp_id, rsp_payload = sel.cartridge_installation(self) + rsp_id, rsp_payload = demoSelctionHandler.cartridge_installation(self) elif self.demoSelection == 9: # Dry Self Tests; init by MSG_ID_UI_INSTALLATION_CONFIRM - rsp_id, rsp_payload = sel.dry_self_test(self) + rsp_id, rsp_payload = demoSelctionHandler.dry_self_test(self) # DIALYSATE PRIME CIRCUITS ---------------------------------------- elif self.demoSelection == 10: # Prime circuits with dialysate - rsp_id, rsp_payload = sel.prime_circuits_with_dialysate(self) + rsp_id, rsp_payload = demoSelctionHandler.prime_circuits_with_dialysate(self) elif self.demoSelection == 11: # Recirculate primed circuits - rsp_id, rsp_payload = sel.recirculate_primed_circuits_1(self) + rsp_id, rsp_payload = demoSelctionHandler.recirculate_primed_circuits_1(self) elif self.demoSelection == 12: # Recirculate primed circuits - rsp_id, rsp_payload = sel.recirculate_primed_circuits_2(self) + rsp_id, rsp_payload = demoSelctionHandler.recirculate_primed_circuits_2(self) # ## START TREATMENT GROUP ----------------------------------------- elif self.demoSelection == 20: # Start Treatment - rsp_id, rsp_payload = sel.start_treatment(self) + rsp_id, rsp_payload = demoSelctionHandler.start_treatment(self) elif self.demoSelection == 21: # Blood Prime - rsp_id, rsp_payload = sel.blood_prime(self) + rsp_id, rsp_payload = demoSelctionHandler.blood_prime(self) ## DIALYSIS GROUP ------------------------------------------------- elif self.demoSelection == 22: # Dialysis - rsp_id, rsp_payload = sel.start_dialysis(self) + rsp_id, rsp_payload = demoSelctionHandler.start_dialysis(self) elif self.demoSelection == 29: # Enter/Return to normal UF Dialysis - rsp_id, rsp_payload = sel.enter_normal_uf(self) + rsp_id, rsp_payload = demoSelctionHandler.enter_normal_uf(self) elif self.demoSelection >= 30 and self.demoSelection < 40 : # Dialysis Data Update ---------------- - rsp_id, rsp_payload = sel.dialysis_data_update(self) + rsp_id, rsp_payload = demoSelctionHandler.dialysis_data_update(self) ## RINSEBACK GROUP ------------------------------------------------- elif (self.demoSelection >= 40) and (self.demoSelection < 50): - rsp_id, rsp_payload = sel.rinseback(self) + rsp_id, rsp_payload = demoSelctionHandler.rinseback(self) elif self.demoSelection == 60: - rsp_id, rsp_payload = sel.confirmation_request(self) + rsp_id, rsp_payload = demoSelctionHandler.confirmation_request(self) elif self.demoSelection == 61: - rsp_id, rsp_payload = sel.op_mode_data(self) + rsp_id, rsp_payload = demoSelctionHandler.op_mode_data(self) elif self.demoSelection == 100: - rsp_id, rsp_payload = sel.wait_for_disinfect_state(self) + rsp_id, rsp_payload = demoSelctionHandler.wait_for_disinfect_state(self) # x94 MSG_ID_HD_TREATMENT_LOG_PERIODIC_DATA, # 1, 2,