diff --git a/real_robot/coordination_formation_control_pkg/config/crazyfliesConfig.yaml b/real_robot/coordination_formation_control_pkg/config/crazyfliesConfig.yaml index ccb63c8d161409967bd8c20b9074d7bdda110517..8402bf54cac54e8ee2421fcf6b7c1809712bee1f 100644 --- a/real_robot/coordination_formation_control_pkg/config/crazyfliesConfig.yaml +++ b/real_robot/coordination_formation_control_pkg/config/crazyfliesConfig.yaml @@ -3,10 +3,10 @@ crazyflies: 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: 2 +# channel: 90 +# initialPosition: [0.0, 0.0, 0.0] +# type: default # - id: 3 # 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 ad147a1dea546a8441d4f0dd8133062fea417290..7710049939c03fdd47c11f5af77175390ff1f9b9 100644 --- a/real_robot/coordination_formation_control_pkg/config/missionConfig.yaml +++ b/real_robot/coordination_formation_control_pkg/config/missionConfig.yaml @@ -1,11 +1,11 @@ -n_drones: 2 +n_drones: 1 n_ugvs: 0 hz_freq: 50 # controller frquency mass: 33 # grams 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_7/test" enable_log: true # waypoint diff --git a/real_robot/coordination_formation_control_pkg/launch/mission_controller.launch b/real_robot/coordination_formation_control_pkg/launch/mission_controller.launch index b302d49cfaf497d06d278fd18c1285197e6fbc52..abe5de5b61a5ea14b2fbf1c5ffd1b0fba3fb9b7b 100644 --- a/real_robot/coordination_formation_control_pkg/launch/mission_controller.launch +++ b/real_robot/coordination_formation_control_pkg/launch/mission_controller.launch @@ -13,10 +13,10 @@ </node> </group> - <group ns="uav_2"> + <!-- <group ns="uav_2"> <node name="drone_node" pkg="coordination_formation_control_pkg" type="drone_node" output="screen" args="2" launch-prefix="xterm -e"> </node> - </group> + </group> --> <!-- <group ns="uav_3"> <node name="drone_node" pkg="coordination_formation_control_pkg" type="drone_node" output="screen" args="3" launch-prefix="xterm -e"> </node> diff --git a/real_robot/coordination_formation_control_pkg/results/experiment_7/test_crazyflie_1_logdata.bag b/real_robot/coordination_formation_control_pkg/results/experiment_7/test_crazyflie_1_logdata.bag new file mode 100644 index 0000000000000000000000000000000000000000..58f9c6b8ee8bce7fb571f589b83c71d61c6acccb Binary files /dev/null and b/real_robot/coordination_formation_control_pkg/results/experiment_7/test_crazyflie_1_logdata.bag differ diff --git a/real_robot/coordination_formation_control_pkg/results/experiment_7/test_crazyflie_2_logdata.bag b/real_robot/coordination_formation_control_pkg/results/experiment_7/test_crazyflie_2_logdata.bag new file mode 100644 index 0000000000000000000000000000000000000000..90015b3a4d64c732d40f1b185993b2b6df00d81b Binary files /dev/null and b/real_robot/coordination_formation_control_pkg/results/experiment_7/test_crazyflie_2_logdata.bag differ diff --git a/real_robot/coordination_formation_control_pkg/src/drone_node.cpp b/real_robot/coordination_formation_control_pkg/src/drone_node.cpp index c6f64f9e8549c769261777120edec6963afef995..0adde6e122582df8bbede8a98f588645d6d94944 100644 --- a/real_robot/coordination_formation_control_pkg/src/drone_node.cpp +++ b/real_robot/coordination_formation_control_pkg/src/drone_node.cpp @@ -342,8 +342,8 @@ int main(int argc, char **argv) { row_vector_2d_t range; range << -0.15, 0.15; row_vector_2d_t out = saturate(in, range); - current_command.roll = out(0)/mass; // conver it to the desired angle - current_command.pitch = out(1)/mass; + // current_command.roll = out(0)/mass; // conver it to the desired angle + // current_command.pitch = out(1)/mass; // vxx = vxl; // vyy = vyl; } diff --git a/simulation/untitled.asv b/simulation/untitled.asv deleted file mode 100644 index 494a0dcd8a75a0faa9729532918fa15d57d95904..0000000000000000000000000000000000000000 --- a/simulation/untitled.asv +++ /dev/null @@ -1,15 +0,0 @@ -A = [3 1 5; - 6 2 6]; -B = [6;4;-1]; -C = [2 4; 3 6; -1 2]; -D = [5 1; 3 1] -E = [3 -2; 1 4] -F = [2 1 3; 5 7 -2] - -A + F -E-D -C+B -C*D -A*F -C' -F'*E \ No newline at end of file