Index: leahi_dialin/td/treatment_delivery.py =================================================================== diff -u -rbd45f04f6e4f66ec2b121f496bc8db20ca00a6b8 -r0c1da102269169d5b63f91e146488b20eaa883a7 --- leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision bd45f04f6e4f66ec2b121f496bc8db20ca00a6b8) +++ leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision 0c1da102269169d5b63f91e146488b20eaa883a7) @@ -23,6 +23,7 @@ from .modules.buttons import TDButtons from .modules.pressure_sensors import TDPressureSensors from .modules.switches import TDSwitches +from .modules.treatment import TDTreatment from .modules.valves import TDValves from .modules.voltages import TDVoltages @@ -122,6 +123,7 @@ self.buttons = TDButtons(self.can_interface, self.logger) self.pressure_sensors = TDPressureSensors(self.can_interface, self.logger) self.switches = TDSwitches(self.can_interface, self.logger) + self.treatment = TDTreatment(self.can_interface, self.logger) self.valves = TDValves(self.can_interface, self.logger) self.voltages = TDVoltages(self.can_interface, self.logger) @@ -267,7 +269,7 @@ payload = integer_to_bytearray(new_mode) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id, - message_id=MsgIds.MSG_ID_TD_SET_OP_MODE_REQUEST.value, + message_id=MsgIds.MSG_ID_TD_OP_MODE_OVERRIDE_REQUEST.value, payload=payload) self.logger.debug("Requesting TD mode change to " + str(new_mode)) @@ -318,5 +320,48 @@ self.logger.debug("Sending an UI version request to the TD.") self.can_interface.send(message, 0) + def cmd_op_mode_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: + """ + Constructs and sends the measured op mode broadcast interval override command + Constraints: + Must be logged into TD. + Given interval must be non-zero and a multiple of the TD general task interval (50 ms). + @param ms: integer - interval (in ms) to override with + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise + """ + if not check_broadcast_interval_override_ms(ms): + return False + + rst = integer_to_bytearray(reset) + mis = integer_to_bytearray(ms) + payload = rst + mis + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id, + message_id=MsgIds.MSG_ID_TD_OP_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, + payload=payload) + + self.logger.debug("override op mode broadcast interval") + + # Send message + received_message = self.can_interface.send(message) + + # If there is content... + if received_message is not None: + # self.logger.debug(received_message) + if reset == RESET: + str_res = "reset back to normal: " + else: + str_res = str(ms) + " ms: " + self.logger.debug("Blood flow broadcast interval overridden to " + str_res + + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) + # response payload is OK or not OK + return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] + else: + self.logger.debug("Timeout!!!!") + return False + + +