Index: DD_DateTime/loader.py =================================================================== diff -u -r2dadf8b01fa9cb57aa6fc936a6c2c4ff0adbc5e1 -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- DD_DateTime/loader.py (.../loader.py) (revision 2dadf8b01fa9cb57aa6fc936a6c2c4ff0adbc5e1) +++ DD_DateTime/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -32,7 +32,7 @@ super().__init__(os.path.dirname(__file__)) if self.can_interface is not None: - channel_id = CAN.DenaliChannels.ui_sync_broadcast_ch_id + channel_id = CAN.CanChannels.ui_sync_broadcast_ch_id dd_date_request_message_id = MsgIds.MSG_ID_DD_DATE_AND_TIME_REQUEST.value self.can_interface.register_receiving_publication_function(channel_id, dd_date_request_message_id, Index: GeneralResponseMessage/loader.py =================================================================== diff -u -r64d8a48a84b8b1bacd24876d1e49d77f8792fb72 -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- GeneralResponseMessage/loader.py (.../loader.py) (revision 64d8a48a84b8b1bacd24876d1e49d77f8792fb72) +++ GeneralResponseMessage/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -534,9 +534,9 @@ self._make_parameters_payload() if self.rbTD.isChecked(): - if channel_id == 0: channel_id=CAN.DenaliChannels.td_to_ui_ch_id + if channel_id == 0: channel_id=CAN.CanChannels.td_to_ui_ch_id else: - if channel_id == 0: channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id + if channel_id == 0: channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id self.td_interface.cmd_send_general_response( message_id, Index: MainTreatmentData/loader.py =================================================================== diff -u -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- MainTreatmentData/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) +++ MainTreatmentData/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -32,7 +32,7 @@ super().__init__(os.path.dirname(__file__)) if self.can_interface is not None: - channel_id = CAN.DenaliChannels.ui_to_td_ch_id + channel_id = CAN.CanChannels.ui_to_td_ch_id message_id = MsgIds.MSG_ID_UI_SOLUTION_INFUSION_REQUEST.value self.can_interface.register_receiving_publication_function(channel_id, message_id, Index: TD_Advanced_Institutional_Records/loader.py =================================================================== diff -u -rc188c445ebd056f3b15909ef9d994b78b9f752c2 -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- TD_Advanced_Institutional_Records/loader.py (.../loader.py) (revision c188c445ebd056f3b15909ef9d994b78b9f752c2) +++ TD_Advanced_Institutional_Records/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -33,7 +33,7 @@ self.index = 0 if self.can_interface is not None: - channel_id = CAN.DenaliChannels.ui_to_td_ch_id + channel_id = CAN.CanChannels.ui_to_td_ch_id request_message_id = MsgIds.MSG_ID_TD_ADVANCED_INSTITUTIONAL_RECORD_REQUEST.value adjust_request_message_id = MsgIds.MSG_ID_TD_ADVANCED_ADJUST_INSTITUTIONAL_RECORD_REQUEST.value self.can_interface.register_receiving_publication_function(channel_id, Index: TD_BloodPrime/loader.py =================================================================== diff -u -rc6aa11b8a4a60886c17e4d3d2c0166c6160f1053 -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- TD_BloodPrime/loader.py (.../loader.py) (revision c6aa11b8a4a60886c17e4d3d2c0166c6160f1053) +++ TD_BloodPrime/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -33,7 +33,7 @@ if self.can_interface is not None: self.can_interface.register_receiving_publication_function( - CAN.DenaliChannels.ui_to_td_ch_id, + CAN.CanChannels.ui_to_td_ch_id, MsgIds.MSG_ID_UI_BLOOD_PRIME_CMD_REQUEST.value, self.handle_cmd_request) Index: TD_DateTime/loader.py =================================================================== diff -u -r2dadf8b01fa9cb57aa6fc936a6c2c4ff0adbc5e1 -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- TD_DateTime/loader.py (.../loader.py) (revision 2dadf8b01fa9cb57aa6fc936a6c2c4ff0adbc5e1) +++ TD_DateTime/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -32,7 +32,7 @@ super().__init__(os.path.dirname(__file__)) if self.can_interface is not None: - channel_id = CAN.DenaliChannels.ui_to_td_ch_id + channel_id = CAN.CanChannels.ui_to_td_ch_id td_date_request_message_id = MsgIds.MSG_ID_TD_DATE_AND_TIME_REQUEST.value self.can_interface.register_receiving_publication_function(channel_id, td_date_request_message_id, Index: TD_End_Treatment/loader.py =================================================================== diff -u -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- TD_End_Treatment/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) +++ TD_End_Treatment/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -31,7 +31,7 @@ super().__init__(os.path.dirname(__file__)) if self.can_interface is not None: - channel_id = CAN.DenaliChannels.ui_to_td_ch_id + channel_id = CAN.CanChannels.ui_to_td_ch_id message_id = MsgIds.MSG_ID_TD_END_TREATMENT_REQUEST.value self.can_interface.register_receiving_publication_function(channel_id, message_id, Index: TD_Heparin/loader.py =================================================================== diff -u -r68d15a320f8c682176d3109bac7823ebae6cdaff -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- TD_Heparin/loader.py (.../loader.py) (revision 68d15a320f8c682176d3109bac7823ebae6cdaff) +++ TD_Heparin/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -32,7 +32,7 @@ super().__init__(os.path.dirname(__file__)) if self.can_interface is not None: - channel_id = CAN.DenaliChannels.ui_to_td_ch_id + channel_id = CAN.CanChannels.ui_to_td_ch_id heparin_request_message_id = MsgIds.MSG_ID_TD_HEPARIN_REQUEST.value self.can_interface.register_receiving_publication_function(channel_id, heparin_request_message_id, Index: TD_Institutional_Records/loader.py =================================================================== diff -u -rbda66a764f858a5d80fb5c26dff2097bab871090 -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- TD_Institutional_Records/loader.py (.../loader.py) (revision bda66a764f858a5d80fb5c26dff2097bab871090) +++ TD_Institutional_Records/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -33,7 +33,7 @@ self.index = 0 if self.can_interface is not None: - channel_id = CAN.DenaliChannels.ui_to_td_ch_id + channel_id = CAN.CanChannels.ui_to_td_ch_id request_message_id = MsgIds.MSG_ID_TD_INSTITUTIONAL_RECORD_REQUEST.value adjust_request_message_id = MsgIds.MSG_ID_TD_ADJUST_INSTITUTIONAL_RECORD_REQUEST.value self.can_interface.register_receiving_publication_function(channel_id, Index: TD_Post_Treatment/loader.py =================================================================== diff -u -rbbd8740f52c6c5dfea4883b7a346901cd59f7083 -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- TD_Post_Treatment/loader.py (.../loader.py) (revision bbd8740f52c6c5dfea4883b7a346901cd59f7083) +++ TD_Post_Treatment/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -32,7 +32,7 @@ super().__init__(os.path.dirname(__file__)) if self.can_interface is not None: - channel_id = CAN.DenaliChannels.ui_to_td_ch_id + channel_id = CAN.CanChannels.ui_to_td_ch_id self.can_interface.register_receiving_publication_function(channel_id, MsgIds.MSG_ID_UI_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_REQUEST.value, self.handle_eject_request) Index: TD_Pre_Treatment/loader.py =================================================================== diff -u -r5834e4d46013d721aef8d1c81167321824403d0c -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- TD_Pre_Treatment/loader.py (.../loader.py) (revision 5834e4d46013d721aef8d1c81167321824403d0c) +++ TD_Pre_Treatment/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -35,7 +35,7 @@ super().__init__(os.path.dirname(__file__)) if self.can_interface is not None: - channel_id = CAN.DenaliChannels.ui_to_td_ch_id + channel_id = CAN.CanChannels.ui_to_td_ch_id create_tx_request_message_id = MsgIds.MSG_ID_UI_INITIATE_TREATMENT_WORKFLOW.value self.can_interface.register_receiving_publication_function(channel_id, create_tx_request_message_id, Index: TD_Pressures/loader.py =================================================================== diff -u -r544e283f389cb9f3e54359c06efffb4daf92e9fc -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- TD_Pressures/loader.py (.../loader.py) (revision 544e283f389cb9f3e54359c06efffb4daf92e9fc) +++ TD_Pressures/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -31,7 +31,7 @@ self.can_interface = self.td_interface.can_interface super().__init__(os.path.dirname(__file__)) if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(CAN.DenaliChannels.ui_to_td_ch_id, + self.can_interface.register_receiving_publication_function(CAN.CanChannels.ui_to_td_ch_id, MsgIds.MSG_ID_UI_PRESSURE_LIMIT_WIDEN_REQUEST.value, self.handle_pressures_widen_request) Index: TD_Recirculate/loader.py =================================================================== diff -u -r6c34ddad466a250ba7a0d66091c372c37897a629 -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- TD_Recirculate/loader.py (.../loader.py) (revision 6c34ddad466a250ba7a0d66091c372c37897a629) +++ TD_Recirculate/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -32,7 +32,7 @@ if self.can_interface is not None: self.can_interface.register_receiving_publication_function( - CAN.DenaliChannels.ui_to_td_ch_id, + CAN.CanChannels.ui_to_td_ch_id, MsgIds.MSG_ID_UI_RECIRCULATE_REQUEST.value, self.handle_recirculate_cmd_request) Index: TD_Rinseback/loader.py =================================================================== diff -u -r888d30a914d3a6bae125b8c564f48d53762b0c26 -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- TD_Rinseback/loader.py (.../loader.py) (revision 888d30a914d3a6bae125b8c564f48d53762b0c26) +++ TD_Rinseback/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -32,7 +32,7 @@ if self.can_interface is not None: self.can_interface.register_receiving_publication_function( - CAN.DenaliChannels.ui_to_td_ch_id, + CAN.CanChannels.ui_to_td_ch_id, MsgIds.MSG_ID_UI_RINSEBACK_CMD_REQUEST.value, self.handle_rinseback_cmd_request) Index: TD_TreatmentAdjustmentsBolusVolume/loader.py =================================================================== diff -u -r85dcfe80f3e4c9d51423fa66d98647f83ebcd85c -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- TD_TreatmentAdjustmentsBolusVolume/loader.py (.../loader.py) (revision 85dcfe80f3e4c9d51423fa66d98647f83ebcd85c) +++ TD_TreatmentAdjustmentsBolusVolume/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -33,7 +33,7 @@ if self.can_interface is not None: self.can_interface.register_receiving_publication_function( - CAN.DenaliChannels.ui_to_td_ch_id, + CAN.CanChannels.ui_to_td_ch_id, MsgIds.MSG_ID_UI_BOLUS_VOLUME_CHANGE_REQUEST.value, self.handle_bolus_adjustments_request) Index: TD_TreatmentAdjustmentsDuration/loader.py =================================================================== diff -u -r3f68dea5e1d134194d637125d6217f74f4c05561 -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- TD_TreatmentAdjustmentsDuration/loader.py (.../loader.py) (revision 3f68dea5e1d134194d637125d6217f74f4c05561) +++ TD_TreatmentAdjustmentsDuration/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -33,11 +33,11 @@ if self.can_interface is not None: self.can_interface.register_receiving_publication_function( - CAN.DenaliChannels.ui_to_td_ch_id, + CAN.CanChannels.ui_to_td_ch_id, MsgIds.MSG_ID_UI_DURATION_VALIDATE_REQUEST.value, self.handle_duration_edit_request) self.can_interface.register_receiving_publication_function( - CAN.DenaliChannels.ui_to_td_ch_id, + CAN.CanChannels.ui_to_td_ch_id, MsgIds.MSG_ID_UI_DURATION_CONFIRM_REQUEST.value, self.handle_duration_confirm_request) Index: TD_TreatmentAdjustmentsIsolatedUF/loader.py =================================================================== diff -u -rae1930d3e2a41d3862a9e77e4607aaf6b896665e -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- TD_TreatmentAdjustmentsIsolatedUF/loader.py (.../loader.py) (revision ae1930d3e2a41d3862a9e77e4607aaf6b896665e) +++ TD_TreatmentAdjustmentsIsolatedUF/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -33,15 +33,15 @@ if self.can_interface is not None: self.can_interface.register_receiving_publication_function( - CAN.DenaliChannels.ui_to_td_ch_id, + CAN.CanChannels.ui_to_td_ch_id, MsgIds.MSG_ID_UI_ISOLATED_UF_DURATION_CHANGE_REQUEST.value, self.handle_duration_request) self.can_interface.register_receiving_publication_function( - CAN.DenaliChannels.ui_to_td_ch_id, + CAN.CanChannels.ui_to_td_ch_id, MsgIds.MSG_ID_UI_ISOLATED_UF_VOLUME_GOAL_CHANGE_REQUEST.value, self.handle_volume_request) self.can_interface.register_receiving_publication_function( - CAN.DenaliChannels.ui_to_td_ch_id, + CAN.CanChannels.ui_to_td_ch_id, MsgIds.MSG_ID_UI_ISOLATED_UF_CONFIRM_REQUEST.value, self.handle_confirm_request) Index: TD_TreatmentAdjustmentsPressures/loader.py =================================================================== diff -u -r49bdede052d4f1e3288afadde2e181303733bff9 -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- TD_TreatmentAdjustmentsPressures/loader.py (.../loader.py) (revision 49bdede052d4f1e3288afadde2e181303733bff9) +++ TD_TreatmentAdjustmentsPressures/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -33,7 +33,7 @@ if self.can_interface is not None: self.can_interface.register_receiving_publication_function( - CAN.DenaliChannels.ui_to_td_ch_id, + CAN.CanChannels.ui_to_td_ch_id, MsgIds.MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST.value, self.handle_pressure_adjustments_request) Index: TD_TreatmentAdjustmentsSetPoints/loader.py =================================================================== diff -u -r49bdede052d4f1e3288afadde2e181303733bff9 -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- TD_TreatmentAdjustmentsSetPoints/loader.py (.../loader.py) (revision 49bdede052d4f1e3288afadde2e181303733bff9) +++ TD_TreatmentAdjustmentsSetPoints/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -33,19 +33,19 @@ if self.can_interface is not None: self.can_interface.register_receiving_publication_function( - CAN.DenaliChannels.ui_to_td_ch_id, + CAN.CanChannels.ui_to_td_ch_id, MsgIds.MSG_ID_UI_TREATMENT_SET_POINTS_CHANGE_REQUEST.value, self.handle_set_points_change_request) self.can_interface.register_receiving_publication_function( - CAN.DenaliChannels.ui_to_td_ch_id, + CAN.CanChannels.ui_to_td_ch_id, MsgIds.MSG_ID_UI_TREATMENT_SET_POINT_BLOOD_FLOW_CHANGE_REQUEST.value, self.handle_blood_flow_change_request) self.can_interface.register_receiving_publication_function( - CAN.DenaliChannels.ui_to_td_ch_id, + CAN.CanChannels.ui_to_td_ch_id, MsgIds.MSG_ID_UI_TREATMENT_SET_POINT_DIALYSATE_FLOW_CHANGE_REQUEST.value, self.handle_dialysate_flow_change_request) self.can_interface.register_receiving_publication_function( - CAN.DenaliChannels.ui_to_td_ch_id, + CAN.CanChannels.ui_to_td_ch_id, MsgIds.MSG_ID_UI_TREATMENT_SET_POINT_DIALYSATE_TEMPERATURE_CHANGE_REQUEST.value, self.handle_dialysate_temperature_change_request) Index: TD_TreatmentAdjustmentsUltrafiltration/loader.py =================================================================== diff -u -r6096978cdce08be0b604f9e5653d8608e624111e -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- TD_TreatmentAdjustmentsUltrafiltration/loader.py (.../loader.py) (revision 6096978cdce08be0b604f9e5653d8608e624111e) +++ TD_TreatmentAdjustmentsUltrafiltration/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -33,15 +33,15 @@ if self.can_interface is not None: self.can_interface.register_receiving_publication_function( - CAN.DenaliChannels.ui_to_td_ch_id, + CAN.CanChannels.ui_to_td_ch_id, MsgIds.MSG_ID_UI_UF_PAUSE_RESUME_REQUEST.value, self.handle_pause_resume_request) self.can_interface.register_receiving_publication_function( - CAN.DenaliChannels.ui_to_td_ch_id, + CAN.CanChannels.ui_to_td_ch_id, MsgIds.MSG_ID_UI_ULTRAFILTRATION_VOLUME_TO_VALIDATE.value, self.handle_settings_change_request) self.can_interface.register_receiving_publication_function( - CAN.DenaliChannels.ui_to_td_ch_id, + CAN.CanChannels.ui_to_td_ch_id, MsgIds.MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE_REQUEST.value, self.handle_confirm_request) Index: TD_Vitals/loader.py =================================================================== diff -u -r8cc5de416e6f750c91b06e91060efbce93d789bc -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- TD_Vitals/loader.py (.../loader.py) (revision 8cc5de416e6f750c91b06e91060efbce93d789bc) +++ TD_Vitals/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -31,7 +31,7 @@ super().__init__(os.path.dirname(__file__)) if self.can_interface is not None: - channel_id = CAN.DenaliChannels.ui_to_td_ch_id + channel_id = CAN.CanChannels.ui_to_td_ch_id vitals_request_message_id = MsgIds.MSG_ID_UI_BLOOD_PRESSURE_REQUEST.value self.can_interface.register_receiving_publication_function(channel_id, vitals_request_message_id, Index: TD_WaterSample/loader.py =================================================================== diff -u -r4e3111e2b0ca213027dfd6c86546b97a1df1d81e -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- TD_WaterSample/loader.py (.../loader.py) (revision 4e3111e2b0ca213027dfd6c86546b97a1df1d81e) +++ TD_WaterSample/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -32,7 +32,7 @@ self.index = 0 if self.can_interface is not None: - channel_id = CAN.DenaliChannels.ui_to_td_ch_id + channel_id = CAN.CanChannels.ui_to_td_ch_id request_message_id = MsgIds.MSG_ID_UI_WATER_SAMPLE_RESULT_REQUEST.value self.can_interface.register_receiving_publication_function(channel_id, request_message_id, Index: Trends/loader.py =================================================================== diff -u -r2818663f5c66c2ca73ab8d6fadc2040c332bc1df -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- Trends/loader.py (.../loader.py) (revision 2818663f5c66c2ca73ab8d6fadc2040c332bc1df) +++ Trends/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -37,7 +37,7 @@ if self.can_interface is not None: self.can_interface.register_receiving_publication_function( - CAN.DenaliChannels.ui_to_td_ch_id, + CAN.CanChannels.ui_to_td_ch_id, MsgIds.MSG_ID_UI_BLOOD_PRESSURE_REQUEST.value, self.handle_vitals_request)