Index: TD_Rinseback/loader.py =================================================================== diff -u -rb5a8e20a45460f562f7af2a4384c4ca28d4a09bd -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- TD_Rinseback/loader.py (.../loader.py) (revision b5a8e20a45460f562f7af2a4384c4ca28d4a09bd) +++ TD_Rinseback/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -32,7 +32,7 @@ if self.can_interface is not None: self.can_interface.register_receiving_publication_function( - CAN.DenaliChannels.ui_to_td_ch_id, + CAN.CanChannels.ui_to_td_ch_id, MsgIds.MSG_ID_UI_RINSEBACK_CMD_REQUEST.value, self.handle_rinseback_cmd_request) @@ -69,7 +69,6 @@ self.lbCountdown = self.find_widget(QtWidgets.QLabel , 'lbCountdown' ) self.cbCompleted = self.find_widget(QtWidgets.QCheckBox , 'cbCompleted' ) - self.tbReqReset = self.find_widget(QtWidgets.QToolButton , 'tbReqReset' ) self.lbReqCommand = self.find_widget(QtWidgets.QLabel , 'lbReqCommand' ) self.tbRspReset = self.find_widget(QtWidgets.QToolButton , 'tbRspReset' ) @@ -97,8 +96,6 @@ self.slCountdown .valueChanged.connect ( lambda value: self.lbCountdown.setText(f"{value}") ) self.cbCompleted .stateChanged.connect ( self.do_rinseback_progress ) - self.tbReqReset .clicked.connect ( self.init_rinseback_cmd_request ) - self.tbRspReset .clicked.connect ( self.init_rinseback_cmd_response ) self.tbRspSend .clicked.connect ( self.do_rinseback_cmd_response ) @@ -110,7 +107,6 @@ :return: none """ self.init_rinseback_progress() - self.init_rinseback_cmd_request() self.init_rinseback_cmd_response() @@ -141,11 +137,6 @@ @Slot() - def init_rinseback_cmd_request(self): - self.lbReqCommand .setText ("--") - - - @Slot() def handle_rinseback_cmd_request(self, message, timestamp = 0.0): """ Called when the user sends a rinseback command request to firmware from UI @@ -160,6 +151,7 @@ @Slot() def init_rinseback_cmd_response(self): + self.lbReqCommand .setText ("-- --") self.sbRspRejectReason .setValue (0)