Index: dialin/hd/ui_proxy.py =================================================================== diff -u -r812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3 -r18cb5700a5a453ebe26d51c1ef742085deec139d --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 812bbf1e5b3b2f1c4f5cfbef1264787e18afb5c3) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 18cb5700a5a453ebe26d51c1ef742085deec139d) @@ -123,7 +123,7 @@ self._handler_treatment_param_ranges) self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, MsgIds.MSG_ID_HD_VERSION.value, self._handler_hd_version) - self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS.value, + self.can_interface.register_receiving_publication_function(DenaliChannels.ui_to_hd_ch_id, MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS.value, self._handler_treatment_param_settings) self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, MsgIds.MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE.value, self._handler_treatment_param_settings_response) @@ -628,7 +628,7 @@ F32 Heparin bolus volume. \n F32 dialysate temperature. \n - @return: none + @return: None """ bld = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) @@ -727,7 +727,7 @@ U32 Reject reason code for Heparin bolus volume (0=valid). \n U32 Reject reason code for dialysate temperature (0=valid). \n - @return: none + @return: None """ val = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) @@ -808,7 +808,7 @@ U32 Minimum dialysate flow rate (in mL/min). \n U32 Maximum dialysate flow rate (in mL/min). - @return: none + @return: None """ mintime = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) @@ -844,7 +844,7 @@ U32 Reject reason (if not accepted) \n U32 Saline bolus volume (mL) - @return: none + @return: None """ rsp = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) @@ -877,7 +877,7 @@ U32 treatment duration (min) \n F32 UF volue (mL) \n - @return: none + @return: None """ rsp = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) @@ -910,7 +910,7 @@ U32 Blood flow rate (mL/min) \n U32 Dialysate flow rate (mL/min) \n - @return: none + @return: None """ rsp = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) @@ -953,7 +953,7 @@ F32 UF Rate (mL/min) \n F32 UF Rate Change (mL/min) - @return: none + @return: None """ rsp = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) @@ -1064,7 +1064,7 @@ @param cmd: 0 for pause, 1 for resume - @return: none + @return: None """ payload = integer_to_bytearray(cmd) @@ -1080,15 +1080,13 @@ self.can_interface.send(message, 0) - return 0 - def cmd_ui_uf_settings_change_request(self, vol=0.0): """ Constructs and sends a ui UF change settings command message @param vol: (float) new ultrafiltration volume setting (in L) - @return: none + @return: None """ # reset response to this command so we can tell when response is received @@ -1103,16 +1101,14 @@ self.can_interface.send(message, 0) - return 0 - def cmd_ui_uf_settings_change_confirm(self, vol=0.0, adj=UF_CMD_CHANGE_TIME_TO_ADJUST): """ Constructs and sends a ui UF change settings command message @param vol: (float) new ultrafiltration volume setting (in L) @param adj: (int) 0 for adjust time, 1 for adjust rate - @return: none + @return: None """ # reset response to this command so we can tell when response is received @@ -1130,15 +1126,13 @@ self.can_interface.send(message, 0) - return 0 - def cmd_ui_treatment_duration_setting_change_request(self, time_min=0): """ Constructs and sends a ui UF change settings confirmed by user message @param time_min: (int) treatment time (in min). - @return: none + @return: None """ payload = integer_to_bytearray(time_min) @@ -1151,16 +1145,14 @@ # Send message self.can_interface.send(message, 0) - return 0 - def cmd_ui_blood_and_dialysate_flow_settings_change_request(self, blood_flow, dial_flow): """ Constructs and sends a ui blood & dialysate flow settings change request by user message @param blood_flow: (int) blood flow rate set point (in mL/min). @param dial_flow: (int) dialysate flow rate set point (in mL/min). - @return: none + @return: None """ bld = integer_to_bytearray(blood_flow) @@ -1174,8 +1166,6 @@ self.can_interface.send(message, 0) - return 0 - def cmd_ui_start_treatment_request(self, cmnd=START_TREATMENT_CMD_INITIATE_TREATMENT_WORKFLOW): """ Constructs and sends a ui start treatment command message @@ -1187,7 +1177,7 @@ @param cmnd: (int) start treatment command code - @return: none + @return: None """ cmd = integer_to_bytearray(cmnd) @@ -1200,8 +1190,6 @@ self.can_interface.send(message, 0) - return 0 - def set_a_treatment_parameter(self, param_idx, value): """ Constructs and sends a set treatment parameter message @@ -1211,7 +1199,7 @@ @param param_idx: (int) index/enum of parameter to set (see TreatmentParameters enum) @param value: (int or float - depends on param_idx) value to set for given treatment parameter - @return: none + @return: None """ if self.TreatmentParameters.has_value(param_idx): self.treatment_parameters[self.TreatmentParameters(param_idx)] = value @@ -1235,13 +1223,23 @@ else: self.logger.debug("Invalid param_idx given.") - - - return 0 - - def set_treatment_parameters(self, bld_flow, dia_flow, duration, hep_rate, hep_bol, hep_stop, sal_bol, - acid, bicarb, dialyzer, dia_temp, art_low, art_high, ven_low, ven_high, - bp_intvl, rb_flow): + def cmd_set_treatment_parameters(self, bld_flow: int, + dia_flow: int, + duration: int, + hep_rate: float, + hep_bol: float, + hep_stop: int, + sal_bol: int, + acid: int, + bicarb: int, + dialyzer: int, + dia_temp: float, + art_low: int, + art_high: int, + ven_low: int, + ven_high: int, + bp_intvl: int, + rb_flow: int): """ Constructs and sends a ui set treatment parameters message Constraints: @@ -1265,7 +1263,7 @@ @param bp_intvl: (int) blood pressure measurement interval (in min) @param rb_flow: (int) rinseback flow rate (in mL/min) - @return: none + @return: None """ self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_BLOOD_FLOW_RATE_ML_MIN.value] = bld_flow self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_DIALYSATE_FLOW_RATE_ML_MIN.value] = dia_flow @@ -1312,13 +1310,11 @@ self.can_interface.send(message, 0) - return 0 - def cmd_ui_confirm_treatment_parameters(self): """ Constructs and sends a ui confirm treatment parameters message - @return: none + @return: None """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -1328,9 +1324,6 @@ self.can_interface.send(message, 0) - return 0 - - def cmd_ui_request_saline_bolus(self, start=False): """ Constructs and sends a ui request for a saline bolus message @@ -1356,9 +1349,6 @@ message_id=MsgIds.MSG_ID_USER_SALINE_BOLUS_REQUEST.value, payload=payload) - self.logger.debug("Sending request to " + str + " a saline bolus.") - self.can_interface.send(message, 0) - - return 0 + self.can_interface.send(message, 0) \ No newline at end of file