Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

create mc_rate_control (split out of mc_att_control) #12650

Merged
merged 3 commits into from
Nov 19, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ROMFS/px4fmu_common/init.d/rc.mc_apps
Original file line number Diff line number Diff line change
@@ -48,6 +48,11 @@ fi
# End Estimator Group Selection #
###############################################################################

#
# Start Multicopter Rate Controller.
#
mc_rate_control start

#
# Start Multicopter Attitude Controller.
#
1 change: 1 addition & 0 deletions ROMFS/px4fmu_common/init.d/rc.vtol_apps
Original file line number Diff line number Diff line change
@@ -17,6 +17,7 @@ ekf2 start


vtol_att_control start
mc_rate_control start
mc_att_control start
mc_pos_control start
fw_att_control start
2 changes: 1 addition & 1 deletion Tools/uorb_graph/create.py
Original file line number Diff line number Diff line change
@@ -243,7 +243,7 @@ def __init__(self, module_whitelist=[], topic_blacklist=[]):

('mc_pos_control', r'mc_pos_control_main\.cpp$', r'\b_attitude_setpoint_id=([^,)]+)', r'^_attitude_setpoint_id$'),

('mc_att_control', r'mc_att_control_main\.cpp$', r'\b_actuators_id=([^,)]+)', r'^_actuators_id$'),
('mc_rate_control', r'MulticopterRateControl\.cpp$', r'\b_actuators_id=([^,)]+)', r'^_actuators_id$'),
('mc_att_control', r'mc_att_control_main\.cpp$', r'\_attitude_sp_id=([^,)]+)', r'^_attitude_sp_id$'),

