makefiles and rc scripts fixed to use new attitude and position controllers

This commit is contained in:
Anton Babushkin
2013-12-26 23:06:36 +04:00
parent 20c9ce9d6d
commit e1f949163b
6 changed files with 6 additions and 8 deletions
+1 -1
View File
@@ -72,7 +72,7 @@ flow_position_estimator start
# #
# Fire up the multi rotor attitude controller # Fire up the multi rotor attitude controller
# #
multirotor_att_control start mc_att_control_vector start
# #
# Fire up the flow position controller # Fire up the flow position controller
+1 -1
View File
@@ -91,7 +91,7 @@ mc_att_control_vector start
# #
# Start position control # Start position control
# #
multirotor_pos_control start mc_pos_control start
echo "[HIL] setup done, running" echo "[HIL] setup done, running"
@@ -91,7 +91,7 @@ mc_att_control_vector start
# #
# Start position control # Start position control
# #
multirotor_pos_control start mc_pos_control start
echo "[HIL] setup done, running" echo "[HIL] setup done, running"
+1 -1
View File
@@ -36,4 +36,4 @@ mc_att_control_vector start
# #
# Start position control # Start position control
# #
multirotor_pos_control start mc_pos_control start
+1 -2
View File
@@ -83,9 +83,8 @@ MODULES += examples/flow_position_estimator
#MODULES += modules/segway # XXX Needs GCC 4.7 fix #MODULES += modules/segway # XXX Needs GCC 4.7 fix
MODULES += modules/fw_pos_control_l1 MODULES += modules/fw_pos_control_l1
MODULES += modules/fw_att_control MODULES += modules/fw_att_control
MODULES += modules/multirotor_att_control
MODULES += modules/mc_att_control_vector MODULES += modules/mc_att_control_vector
MODULES += modules/multirotor_pos_control MODULES += modules/mc_pos_control
MODULES += examples/flow_position_control MODULES += examples/flow_position_control
MODULES += examples/flow_speed_control MODULES += examples/flow_speed_control
+1 -2
View File
@@ -83,9 +83,8 @@ MODULES += examples/flow_position_estimator
#MODULES += modules/segway # XXX Needs GCC 4.7 fix #MODULES += modules/segway # XXX Needs GCC 4.7 fix
MODULES += modules/fw_pos_control_l1 MODULES += modules/fw_pos_control_l1
MODULES += modules/fw_att_control MODULES += modules/fw_att_control
MODULES += modules/multirotor_att_control
MODULES += modules/mc_att_control_vector MODULES += modules/mc_att_control_vector
MODULES += modules/multirotor_pos_control MODULES += modules/mc_pos_control
# #
# Logging # Logging