diff --git a/Drone/copter_client.py b/Drone/copter_client.py index 6fdcf33..4e92baa 100644 --- a/Drone/copter_client.py +++ b/Drone/copter_client.py @@ -429,12 +429,12 @@ def _command_reset_z(*args, **kwargs): @messaging.message_callback("update_repo") def _command_update_repo(*args, **kwargs): - os.system("mv /home/pi/clever-show/Drone/client_config.ini /home/pi/clever-show/Drone/client_config_tmp.ini") + os.system("mv /home/pi/clever-show/drone/client_config.ini /home/pi/clever-show/drone/client_config_tmp.ini") os.system("git reset --hard HEAD") os.system("git checkout master") os.system("git fetch") os.system("git pull --rebase") - os.system("mv /home/pi/clever-show/Drone/client_config_tmp.ini /home/pi/clever-show/Drone/client_config.ini") + os.system("mv /home/pi/clever-show/drone/client_config_tmp.ini /home/pi/clever-show/drone/client_config.ini") os.system("chown -R pi:pi /home/pi/clever-show") diff --git a/Server/server_gui.py b/Server/server_gui.py index 448c60a..1acacc4 100644 --- a/Server/server_gui.py +++ b/Server/server_gui.py @@ -377,7 +377,7 @@ class Ui_MainWindow(object): self.reboot_fcu.setText(_translate("MainWindow", "Reboot FCU")) self.calibrate_gyro.setText(_translate("MainWindow", "Calibrate gyro")) self.calibrate_level.setText(_translate("MainWindow", "Calibrate level")) - self.menuOptions.setTitle(_translate("MainWindow", "Server")) + self.menuOptions.setTitle(_translate("MainWindow", "server")) self.menuMusic_2.setTitle(_translate("MainWindow", "Music")) self.menuTable.setTitle(_translate("MainWindow", "Table")) self.menuDrone_2.setTitle(_translate("MainWindow", "Selected drones")) diff --git a/Server/server_qt.py b/Server/server_qt.py index 2c315a8..aae525b 100644 --- a/Server/server_qt.py +++ b/Server/server_qt.py @@ -622,7 +622,7 @@ class MainWindow(QtWidgets.QMainWindow): def save_callback(): config.write() - ConfigDialog().call_config_dialog(config, save_callback, restart, name="Server config") + ConfigDialog().call_config_dialog(config, save_callback, restart, name="server config") def register_callbacks(self): @messaging.message_callback("telemetry") diff --git a/config.py b/config.py index 55c911e..cf73af8 100644 --- a/config.py +++ b/config.py @@ -311,15 +311,15 @@ class ConfigManager: if __name__ == '__main__': cfg = ConfigManager() - cfg.load_from_file('Drone/config/client.ini') - # cfg.load_from_file('Server/config/server.ini') - #cfg.load_from_file('Drone/config/spec/configspec_client.ini') + cfg.load_from_file('drone/config/client.ini') + # cfg.load_from_file('server/config/server.ini') + #cfg.load_from_file('drone/config/spec/configspec_client.ini') print(dict(cfg.full_dict(include_defaults=True))) cfg.config.pop("PRIVATE", None) print(cfg.config) - # cfg.load_config_and_spec('Drone/config/client.ini') + # cfg.load_config_and_spec('drone/config/client.ini') # #print(cfg.config.comments) # #print(cfg.server_host) # cfg.server_host = '192.168.1.103' @@ -338,7 +338,7 @@ if __name__ == '__main__': import pprint #pprint.pprint(cfg.full_dict) # cfg2 = ConfigManager() - # #cfg2.load_from_dict({"PRIVATE": {"offset": [1, 2, 3]}}, configspec='Drone/config/spec/configspec_client.ini') + # #cfg2.load_from_dict({"PRIVATE": {"offset": [1, 2, 3]}}, configspec='drone/config/spec/configspec_client.ini') # cfg2.load_from_dict({"PRIVATE": {"id": "heh"}}) # #pprint.pprint(cfg2.full_dict) # #cfg.merge(cfg2) @@ -350,7 +350,7 @@ if __name__ == '__main__': # #print(cfg.full_dict) # - # #cfg.load_from_dict(cfg.full_dict, 'Drone/config/client.ini') + # #cfg.load_from_dict(cfg.full_dict, 'drone/config/client.ini') # #print(cfg.config.initial_comment, cfg.config.final_comment) # #cfg.write() # diff --git a/update_configspec.py b/update_configspec.py index 590b32d..913b0f7 100644 --- a/update_configspec.py +++ b/update_configspec.py @@ -1,5 +1,5 @@ import config -from Server.copter_table_models import CopterDataModel +from server.copter_table_models import CopterDataModel cfg_server = config.ConfigObj('SERVER/config/spec/configspec_server.ini', list_values=False) widths = {"copter_id": 150}