Index: HemodialysisDevice.py =================================================================== diff -u -rdc9c24e034cd5882cd437899199cc9c0834ef8c6 -rf1a95e42324e7f6da895039e4863db6af49bf0d2 --- HemodialysisDevice.py (.../HemodialysisDevice.py) (revision dc9c24e034cd5882cd437899199cc9c0834ef8c6) +++ HemodialysisDevice.py (.../HemodialysisDevice.py) (revision f1a95e42324e7f6da895039e4863db6af49bf0d2) @@ -41,7 +41,7 @@ \details For example: - hd_object = HD(can__interface='can0') or + hd_object = HD(can_interface='can0') or hd_object = HD('can0') """ # Create listener @@ -95,9 +95,9 @@ \returns 1 if logged in, 0 if log in failed """ - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_LOGIN_TO_HD, - payload=list(map(int, map(ord, self.HD_LOGIN_PASSWORD)))) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_LOGIN_TO_HD, + payload=list(map(int, map(ord, self.HD_LOGIN_PASSWORD)))) print("login") @@ -126,9 +126,9 @@ \returns 1 if successful, zero otherwise """ - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_MSG, - payload=msg) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_MSG, + payload=msg) print("insert HD message") @@ -180,9 +180,9 @@ sta = self.outer_instance.integer2ByteArray(state) payload = rst + sta - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_OFF_BUTTON_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_OFF_BUTTON_OVERRIDE, + payload=payload) print("override off button") @@ -218,9 +218,9 @@ sta = self.outer_instance.integer2ByteArray(state) payload = rst + sta - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_STOP_BUTTON_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_STOP_BUTTON_OVERRIDE, + payload=payload) print("override stop button") @@ -333,14 +333,14 @@ # register function to handle HD response to UF change requests if can_interface is not None: channel_id = DenaliChannels.hd_to_ui_ch_id - can_interface.registerReceivingPublicationFunction(channel_id, self.MSG_ID_UF_SETTINGS_CHANGE_RESPONSE_FROM_HD, - self.handlerUFChangeResponseFunction) - can_interface.registerReceivingPublicationFunction(channel_id, self.MSG_ID_TREATMENT_DURATION_SETTING_CHANGE_RESPONSE_FROM_HD, - self.handlerTreatmentDurationChangeResponseFunction) - can_interface.registerReceivingPublicationFunction(channel_id, self.MSG_ID_BLOOD_DIALYSATE_FLOW_SETTING_CHANGE_RESPONSE_FROM_HD, - self.handlerBloodAndDialysateChangeResponseFunction) - can_interface.registerReceivingPublicationFunction(channel_id, self.MSG_ID_HD_TREATMENT_PARAMS_RANGES, - self.handlerTreatmentParamRangesFunction) + can_interface.register_receiving_publication_function(channel_id, self.MSG_ID_UF_SETTINGS_CHANGE_RESPONSE_FROM_HD, + self.handlerUFChangeResponseFunction) + can_interface.register_receiving_publication_function(channel_id, self.MSG_ID_TREATMENT_DURATION_SETTING_CHANGE_RESPONSE_FROM_HD, + self.handlerTreatmentDurationChangeResponseFunction) + can_interface.register_receiving_publication_function(channel_id, self.MSG_ID_BLOOD_DIALYSATE_FLOW_SETTING_CHANGE_RESPONSE_FROM_HD, + self.handlerBloodAndDialysateChangeResponseFunction) + can_interface.register_receiving_publication_function(channel_id, self.MSG_ID_HD_TREATMENT_PARAMS_RANGES, + self.handlerTreatmentParamRangesFunction) # initialize variables that will be populated by treatment parameter ranges message self.MinTreatmentDurationMin = 0 @@ -509,8 +509,8 @@ payload = None - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_UI_CHECKIN_WITH_HD) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_UI_CHECKIN_WITH_HD) print("Sending UI checkin w/ HD") @@ -529,9 +529,9 @@ """ payload = self.outer_instance.integer2ByteArray(cmd) - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_UF_PAUSE_RESUME_REQUEST, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_UF_PAUSE_RESUME_REQUEST, + payload=payload) if cmd == self.UF_CMD_PAUSE: str_cmd = "pause" @@ -557,9 +557,9 @@ self.UFChangeResponse = None # build command message volume = self.outer_instance.float2ByteArray(vol * self.LITER_TO_ML_CONVERSION_FACTOR) - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_UF_SETTINGS_CHANGE_REQUEST_BY_USER, - payload=volume) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_UF_SETTINGS_CHANGE_REQUEST_BY_USER, + payload=volume) print("Sending UF settings change request.") @@ -584,9 +584,9 @@ volume = self.outer_instance.float2ByteArray(vol * self.LITER_TO_ML_CONVERSION_FACTOR) adjust = self.outer_instance.integer2ByteArray(adj) payload = volume + adjust - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_UF_SETTINGS_CHANGE_REQUEST_BY_USER, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_UF_SETTINGS_CHANGE_REQUEST_BY_USER, + payload=payload) print("Sending UF settings change request.") @@ -612,9 +612,9 @@ min = self.outer_instance.integer2ByteArray(tm) ufRate = self.outer_instance.float2ByteArray(rate) payload = resp + volume + min + ufRate - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_UF_SETTINGS_CHANGE_CONFIRMED_BY_USER, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_UF_SETTINGS_CHANGE_CONFIRMED_BY_USER, + payload=payload) print("Sending UF settings change confirmation.") @@ -633,9 +633,9 @@ """ payload = self.outer_instance.integer2ByteArray(timeMin) - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_TREATMENT_DURATION_SETTING_CHANGE_REQUEST, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_TREATMENT_DURATION_SETTING_CHANGE_REQUEST, + payload=payload) print("Sending treatment duration setting change request.") @@ -657,9 +657,9 @@ bld = self.outer_instance.integer2ByteArray(bloodFlow) dial = self.outer_instance.integer2ByteArray(dialFlow) payload = bld + dial - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_BLOOD_DIALYSATE_FLOW_SETTING_CHANGE_REQUEST_BY_USER, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_BLOOD_DIALYSATE_FLOW_SETTING_CHANGE_REQUEST_BY_USER, + payload=payload) print("Sending blood & dialysate flow rate settings change request.") @@ -704,9 +704,9 @@ tsk = self.outer_instance.integer2ByteArray(task) payload = rst + sta + tsk - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_WD_CHECKIN_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_WD_CHECKIN_OVERRIDE, + payload=payload) print("override watchdog task check-in state") @@ -780,17 +780,17 @@ if can_interface is not None: channel_id = DenaliChannels.hd_alarm_broadcast_ch_id msg_id = self.MSG_ID_HD_ALARMS_PUBLISHED_STATUS - can_interface.registerReceivingPublicationFunction(channel_id, msg_id, - self.handlerAlarmsStatusSyncFunction) + can_interface.register_receiving_publication_function(channel_id, msg_id, + self.handlerAlarmsStatusSyncFunction) channel_id = DenaliChannels.hd_alarm_broadcast_ch_id msg_id = self.MSG_ID_HD_ALARM_ACTIVATE - can_interface.registerReceivingPublicationFunction(channel_id, msg_id, - self.handlerAlarmActivateFunction) + can_interface.register_receiving_publication_function(channel_id, msg_id, + self.handlerAlarmActivateFunction) channel_id = DenaliChannels.hd_alarm_broadcast_ch_id msg_id = self.MSG_ID_HD_ALARM_CLEAR - can_interface.registerReceivingPublicationFunction(channel_id, msg_id, - self.handlerAlarmClearFunction) + can_interface.register_receiving_publication_function(channel_id, msg_id, + self.handlerAlarmClearFunction) # composite alarm status based on latest HD alarm status broadcast message self.alarmsState = 0 @@ -866,9 +866,9 @@ alm = self.outer_instance.integer2ByteArray(alarm) payload = rst + sta + alm - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_ALARM_STATE_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_ALARM_STATE_OVERRIDE, + payload=payload) print("override alarm state") @@ -905,9 +905,9 @@ alm = self.outer_instance.integer2ByteArray(alarm) payload = rst + ms + alm - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_ALARM_TIME_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_ALARM_TIME_OVERRIDE, + payload=payload) print("override alarm time since activated") @@ -950,9 +950,9 @@ pat = self.outer_instance.integer2ByteArray(pattern) payload = rst + pat - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_ALARM_LAMP_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_ALARM_LAMP_OVERRIDE, + payload=payload) print("override alarm lamp pattern") @@ -1012,8 +1012,8 @@ if can_interface is not None: channel_id = DenaliChannels.hd_sync_broadcast_ch_id msg_id = self.MSG_ID_RTC_EPOCH - can_interface.registerReceivingPublicationFunction(channel_id, msg_id, - self.handlerRTCEpoch) + can_interface.register_receiving_publication_function(channel_id, msg_id, + self.handlerRTCEpoch) self.RTCEpoch = 0 def handlerRTCEpoch(self, message): @@ -1042,9 +1042,9 @@ year = self.outer_instance.integer2ByteArray(years) payload = sec + min + hour + day + month + year - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_SET_RTC_DATE_TIME, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_SET_RTC_DATE_TIME, + payload=payload) print("Setting time and date to RTC") @@ -1056,8 +1056,8 @@ print(received_message) #str_res = str(flow) print("Time and Date in RTC set to seconds: " + str(sec) + " minutes: " + str(min) + " hours: " + - str(hour) + " days: " + str(day) + " months: " + str(month) + " years: " + str(year) + - str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) + str(hour) + " days: " + str(day) + " months: " + str(month) + " years: " + str(year) + + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: @@ -1111,8 +1111,8 @@ if can_interface is not None: channel_id = DenaliChannels.hd_sync_broadcast_ch_id msg_id = self.MSG_ID_HD_BLOOD_FLOW_PUBLISHED_DATA - can_interface.registerReceivingPublicationFunction(channel_id, msg_id, - self.handlerBloodFlowSyncFunction) + can_interface.register_receiving_publication_function(channel_id, msg_id, + self.handlerBloodFlowSyncFunction) self.TargetBloodFlowRate = 0 self.MeasuredBloodFlowRate = 0.0 @@ -1171,9 +1171,9 @@ flo = self.outer_instance.integer2ByteArray(flow) payload = rst + flo - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_BLOOD_FLOW_SET_RATE_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_BLOOD_FLOW_SET_RATE_OVERRIDE, + payload=payload) print("override blood flow set point") @@ -1209,9 +1209,9 @@ flo = self.outer_instance.float2ByteArray(flow) payload = rst + flo - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_BLOOD_FLOW_MEAS_RATE_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_BLOOD_FLOW_MEAS_RATE_OVERRIDE, + payload=payload) print("override measured blood flow") @@ -1247,9 +1247,9 @@ spd = self.outer_instance.float2ByteArray(speed) payload = rst + spd - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE, + payload=payload) print("override measured blood pump motor controller speed") @@ -1284,9 +1284,9 @@ cur = self.outer_instance.float2ByteArray(curr) payload = rst + cur - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_BLOOD_PUMP_MC_MEAS_CURRENT_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_BLOOD_PUMP_MC_MEAS_CURRENT_OVERRIDE, + payload=payload) print("override measured blood pump motor controller current") @@ -1322,9 +1322,9 @@ spd = self.outer_instance.float2ByteArray(speed) payload = rst + spd - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_BLOOD_PUMP_MEAS_SPEED_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_BLOOD_PUMP_MEAS_SPEED_OVERRIDE, + payload=payload) print("override measured blood pump speed") @@ -1360,9 +1360,9 @@ spd = self.outer_instance.float2ByteArray(speed) payload = rst + spd - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_BLOOD_PUMP_ROTOR_MEAS_SPEED_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_BLOOD_PUMP_ROTOR_MEAS_SPEED_OVERRIDE, + payload=payload) print("override measured blood pump rotor speed") @@ -1397,9 +1397,9 @@ mis = self.outer_instance.integer2ByteArray(ms) payload = rst + mis - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_BLOOD_FLOW_PUBLISH_INTERVAL_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_BLOOD_FLOW_PUBLISH_INTERVAL_OVERRIDE, + payload=payload) print("override blood flow broadcast interval") @@ -1468,8 +1468,8 @@ if can_interface is not None: channel_id = DenaliChannels.hd_sync_broadcast_ch_id msg_id = self.MSG_ID_HD_DIAL_IN_FLOW_PUBLISHED_DATA - can_interface.registerReceivingPublicationFunction(channel_id, msg_id, - self.handlerDialysateInletFlowSyncFunction) + can_interface.register_receiving_publication_function(channel_id, msg_id, + self.handlerDialysateInletFlowSyncFunction) self.TargetDialysateInletFlowRate = 0 self.MeasuredDialysateInletFlowRate = 0.0 @@ -1524,9 +1524,9 @@ flo = self.outer_instance.integer2ByteArray(flow) payload = rst + flo - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_DIAL_IN_FLOW_SET_RATE_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_DIAL_IN_FLOW_SET_RATE_OVERRIDE, + payload=payload) print("override dialysate flow set point") @@ -1562,9 +1562,9 @@ flo = self.outer_instance.float2ByteArray(flow) payload = rst + flo - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_DIAL_IN_FLOW_MEAS_RATE_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_DIAL_IN_FLOW_MEAS_RATE_OVERRIDE, + payload=payload) print("override measured dialysate flow") @@ -1600,9 +1600,9 @@ spd = self.outer_instance.float2ByteArray(speed) payload = rst + spd - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_DIAL_IN_PUMP_MC_MEAS_SPEED_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_DIAL_IN_PUMP_MC_MEAS_SPEED_OVERRIDE, + payload=payload) print("override measured dialysate inlet pump motor controller speed") @@ -1637,9 +1637,9 @@ cur = self.outer_instance.float2ByteArray(curr) payload = rst + cur - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_DIAL_IN_PUMP_MC_MEAS_CURRENT_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_DIAL_IN_PUMP_MC_MEAS_CURRENT_OVERRIDE, + payload=payload) print("override measured dialysate inlet pump motor controller current") @@ -1675,9 +1675,9 @@ spd = self.outer_instance.float2ByteArray(speed) payload = rst + spd - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_DIAL_IN_PUMP_MEAS_SPEED_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_DIAL_IN_PUMP_MEAS_SPEED_OVERRIDE, + payload=payload) print("override measured dialysate inlet pump speed") @@ -1713,9 +1713,9 @@ spd = self.outer_instance.float2ByteArray(speed) payload = rst + spd - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_DIAL_IN_PUMP_ROTOR_MEAS_SPEED_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_DIAL_IN_PUMP_ROTOR_MEAS_SPEED_OVERRIDE, + payload=payload) print("override measured dialysate inlet pump rotor speed") @@ -1750,9 +1750,9 @@ mis = self.outer_instance.integer2ByteArray(ms) payload = rst + mis - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_DIAL_IN_FLOW_PUBLISH_INTERVAL_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_DIAL_IN_FLOW_PUBLISH_INTERVAL_OVERRIDE, + payload=payload) print("override dialysate inlet flow broadcast interval") @@ -1823,8 +1823,8 @@ if can_interface is not None: channel_id = DenaliChannels.hd_sync_broadcast_ch_id msg_id = self.MSG_ID_HD_DIAL_OUT_FLOW_PUBLISHED_DATA - can_interface.registerReceivingPublicationFunction(channel_id, msg_id, - self.handlerDialysateOutletFlowSyncFunction) + can_interface.register_receiving_publication_function(channel_id, msg_id, + self.handlerDialysateOutletFlowSyncFunction) self.ReferenceDialysateOutletUFVolume = 0.0 self.MeasuredDialysateOutletUFVolume = 0.0 @@ -1879,9 +1879,9 @@ vol = self.outer_instance.float2ByteArray(refVol) payload = rst + vol - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_DIAL_OUT_UF_REF_VOLUME_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_DIAL_OUT_UF_REF_VOLUME_OVERRIDE, + payload=payload) print("override UF reference volume with " + str(refVol) + "mL.") @@ -1917,9 +1917,9 @@ vol = self.outer_instance.float2ByteArray(measVol) payload = rst + vol - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_DIAL_OUT_UF_MEAS_VOLUME_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_DIAL_OUT_UF_MEAS_VOLUME_OVERRIDE, + payload=payload) print("override measured UF volume with " + str(measVol) + " mL.") @@ -1955,9 +1955,9 @@ spd = self.outer_instance.float2ByteArray(speed) payload = rst + spd - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MeasuredDialysateOutletPumpMCSpeed, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MeasuredDialysateOutletPumpMCSpeed, + payload=payload) print("override measured dialysate outlet pump motor controller speed to " + str(spd) + " RPM.") @@ -1992,9 +1992,9 @@ cur = self.outer_instance.float2ByteArray(curr) payload = rst + cur - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_DIAL_OUT_PUMP_MC_MEAS_CURRENT_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_DIAL_OUT_PUMP_MC_MEAS_CURRENT_OVERRIDE, + payload=payload) print("override measured dialysate outlet pump motor controller current") @@ -2030,9 +2030,9 @@ spd = self.outer_instance.float2ByteArray(speed) payload = rst + spd - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_DIAL_OUT_PUMP_MEAS_SPEED_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_DIAL_OUT_PUMP_MEAS_SPEED_OVERRIDE, + payload=payload) print("override measured dialysate outlet pump speed to " + str(speed) + " RPM.") @@ -2068,9 +2068,9 @@ spd = self.outer_instance.float2ByteArray(speed) payload = rst + spd - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_DIAL_OUT_PUMP_ROTOR_MEAS_SPEED_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_DIAL_OUT_PUMP_ROTOR_MEAS_SPEED_OVERRIDE, + payload=payload) print("override measured dialysate outlet pump rotor speed to " + str(speed) + " RPM.") @@ -2105,9 +2105,9 @@ mis = self.outer_instance.integer2ByteArray(ms) payload = rst + mis - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_DIAL_OUT_FLOW_PUBLISH_INTERVAL_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_DIAL_OUT_FLOW_PUBLISH_INTERVAL_OVERRIDE, + payload=payload) print("override dialysate outlet flow broadcast interval to " + str(ms) + " ms.") @@ -2150,9 +2150,9 @@ sen = self.outer_instance.integer2ByteArray(sensor) payload = rst + spd + sen - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_DIAL_OUT_LOAD_CELL_WEIGHT_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_DIAL_OUT_LOAD_CELL_WEIGHT_OVERRIDE, + payload=payload) print("override measured load cell weight to " + str(weight) + " grams for load cell # " + str(sensor)) @@ -2191,9 +2191,9 @@ r2bb = self.outer_instance.float2ByteArray(r2b) payload = r1pb + r1bb + r2pb + r2bb - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_LOAD_CELL_READINGS, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_LOAD_CELL_READINGS, + payload=payload) print("measured load cell weights set.") @@ -2243,11 +2243,11 @@ if can_interface is not None: channel_id = DenaliChannels.hd_sync_broadcast_ch_id msg_id = self.MSG_ID_HD_TREATMENT_TIME_PUBLISHED_DATA - can_interface.registerReceivingPublicationFunction(channel_id, msg_id, - self.handlerTreatmentTimeSyncFunction) + can_interface.register_receiving_publication_function(channel_id, msg_id, + self.handlerTreatmentTimeSyncFunction) msg_id = self.MSG_ID_HD_TREATMENT_STATE_PUBLISHED_DATA - can_interface.registerReceivingPublicationFunction(channel_id, msg_id, - self.handlerTreatmentStateSyncFunction) + can_interface.register_receiving_publication_function(channel_id, msg_id, + self.handlerTreatmentStateSyncFunction) self.TreatmentTimePrescribed = 0 self.TreatmentTimeElapsed = 0 @@ -2341,8 +2341,8 @@ if can_interface is not None: channel_id = DenaliChannels.hd_sync_broadcast_ch_id msg_id = self.MSG_ID_HD_PRESSURE_OCCLUSION_DATA - can_interface.registerReceivingPublicationFunction(channel_id, msg_id, - self.handlerPresOcclSyncFunction) + can_interface.register_receiving_publication_function(channel_id, msg_id, + self.handlerPresOcclSyncFunction) self.arterialPressure = 0 self.venousPressure = 0.0 @@ -2390,9 +2390,9 @@ prs = self.outer_instance.float2ByteArray(pres) payload = rst + prs - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_PRESSURE_ARTERIAL_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_PRESSURE_ARTERIAL_OVERRIDE, + payload=payload) print("override measured arterial pressure") @@ -2424,7 +2424,7 @@ # # payload = seq1 + zero + seq2 + zero + seq3 + zero + seq4 + zero + seq5 # - # message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, + # message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, # message_id=6, # payload=payload) # @@ -2446,9 +2446,9 @@ prs = self.outer_instance.float2ByteArray(pres) payload = rst + prs - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_PRESSURE_VENOUS_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_PRESSURE_VENOUS_OVERRIDE, + payload=payload) print("override measured venous pressure") @@ -2482,9 +2482,9 @@ occ = self.outer_instance.float2ByteArray(occl) payload = rst + occ - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_OCCLUSION_BLOOD_PUMP_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_OCCLUSION_BLOOD_PUMP_OVERRIDE, + payload=payload) print("override measured blood pump occlusion pressure") @@ -2519,9 +2519,9 @@ occ = self.outer_instance.float2ByteArray(occl) payload = rst + occ - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_OCCLUSION_DIAL_IN_PUMP_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_OCCLUSION_DIAL_IN_PUMP_OVERRIDE, + payload=payload) print("override measured dialysate inlet pump occlusion pressure") @@ -2556,9 +2556,9 @@ occ = self.outer_instance.float2ByteArray(occl) payload = rst + occ - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_OCCLUSION_DIAL_OUT_PUMP_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_OCCLUSION_DIAL_OUT_PUMP_OVERRIDE, + payload=payload) print("override measured dialysate outlet pump occlusion pressure") @@ -2592,9 +2592,9 @@ mis = self.outer_instance.integer2ByteArray(ms) payload = rst + mis - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_PRES_OCCL_SEND_INTERVAL_OVERRIDE, - payload=payload) + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_HD_PRES_OCCL_SEND_INTERVAL_OVERRIDE, + payload=payload) print("override pressure/occlusion broadcast interval")