Skip to content
Snippets Groups Projects
Commit e4a44eb1 authored by Stevedan Ogochukwu Omodolor's avatar Stevedan Ogochukwu Omodolor
Browse files

pushin

parent 5cfc0d1c
Branches
No related tags found
No related merge requests found
...@@ -3,10 +3,10 @@ crazyflies: ...@@ -3,10 +3,10 @@ crazyflies:
channel: 90 channel: 90
initialPosition: [0.0, 0.0, 0.0] initialPosition: [0.0, 0.0, 0.0]
type: default type: default
- id: 2 # - id: 2
channel: 90 # channel: 90
initialPosition: [0.0, 0.0, 0.0] # initialPosition: [0.0, 0.0, 0.0]
type: default # type: default
# - id: 3 # - id: 3
# channel: 80 # channel: 80
# initialPosition: [0.0, 0.0, 0.0] # initialPosition: [0.0, 0.0, 0.0]
......
n_drones: 2 n_drones: 1
n_ugvs: 0 n_ugvs: 0
hz_freq: 50 # controller frquency hz_freq: 50 # controller frquency
mass: 33 # grams mass: 33 # grams
include_obstacle: false include_obstacle: false
include_orientation: false include_orientation: false
n_obs: 0 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 enable_log: true
# waypoint # waypoint
......
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
</node> </node>
</group> </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 name="drone_node" pkg="coordination_formation_control_pkg" type="drone_node" output="screen" args="2" launch-prefix="xterm -e">
</node> </node>
</group> </group> -->
<!-- <group ns="uav_3"> <!-- <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 name="drone_node" pkg="coordination_formation_control_pkg" type="drone_node" output="screen" args="3" launch-prefix="xterm -e">
</node> </node>
......
...@@ -342,8 +342,8 @@ int main(int argc, char **argv) { ...@@ -342,8 +342,8 @@ int main(int argc, char **argv) {
row_vector_2d_t range; row_vector_2d_t range;
range << -0.15, 0.15; range << -0.15, 0.15;
row_vector_2d_t out = saturate(in, range); row_vector_2d_t out = saturate(in, range);
current_command.roll = out(0)/mass; // conver it to the desired angle // current_command.roll = out(0)/mass; // conver it to the desired angle
current_command.pitch = out(1)/mass; // current_command.pitch = out(1)/mass;
// vxx = vxl; // vxx = vxl;
// vyy = vyl; // vyy = vyl;
} }
......
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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment