Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r53ad62b20a323d405916edafb195fdcf64164f7a -r751b1bb4ee6800ca4cf05bd206c830bf741109e4 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 53ad62b20a323d405916edafb195fdcf64164f7a) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 751b1bb4ee6800ca4cf05bd206c830bf741109e4) @@ -265,16 +265,15 @@ MSG_ID_HD_SYRINGE_PUMP_PUBLISH_INTERVAL_OVERRIDE = 0x8049 MSG_ID_TD_SYRINGE_PUMP_RATE_OVERRIDE_REQUEST = 0x8050 MSG_ID_TD_SYRINGE_PUMP_FORCE_OVERRIDE_REQUEST = 0x8051 - MSG_ID_TD_SYRINGE_PUMP_SYRINGE_DETECT_OVERRIDE_REQUEST = 0x8052 - MSG_ID_TD_SYRINGE_PUMP_HOME_OVERRIDE_REQUEST = 0x8053 - MSG_ID_TD_SYRINGE_PUMP_POSITION_OVERRIDE_REQUEST = 0x8054 - MSG_ID_TD_SYRINGE_PUMP_VOLUME_OVERRIDE_REQUEST = 0x8055 - MSG_ID_TD_SYRINGE_PUMP_STATUS_OVERRIDE_REQUEST = 0x8056 - MSG_ID_TD_SYRINGE_PUMP_ENCODER_STATUS_OVERRIDE_REQUEST = 0x8057 - MSG_ID_TD_SYRINGE_PUMP_ADC_DAC_STATUS_OVERRIDE_REQUEST = 0x8058 - MSG_ID_TD_SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE_REQUEST = 0x8059 - MSG_ID_TD_SYRINGE_PUMP_FORCE_SENSOR_DAC_OVERRIDE_REQUEST = 0x8060 - MSG_ID_TD_HEPARIN_BOLUS_TARGET_RATE_OVERRIDE_REQUEST = 0x8061 + MSG_ID_TD_SYRINGE_PUMP_HOME_OVERRIDE_REQUEST = 0x8052 + MSG_ID_TD_SYRINGE_PUMP_POSITION_OVERRIDE_REQUEST = 0x8053 + MSG_ID_TD_SYRINGE_PUMP_VOLUME_OVERRIDE_REQUEST = 0x8054 + MSG_ID_TD_SYRINGE_PUMP_STATUS_OVERRIDE_REQUEST = 0x8055 + MSG_ID_TD_SYRINGE_PUMP_ENCODER_STATUS_OVERRIDE_REQUEST = 0x8056 + MSG_ID_TD_SYRINGE_PUMP_ADC_DAC_STATUS_OVERRIDE_REQUEST = 0x8057 + MSG_ID_TD_SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE_REQUEST = 0x8058 + MSG_ID_TD_SYRINGE_PUMP_FORCE_SENSOR_DAC_OVERRIDE_REQUEST = 0x8059 + MSG_ID_TD_HEPARIN_BOLUS_TARGET_RATE_OVERRIDE_REQUEST = 0x8060 MSG_ID_TD_TRAINING_TEST_OVERRIDE_REQUEST = 0x8999 Index: leahi_dialin/td/modules/syringe_pump.py =================================================================== diff -u -r53ad62b20a323d405916edafb195fdcf64164f7a -r751b1bb4ee6800ca4cf05bd206c830bf741109e4 --- leahi_dialin/td/modules/syringe_pump.py (.../syringe_pump.py) (revision 53ad62b20a323d405916edafb195fdcf64164f7a) +++ leahi_dialin/td/modules/syringe_pump.py (.../syringe_pump.py) (revision 751b1bb4ee6800ca4cf05bd206c830bf741109e4) @@ -423,46 +423,6 @@ return False - def cmd_syringe_pump_meas_detect_override(self, volts: float = 0.0, reset: int = NO_RESET) -> int: - """ - Constructs and sends the syringe pump measured syringe detect override command - Constraints: - Must be logged into TD. - - @param volts: float - volts to override with - @param reset: integer - 1 to reset a previous override, 0 to override - @return: 1 if successful, zero otherwise - """ - - rst = integer_to_bytearray(reset) - vol = float_to_bytearray(volts) - payload = rst + vol - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id, - message_id=MsgIds.MSG_ID_TD_SYRINGE_PUMP_SYRINGE_DETECT_OVERRIDE_REQUEST.value, - payload=payload) - - self.logger.debug("override TD syringe pump measured syringe detection") - - # Send message - received_message = self.can_interface.send(message) - - # If there is content... - if received_message is not None: - if reset == RESET: - str_res = "reset back to normal: " - else: - str_res = str(volts) + " volts: " - self.logger.debug("Syringe pump measured syringe detection 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 - - - def cmd_syringe_pump_meas_home_override(self, volts: float = 0.0, reset: int = NO_RESET) -> int: """ Constructs and sends the syringe pump measured home override command Fisheye: Tag 751b1bb4ee6800ca4cf05bd206c830bf741109e4 refers to a dead (removed) revision in file `tools/Log_dd_new.py'. Fisheye: No comparison available. Pass `N' to diff?