diff --git a/real_robot/coordination_formation_control_pkg/config/crazyfliesConfig.yaml b/real_robot/coordination_formation_control_pkg/config/crazyfliesConfig.yaml index d529233646db9da3c211c014156fa04e12114a3a..ccb63c8d161409967bd8c20b9074d7bdda110517 100644 --- a/real_robot/coordination_formation_control_pkg/config/crazyfliesConfig.yaml +++ b/real_robot/coordination_formation_control_pkg/config/crazyfliesConfig.yaml @@ -1,16 +1,16 @@ crazyflies: -# - id: 1 -# channel: 90 -# initialPosition: [0.0, 0.0, 0.0] -# type: default -# - id: 2 -# channel: 90 -# initialPosition: [0.0, 0.0, 0.0] -# type: default -- id: 3 - channel: 80 +- id: 1 + channel: 90 initialPosition: [0.0, 0.0, 0.0] type: default +- id: 2 + channel: 90 + initialPosition: [0.0, 0.0, 0.0] + type: default +# - id: 3 +# channel: 80 +# initialPosition: [0.0, 0.0, 0.0] +# type: default # - id: 4 # channel: 80 # initialPosition: [0.0, 0.0, 0.0] diff --git a/real_robot/coordination_formation_control_pkg/config/missionConfig.yaml b/real_robot/coordination_formation_control_pkg/config/missionConfig.yaml index 0791816e6e7337e7841488268f54087ca68b2cda..3e0c1a94f7b3f8b3dd752881585fb95d835b666b 100644 --- a/real_robot/coordination_formation_control_pkg/config/missionConfig.yaml +++ b/real_robot/coordination_formation_control_pkg/config/missionConfig.yaml @@ -4,7 +4,7 @@ hz_freq: 50 # controller frquency include_obstacle: false include_orientation: false n_obs: 0 -log_name: "/home/spot/steven_master_ws/src/coordination_formation_control_pkg/results/experiment_6/experiment_6_trianglular_no_formation" +log_name: "/home/spot/steven_master_ws/src/coordination_formation_control_pkg/results/experiment_8_working/test" enable_log: true # waypoint diff --git a/real_robot/coordination_formation_control_pkg/results/experiment_6/experiment_6_trianglular_no_formation_crazyflie_1_logdata.bag b/real_robot/coordination_formation_control_pkg/results/experiment_6/experiment_6_trianglular_no_formation_crazyflie_1_logdata.bag deleted file mode 100644 index 769d5ff768e00da638acc8c7eca354025d260977..0000000000000000000000000000000000000000 Binary files a/real_robot/coordination_formation_control_pkg/results/experiment_6/experiment_6_trianglular_no_formation_crazyflie_1_logdata.bag and /dev/null differ diff --git a/real_robot/coordination_formation_control_pkg/results/experiment_6/experiment_6_trianglular_no_formation_crazyflie_2_logdata.bag b/real_robot/coordination_formation_control_pkg/results/experiment_6/experiment_6_trianglular_no_formation_crazyflie_2_logdata.bag deleted file mode 100644 index 5289d02764ec1cfbc4360f43d8ef9177e3cf49d9..0000000000000000000000000000000000000000 Binary files a/real_robot/coordination_formation_control_pkg/results/experiment_6/experiment_6_trianglular_no_formation_crazyflie_2_logdata.bag and /dev/null differ diff --git a/real_robot/coordination_formation_control_pkg/results/experiment_6/config_files/crazyfliesConfig.yaml b/real_robot/coordination_formation_control_pkg/results/experiment_6_working/config_files/crazyfliesConfig.yaml similarity index 100% rename from real_robot/coordination_formation_control_pkg/results/experiment_6/config_files/crazyfliesConfig.yaml rename to real_robot/coordination_formation_control_pkg/results/experiment_6_working/config_files/crazyfliesConfig.yaml diff --git a/real_robot/coordination_formation_control_pkg/results/experiment_6/config_files/formationConfig.yaml b/real_robot/coordination_formation_control_pkg/results/experiment_6_working/config_files/formationConfig.yaml similarity index 100% rename from real_robot/coordination_formation_control_pkg/results/experiment_6/config_files/formationConfig.yaml rename to real_robot/coordination_formation_control_pkg/results/experiment_6_working/config_files/formationConfig.yaml diff --git a/real_robot/coordination_formation_control_pkg/results/experiment_6/config_files/missionConfig.yaml b/real_robot/coordination_formation_control_pkg/results/experiment_6_working/config_files/missionConfig.yaml similarity index 100% rename from real_robot/coordination_formation_control_pkg/results/experiment_6/config_files/missionConfig.yaml rename to real_robot/coordination_formation_control_pkg/results/experiment_6_working/config_files/missionConfig.yaml diff --git a/real_robot/coordination_formation_control_pkg/results/experiment_6/experiment_1_trianglular_no_formation_crazyflie_1_logdata.bag b/real_robot/coordination_formation_control_pkg/results/experiment_6_working/experiment_1_trianglular_no_formation_crazyflie_1_logdata.bag similarity index 100% rename from real_robot/coordination_formation_control_pkg/results/experiment_6/experiment_1_trianglular_no_formation_crazyflie_1_logdata.bag rename to real_robot/coordination_formation_control_pkg/results/experiment_6_working/experiment_1_trianglular_no_formation_crazyflie_1_logdata.bag diff --git a/real_robot/coordination_formation_control_pkg/results/experiment_6/experiment_1_trianglular_no_formation_crazyflie_2_logdata.bag b/real_robot/coordination_formation_control_pkg/results/experiment_6_working/experiment_1_trianglular_no_formation_crazyflie_2_logdata.bag similarity index 100% rename from real_robot/coordination_formation_control_pkg/results/experiment_6/experiment_1_trianglular_no_formation_crazyflie_2_logdata.bag rename to real_robot/coordination_formation_control_pkg/results/experiment_6_working/experiment_1_trianglular_no_formation_crazyflie_2_logdata.bag diff --git a/real_robot/coordination_formation_control_pkg/results/experiment_6/experiment_1_trianglular_no_formation_crazyflie_3_logdata.bag b/real_robot/coordination_formation_control_pkg/results/experiment_6_working/experiment_1_trianglular_no_formation_crazyflie_3_logdata.bag similarity index 100% rename from real_robot/coordination_formation_control_pkg/results/experiment_6/experiment_1_trianglular_no_formation_crazyflie_3_logdata.bag rename to real_robot/coordination_formation_control_pkg/results/experiment_6_working/experiment_1_trianglular_no_formation_crazyflie_3_logdata.bag diff --git a/real_robot/coordination_formation_control_pkg/results/experiment_6_working/experiment_6_trianglular_no_formation_crazyflie_1_logdata.bag b/real_robot/coordination_formation_control_pkg/results/experiment_6_working/experiment_6_trianglular_no_formation_crazyflie_1_logdata.bag new file mode 100644 index 0000000000000000000000000000000000000000..6b8038d981f57926b416be822d843cb575676315 Binary files /dev/null and b/real_robot/coordination_formation_control_pkg/results/experiment_6_working/experiment_6_trianglular_no_formation_crazyflie_1_logdata.bag differ diff --git a/real_robot/coordination_formation_control_pkg/results/experiment_6_working/experiment_6_trianglular_no_formation_crazyflie_2_logdata.bag b/real_robot/coordination_formation_control_pkg/results/experiment_6_working/experiment_6_trianglular_no_formation_crazyflie_2_logdata.bag new file mode 100644 index 0000000000000000000000000000000000000000..f466250be70ead752b131d285d9548cfe2bb98de Binary files /dev/null and b/real_robot/coordination_formation_control_pkg/results/experiment_6_working/experiment_6_trianglular_no_formation_crazyflie_2_logdata.bag differ diff --git a/real_robot/coordination_formation_control_pkg/results/experiment_6/notes.txt b/real_robot/coordination_formation_control_pkg/results/experiment_6_working/notes.txt similarity index 100% rename from real_robot/coordination_formation_control_pkg/results/experiment_6/notes.txt rename to real_robot/coordination_formation_control_pkg/results/experiment_6_working/notes.txt diff --git a/real_robot/coordination_formation_control_pkg/results/experiment_7_working/test_crazyflie_1_logdata.bag b/real_robot/coordination_formation_control_pkg/results/experiment_7_working/test_crazyflie_1_logdata.bag new file mode 100644 index 0000000000000000000000000000000000000000..ce78e3229f425cc55ce8c2f86fd17b0971f1fddf Binary files /dev/null and b/real_robot/coordination_formation_control_pkg/results/experiment_7_working/test_crazyflie_1_logdata.bag differ diff --git a/real_robot/coordination_formation_control_pkg/results/experiment_7_working/test_crazyflie_2_logdata.bag b/real_robot/coordination_formation_control_pkg/results/experiment_7_working/test_crazyflie_2_logdata.bag new file mode 100644 index 0000000000000000000000000000000000000000..cb6d92c8a0d30ac2d497d2d4f506d7194f542b03 Binary files /dev/null and b/real_robot/coordination_formation_control_pkg/results/experiment_7_working/test_crazyflie_2_logdata.bag differ