diff --git a/Server/server_gui.py b/Server/server_gui.py index 94f9018..dcc652c 100644 --- a/Server/server_gui.py +++ b/Server/server_gui.py @@ -245,6 +245,8 @@ class Ui_MainWindow(object): self.action_remove_row.setObjectName("action_remove_row") self.action_send_calibrations = QtWidgets.QAction(MainWindow) self.action_send_calibrations.setObjectName("action_send_calibrations") + self.action_reboot_all = QtWidgets.QAction(MainWindow) + self.action_reboot_all.setObjectName("action_reboot_all") self.menuDeveloper_mode.addAction(self.action_send_any_file) self.menuDeveloper_mode.addAction(self.actionSend_any_command) self.menuOptions.addAction(self.action_send_animations) @@ -261,11 +263,12 @@ class Ui_MainWindow(object): self.menuDeveloper_mode_2.addAction(self.action_restart_clever) self.menuDeveloper_mode_2.addAction(self.action_restart_clever_show) self.menuDeveloper_mode_2.addAction(self.action_update_client_repo) + self.menuDeveloper_mode_2.addAction(self.action_reboot_all) self.menuDrone.addAction(self.action_set_z_offset_to_ground) self.menuDrone.addAction(self.action_reset_z_offset) + self.menuDrone.addAction(self.action_remove_row) self.menuDrone.addSeparator() self.menuDrone.addAction(self.menuDeveloper_mode_2.menuAction()) - self.menuDrone.addAction(self.action_remove_row) self.menuMusic.addAction(self.action_select_music_file) self.menuMusic.addAction(self.action_play_music) self.menuMusic.addAction(self.action_stop_music) @@ -331,3 +334,4 @@ class Ui_MainWindow(object): self.action_stop_music.setText(_translate("MainWindow", "Stop music")) self.action_remove_row.setText(_translate("MainWindow", "Remove from table")) self.action_send_calibrations.setText(_translate("MainWindow", "Send camera calibrations")) + self.action_reboot_all.setText(_translate("MainWindow", "Reboot all")) diff --git a/Server/server_gui.ui b/Server/server_gui.ui index 60e9d8e..36569a1 100644 --- a/Server/server_gui.ui +++ b/Server/server_gui.ui @@ -418,12 +418,13 @@ + + - @@ -551,6 +552,11 @@ Send camera calibrations + + + Reboot all + + start_delay_spin diff --git a/Server/server_qt.py b/Server/server_qt.py index d08f822..d690d82 100644 --- a/Server/server_qt.py +++ b/Server/server_qt.py @@ -152,6 +152,7 @@ class MainWindow(QtWidgets.QMainWindow): self.ui.action_restart_clever.triggered.connect(self.restart_clever) self.ui.action_restart_clever_show.triggered.connect(self.restart_clever_show) self.ui.action_update_client_repo.triggered.connect(self.update_client_repo) + self.ui.action_reboot_all.triggered.connect(self.reboot_all_on_selected) self.ui.action_set_start_to_current_position.triggered.connect(self.update_start_to_current_position) self.ui.action_reset_start.triggered.connect(self.reset_start) self.ui.action_set_z_offset_to_ground.triggered.connect(self.set_z_offset_to_ground) @@ -439,7 +440,12 @@ class MainWindow(QtWidgets.QMainWindow): @pyqtSlot() def update_client_repo(self): for copter in self.model.user_selected(): - copter.client.send_message("update_repo") + copter.client.send_message("update_repo") + + @pyqtSlot() + def reboot_all_on_selected(self): + for copter in self.model.user_selected(): + copter.client.send_message("reboot_all") @pyqtSlot() def update_start_to_current_position(self):