add sysreset cmd to app. reset -> sysreset, zero -> encoder reset

JitterCompany · Dec 2, 2019 · b48681d · b48681d
1 parent 282be3c
commit b48681d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/app/app.py b/app/app.py
@@ -40,8 +40,10 @@ def __init__(self):
         self.mainView.refresh.connect(self.SerialConnection.refresh)
 
         self.mainView.resetEncoders.connect(lambda: self.SerialConnection.sendCmd('reset'))
+        self.mainView.resetSystem.connect(lambda: self.SerialConnection.sendCmd('sysreset'))
         self.mainView.getPositions.connect(lambda: self.SerialConnection.sendCmd('pos'))
 
+
         self.parser = SerialParser()
         self.SerialConnection.textStream.connect(self.parser.parse_line)
         # self.SerialConnection.textStream.connect(self.mainView.textOutputView.addText)

diff --git a/app/views.py b/app/views.py
@@ -298,6 +298,7 @@ class MainView(QtWidgets.QWidget):
 
     refresh = QtCore.Signal()
     resetEncoders = QtCore.Signal()
+    resetSystem = QtCore.Signal()
     getPositions = QtCore.Signal()
 
     def __init__(self, toolbar, dropdown):
@@ -329,9 +330,13 @@ def __init__(self, toolbar, dropdown):
         self.toolbar.addSeparator()
 
         self.resetBtn = QtWidgets.QPushButton('Reset')
-        self.resetBtn.clicked.connect(self.resetEncoders)
+        self.resetBtn.clicked.connect(self.resetSystem)
         self.toolbar.addWidget(self.resetBtn)
 
+        self.zeroBtn = QtWidgets.QPushButton('zero')
+        self.zeroBtn.clicked.connect(self.resetEncoders)
+        self.toolbar.addWidget(self.zeroBtn)
+
         self.posBtn = QtWidgets.QPushButton('Pos')
         self.posBtn.clicked.connect(self.getPositions)
         self.toolbar.addWidget(self.posBtn)