Index: TD_Rinseback/interface.ui
===================================================================
diff -u -rf55cffae5cf3b4a6dafbd4d36a4a3b963008bfd7 -r888d30a914d3a6bae125b8c564f48d53762b0c26
--- TD_Rinseback/interface.ui (.../interface.ui) (revision f55cffae5cf3b4a6dafbd4d36a4a3b963008bfd7)
+++ TD_Rinseback/interface.ui (.../interface.ui) (revision 888d30a914d3a6bae125b8c564f48d53762b0c26)
@@ -7,7 +7,7 @@
0
0
429
- 286
+ 256
@@ -79,7 +79,7 @@
-
-
-
+
10
@@ -336,7 +336,7 @@
-
-
+
0
@@ -365,7 +365,7 @@
QFrame::Raised
-
+
2
@@ -382,45 +382,47 @@
2
-
-
+
-
-
-
-
- 10
-
-
+
color: rgb(238, 238, 236);
background-color: rgb(92, 53, 102);
- 144 : [0x9000] : Rinseback Command Request
+ 145 : [0x9100] : Rinseback Command Response
Qt::AlignCenter
-
-
+
+ Send
+
+
+
+ -
+
+
Reset
-
-
+
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
+
- Command
+ Req [0x9000]
@@ -440,81 +442,14 @@
-
-
-
-
-
- -
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
- 2
-
-
- 2
-
-
- 2
-
-
- 2
-
-
- 2
-
-
-
-
-
-
-
-
- color: rgb(238, 238, 236);
-background-color: rgb(92, 53, 102);
-
-
+
-
+
- 145 : [0x9100] : Rinseback Command Response
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- Send
-
-
-
- -
-
-
- Reset
-
-
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
-
Rejection Reason
- -
+
-
Qt::AlignCenter
@@ -530,7 +465,7 @@
-
-
+
Qt::Vertical
Index: TD_Rinseback/loader.py
===================================================================
diff -u -rb5a8e20a45460f562f7af2a4384c4ca28d4a09bd -r888d30a914d3a6bae125b8c564f48d53762b0c26
--- TD_Rinseback/loader.py (.../loader.py) (revision b5a8e20a45460f562f7af2a4384c4ca28d4a09bd)
+++ TD_Rinseback/loader.py (.../loader.py) (revision 888d30a914d3a6bae125b8c564f48d53762b0c26)
@@ -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)