('fw_att_control', r'FixedwingAttitudeControl\.cpp$', r'\b_actuators_id=([^,)]+)', r'^_actuators_id$'),
1 change: 1 addition & 0 deletions boards/aerotenna/ocpoc/ubuntu.cmake
Original file line number Diff line number Diff line change
@@ -47,6 +47,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
1 change: 1 addition & 0 deletions boards/airmind/mindpx-v2/default.cmake
Original file line number Diff line number Diff line change
@@ -63,6 +63,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
1 change: 1 addition & 0 deletions boards/atlflight/eagle/default.cmake
Original file line number Diff line number Diff line change
@@ -80,6 +80,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
sensors
1 change: 1 addition & 0 deletions boards/atlflight/eagle/qurt-default.cmake
Original file line number Diff line number Diff line change
@@ -74,6 +74,7 @@ px4_add_board(
landing_target_estimator
local_position_estimator
mc_att_control
mc_rate_control
mc_pos_control
sensors
#sih
1 change: 1 addition & 0 deletions boards/atlflight/excelsior/default.cmake
Original file line number Diff line number Diff line change
@@ -80,6 +80,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
sensors
1 change: 1 addition & 0 deletions boards/atlflight/excelsior/qurt-default.cmake
Original file line number Diff line number Diff line change
@@ -73,6 +73,7 @@ px4_add_board(
landing_target_estimator
local_position_estimator
mc_att_control
mc_rate_control
mc_pos_control
sensors
sih
1 change: 1 addition & 0 deletions boards/auav/x21/default.cmake
Original file line number Diff line number Diff line change
@@ -68,6 +68,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
1 change: 1 addition & 0 deletions boards/av/x-v1/default.cmake
Original file line number Diff line number Diff line change
@@ -69,6 +69,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
1 change: 1 addition & 0 deletions boards/beaglebone/blue/cross.cmake
Original file line number Diff line number Diff line change
@@ -46,6 +46,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
1 change: 1 addition & 0 deletions boards/beaglebone/blue/native.cmake
Original file line number Diff line number Diff line change
@@ -44,6 +44,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
1 change: 1 addition & 0 deletions boards/bitcraze/crazyflie/default.cmake
Original file line number Diff line number Diff line change
@@ -32,6 +32,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
sensors
1 change: 1 addition & 0 deletions boards/emlid/navio2/cross.cmake
Original file line number Diff line number Diff line change
@@ -51,6 +51,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
1 change: 1 addition & 0 deletions boards/emlid/navio2/native.cmake
Original file line number Diff line number Diff line change
@@ -49,6 +49,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
1 change: 1 addition & 0 deletions boards/holybro/kakutef7/default.cmake
Original file line number Diff line number Diff line change
@@ -42,6 +42,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
1 change: 1 addition & 0 deletions boards/intel/aerofc-v1/default.cmake
Original file line number Diff line number Diff line change
@@ -48,6 +48,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
1 change: 1 addition & 0 deletions boards/intel/aerofc-v1/rtps.cmake
Original file line number Diff line number Diff line change
@@ -51,6 +51,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
micrortps_bridge
navigator
1 change: 1 addition & 0 deletions boards/modalai/fc-v1/default.cmake
Original file line number Diff line number Diff line change
@@ -71,6 +71,7 @@ px4_add_board(
mavlink
mc_att_control
mc_pos_control
mc_rate_control
navigator
rover_pos_control
sensors
1 change: 1 addition & 0 deletions boards/mro/ctrl-zero-f7/default.cmake
Original file line number Diff line number Diff line change
@@ -72,6 +72,7 @@ px4_add_board(
mavlink
mc_att_control
mc_pos_control
mc_rate_control
navigator
battery_status
sensors
1 change: 1 addition & 0 deletions boards/nxp/fmuk66-v3/default.cmake
Original file line number Diff line number Diff line change
@@ -67,6 +67,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
1 change: 1 addition & 0 deletions boards/omnibus/f4sd/default.cmake
Original file line number Diff line number Diff line change
@@ -59,6 +59,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
1 change: 1 addition & 0 deletions boards/parrot/bebop/default.cmake
Original file line number Diff line number Diff line change
@@ -36,6 +36,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
sensors
1 change: 1 addition & 0 deletions boards/px4/fmu-v2/default.cmake
Original file line number Diff line number Diff line change
@@ -78,6 +78,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
1 change: 1 addition & 0 deletions boards/px4/fmu-v2/lpe.cmake
Original file line number Diff line number Diff line change
@@ -75,6 +75,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
5 changes: 3 additions & 2 deletions boards/px4/fmu-v2/multicopter.cmake
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ px4_add_board(
irlock
lights/rgbled
magnetometer/hmc5883
optical_flow/px4flow
#optical_flow/px4flow
px4fmu
px4io
tone_alarm
@@ -52,6 +52,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
@@ -81,6 +82,6 @@ px4_add_board(
tune_control
usb_connected
ver
work_queue
#work_queue

)
1 change: 1 addition & 0 deletions boards/px4/fmu-v2/test.cmake
Original file line number Diff line number Diff line change
@@ -75,6 +75,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
1 change: 1 addition & 0 deletions boards/px4/fmu-v3/default.cmake
Original file line number Diff line number Diff line change
@@ -77,6 +77,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
1 change: 1 addition & 0 deletions boards/px4/fmu-v3/rtps.cmake
Original file line number Diff line number Diff line change
@@ -75,6 +75,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
micrortps_bridge
navigator
1 change: 1 addition & 0 deletions boards/px4/fmu-v3/stackcheck.cmake
Original file line number Diff line number Diff line change
@@ -75,6 +75,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
1 change: 1 addition & 0 deletions boards/px4/fmu-v4/default.cmake
Original file line number Diff line number Diff line change
@@ -66,6 +66,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
rover_pos_control
1 change: 1 addition & 0 deletions boards/px4/fmu-v4/rtps.cmake
Original file line number Diff line number Diff line change
@@ -67,6 +67,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
micrortps_bridge
navigator
1 change: 1 addition & 0 deletions boards/px4/fmu-v4/stackcheck.cmake
Original file line number Diff line number Diff line change
@@ -66,6 +66,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
rover_pos_control
1 change: 1 addition & 0 deletions boards/px4/fmu-v4pro/default.cmake
Original file line number Diff line number Diff line change
@@ -71,6 +71,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
1 change: 1 addition & 0 deletions boards/px4/fmu-v4pro/rtps.cmake
Original file line number Diff line number Diff line change
@@ -73,6 +73,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
micrortps_bridge
navigator
1 change: 1 addition & 0 deletions boards/px4/fmu-v5/critmonitor.cmake
Original file line number Diff line number Diff line change
@@ -75,6 +75,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
1 change: 1 addition & 0 deletions boards/px4/fmu-v5/default.cmake
Original file line number Diff line number Diff line change
@@ -76,6 +76,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
1 change: 1 addition & 0 deletions boards/px4/fmu-v5/irqmonitor.cmake
Original file line number Diff line number Diff line change
@@ -75,6 +75,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
1 change: 1 addition & 0 deletions boards/px4/fmu-v5/multicopter.cmake
Original file line number Diff line number Diff line change
@@ -60,6 +60,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
1 change: 1 addition & 0 deletions boards/px4/fmu-v5/rtps.cmake
Original file line number Diff line number Diff line change
@@ -73,6 +73,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
micrortps_bridge
navigator
6 changes: 4 additions & 2 deletions boards/px4/fmu-v5/stackcheck.cmake
Original file line number Diff line number Diff line change
@@ -21,8 +21,8 @@ px4_add_board(
adc
barometer/ms5611
#batt_smbus
camera_capture
camera_trigger
#camera_capture
#camera_trigger
differential_pressure # all available differential pressure drivers
distance_sensor # all available distance sensor drivers
gps
@@ -42,6 +42,7 @@ px4_add_board(
mkblctrl
optical_flow # all available optical flow drivers
#pca9685
#power_monitor/ina226
#protocol_splitter
pwm_input
pwm_out_sim
@@ -73,6 +74,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
#micrortps_bridge
navigator
1 change: 1 addition & 0 deletions boards/px4/fmu-v5x/default.cmake
Original file line number Diff line number Diff line change
@@ -74,6 +74,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
rover_pos_control
1 change: 1 addition & 0 deletions boards/px4/raspberrypi/cross.cmake
Original file line number Diff line number Diff line change
@@ -41,6 +41,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Loading