diff --git a/Drone/copter_client.py b/Drone/copter_client.py index ef2dc97..a4610f7 100644 --- a/Drone/copter_client.py +++ b/Drone/copter_client.py @@ -47,6 +47,10 @@ def _response_selfcheck(): return check if check else "OK" +@messaging.message_callback("test") +def _response_test(**kwargs): + print("test") + @messaging.request_callback("batt_voltage") def _response_batt(): return FlightLib.get_telemetry('body').voltage diff --git a/Server/server_gui.py b/Server/server_gui.py index 7ac0142..8a16288 100644 --- a/Server/server_gui.py +++ b/Server/server_gui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'server_gui.ui' # -# Created by: PyQt5 UI code generator 5.10.1 +# Created by: PyQt5 UI code generator 5.11.3 # # WARNING! All changes made in this file will be lost! @@ -11,7 +11,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName("MainWindow") - MainWindow.resize(1239, 706) + MainWindow.resize(1239, 741) self.centralwidget = QtWidgets.QWidget(MainWindow) self.centralwidget.setEnabled(True) self.centralwidget.setObjectName("centralwidget") @@ -54,6 +54,9 @@ class Ui_MainWindow(object): self.stop_button = QtWidgets.QPushButton(self.centralwidget) self.stop_button.setObjectName("stop_button") self.formLayout.setWidget(5, QtWidgets.QFormLayout.SpanningRole, self.stop_button) + self.test_Button = QtWidgets.QPushButton(self.centralwidget) + self.test_Button.setObjectName("test_Button") + self.formLayout.setWidget(6, QtWidgets.QFormLayout.SpanningRole, self.test_Button) self.verticalLayout.addLayout(self.formLayout) self.line = QtWidgets.QFrame(self.centralwidget) self.line.setFrameShape(QtWidgets.QFrame.HLine) @@ -81,7 +84,7 @@ class Ui_MainWindow(object): self.gridLayout.addLayout(self.horizontalLayout, 0, 0, 1, 1) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 1239, 39)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 1239, 21)) self.menubar.setObjectName("menubar") self.menuOptions = QtWidgets.QMenu(self.menubar) self.menuOptions.setObjectName("menuOptions") @@ -109,6 +112,7 @@ class Ui_MainWindow(object): self.start_button.setText(_translate("MainWindow", "Start animation")) self.pause_button.setText(_translate("MainWindow", "Pause")) self.stop_button.setText(_translate("MainWindow", "Stop")) + self.test_Button.setText(_translate("MainWindow", "Test")) self.takeoff_button.setText(_translate("MainWindow", "Takeoff")) self.land_button.setText(_translate("MainWindow", "Land")) self.disarm_button.setText(_translate("MainWindow", "Disarm")) diff --git a/Server/server_gui.ui b/Server/server_gui.ui index 79c0ffd..08a4a2f 100644 --- a/Server/server_gui.ui +++ b/Server/server_gui.ui @@ -7,7 +7,7 @@ 0 0 1239 - 706 + 741 @@ -91,6 +91,13 @@ + + + + Test + + + @@ -147,7 +154,7 @@ 0 0 1239 - 39 + 21 diff --git a/Server/server_qt.py b/Server/server_qt.py index 20bd373..72876a5 100644 --- a/Server/server_qt.py +++ b/Server/server_qt.py @@ -28,6 +28,7 @@ class MainWindow(QtWidgets.QMainWindow): self.ui.start_button.clicked.connect(self.send_starttime) self.ui.pause_button.clicked.connect(self.pause_all) self.ui.stop_button.clicked.connect(self.stop_all) + self.ui.test_Button.clicked.connect(self.test) self.ui.leds_button.clicked.connect(self.test_leds) self.ui.takeoff_button.clicked.connect(self.takeoff_selected) @@ -188,6 +189,13 @@ class MainWindow(QtWidgets.QMainWindow): copter = Client.get_by_id(item.text()) copter.send_file(path, "/home/pi/catkin_ws/src/clever/aruco_pose/map/animation_map.txt") copter.send_message("service_restart", {"name": "clever"}) + @pyqtSlot() + def test(self): + for row_num in range(model.rowCount()): + item = model.item(row_num, 0) + if item.isCheckable() and item.checkState() == Qt.Checked: + copter = Client.get_by_id(item.text()) + copter.send_message("test") model = QStandardItemModel() @@ -207,6 +215,7 @@ def client_connected(self: Client): Client.on_first_connect = client_connected + if __name__ == "__main__": app = QtWidgets.QApplication(sys.argv) window = MainWindow()