Index: dialin/hd/ui_proxy.py =================================================================== diff -u -r79b47911f0ea424cd8dc10c1e1f150b84d4dfa54 -r64a8b369db68485a9d1d461e1aa53ee7ddbc0c30 --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 79b47911f0ea424cd8dc10c1e1f150b84d4dfa54) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 64a8b369db68485a9d1d461e1aa53ee7ddbc0c30) @@ -46,9 +46,8 @@ RESPONSE_ACCEPTED = 1 # start treatment command IDs - START_TREATMENT_CMD_INITIATE_TREATMENT_WORKFLOW = 0 - START_TREATMENT_CMD_CANCEL_TREATMENT_WORKFLOW = 1 - START_TREATMENT_CMD_START_TREATMENT = 2 + START_TREATMENT_CMD_CANCEL_TREATMENT_WORKFLOW = 0 + START_TREATMENT_CMD_INITIATE_TREATMENT_WORKFLOW = 1 # HD version message field positions START_POS_MAJOR = DenaliMessage.PAYLOAD_START_INDEX @@ -1195,15 +1194,14 @@ self.can_interface.send(message, 0) - def cmd_ui_start_treatment_request(self, cmnd=START_TREATMENT_CMD_INITIATE_TREATMENT_WORKFLOW): + def cmd_ui_initiate_treatment_request(self, cmnd=START_TREATMENT_CMD_INITIATE_TREATMENT_WORKFLOW): """ Constructs and sends a ui start treatment command message Constraints: Command must be one of the following: - START_TREATMENT_CMD_INITIATE_TREATMENT_WORKFLOW = 0 - START_TREATMENT_CMD_CANCEL_TREATMENT_WORKFLOW = 1 - START_TREATMENT_CMD_START_TREATMENT = 2 + START_TREATMENT_CMD_CANCEL_TREATMENT_WORKFLOW = 0 + START_TREATMENT_CMD_INITIATE_TREATMENT_WORKFLOW = 1 @param cmnd: (int) start treatment command code @@ -1340,17 +1338,25 @@ self.can_interface.send(message, 0) - def cmd_ui_confirm_treatment_parameters(self): + def cmd_ui_confirm_treatment_parameters(self, cmd=0): """ Constructs and sends a ui confirm treatment parameters message + Constraints: + Command must be one of the following: + REJECT = 0 (user rejects treatment parameters) + CONFIRM = 1 (uesr confirms treatment parameters) + @param cmd: (int) confirm treatment parameters command code + @return: None """ + payload = integer_to_bytearray(cmd) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS.value) + message_id=MsgIds.MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS.value, + payload=payload) - self.logger.debug("Sending confirm treatment parameters messge.") + self.logger.debug("Sending confirm treatment parameters message.") self.can_interface.send(message, 0)