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.

Sign up for GitHub

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

create mc_rate_control (split out of mc_att_control) #12650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b2d61b
create mc_rate_control (split out of mc_att_control)
dagar Sep 4, 2019
29362ee
Merge remote-tracking branch 'px4/master' into pr-mc_rate_control
dagar Nov 19, 2019
e45a666
fmu-v5 stackcheck disable camera_capture and camera_trigger
dagar Nov 19, 2019
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ fi
# End Estimator Group Selection #
###############################################################################

#
# Start Multicopter Rate Controller.
#
mc_rate_control start

#
# Start Multicopter Attitude Controller.
#
Expand Down
1 change: 1 addition & 0 deletions ROMFS/px4fmu_common/init.d/rc.vtol_apps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Tools/uorb_graph/create.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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$'),
Expand Down
1 change: 1 addition & 0 deletions boards/aerotenna/ocpoc/ubuntu.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down
1 change: 1 addition & 0 deletions boards/airmind/mindpx-v2/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down
1 change: 1 addition & 0 deletions boards/atlflight/eagle/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
sensors
Expand Down
1 change: 1 addition & 0 deletions boards/atlflight/eagle/qurt-default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ px4_add_board(
landing_target_estimator
local_position_estimator
mc_att_control
mc_rate_control
mc_pos_control
sensors
#sih
Expand Down
1 change: 1 addition & 0 deletions boards/atlflight/excelsior/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
sensors
Expand Down
1 change: 1 addition & 0 deletions boards/atlflight/excelsior/qurt-default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ px4_add_board(
landing_target_estimator
local_position_estimator
mc_att_control
mc_rate_control
mc_pos_control
sensors
sih
Expand Down
1 change: 1 addition & 0 deletions boards/auav/x21/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down
1 change: 1 addition & 0 deletions boards/av/x-v1/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down
1 change: 1 addition & 0 deletions boards/beaglebone/blue/cross.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down
1 change: 1 addition & 0 deletions boards/beaglebone/blue/native.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down
1 change: 1 addition & 0 deletions boards/bitcraze/crazyflie/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
sensors
Expand Down
1 change: 1 addition & 0 deletions boards/emlid/navio2/cross.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down
1 change: 1 addition & 0 deletions boards/emlid/navio2/native.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down
1 change: 1 addition & 0 deletions boards/holybro/kakutef7/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down
1 change: 1 addition & 0 deletions boards/intel/aerofc-v1/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down
1 change: 1 addition & 0 deletions boards/intel/aerofc-v1/rtps.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
micrortps_bridge
navigator
Expand Down
1 change: 1 addition & 0 deletions boards/modalai/fc-v1/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ px4_add_board(
mavlink
mc_att_control
mc_pos_control
mc_rate_control
navigator
rover_pos_control
sensors
Expand Down
1 change: 1 addition & 0 deletions boards/mro/ctrl-zero-f7/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ px4_add_board(
mavlink
mc_att_control
mc_pos_control
mc_rate_control
navigator
battery_status
sensors
Expand Down
1 change: 1 addition & 0 deletions boards/nxp/fmuk66-v3/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down
1 change: 1 addition & 0 deletions boards/omnibus/f4sd/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down
1 change: 1 addition & 0 deletions boards/parrot/bebop/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
sensors
Expand Down
1 change: 1 addition & 0 deletions boards/px4/fmu-v2/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down
1 change: 1 addition & 0 deletions boards/px4/fmu-v2/lpe.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down
5 changes: 3 additions & 2 deletions boards/px4/fmu-v2/multicopter.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ px4_add_board(
irlock
lights/rgbled
magnetometer/hmc5883
optical_flow/px4flow
#optical_flow/px4flow
px4fmu
px4io
tone_alarm
Expand All @@ -52,6 +52,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down Expand Up @@ -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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down
1 change: 1 addition & 0 deletions boards/px4/fmu-v3/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down
1 change: 1 addition & 0 deletions boards/px4/fmu-v3/rtps.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
micrortps_bridge
navigator
Expand Down
1 change: 1 addition & 0 deletions boards/px4/fmu-v3/stackcheck.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down
1 change: 1 addition & 0 deletions boards/px4/fmu-v4/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
rover_pos_control
Expand Down
1 change: 1 addition & 0 deletions boards/px4/fmu-v4/rtps.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
micrortps_bridge
navigator
Expand Down
1 change: 1 addition & 0 deletions boards/px4/fmu-v4/stackcheck.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
rover_pos_control
Expand Down
1 change: 1 addition & 0 deletions boards/px4/fmu-v4pro/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down
1 change: 1 addition & 0 deletions boards/px4/fmu-v4pro/rtps.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
micrortps_bridge
navigator
Expand Down
1 change: 1 addition & 0 deletions boards/px4/fmu-v5/critmonitor.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down
1 change: 1 addition & 0 deletions boards/px4/fmu-v5/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down
1 change: 1 addition & 0 deletions boards/px4/fmu-v5/irqmonitor.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down
1 change: 1 addition & 0 deletions boards/px4/fmu-v5/multicopter.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down
1 change: 1 addition & 0 deletions boards/px4/fmu-v5/rtps.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
micrortps_bridge
navigator
Expand Down
6 changes: 4 additions & 2 deletions boards/px4/fmu-v5/stackcheck.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -73,6 +74,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
#micrortps_bridge
navigator
Expand Down
1 change: 1 addition & 0 deletions boards/px4/fmu-v5x/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
rover_pos_control
Expand Down
1 change: 1 addition & 0 deletions boards/px4/raspberrypi/cross.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ px4_add_board(
logger
mavlink
mc_att_control
mc_rate_control
mc_pos_control
navigator
battery_status
Expand Down
Loading