fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-27 03:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixing rebase conflicts

Browse Source
This commit is contained in:
Vicente Monge
2017-08-01 22:32:43 +02:00
committed by Lorenz Meier
parent d69c53827f
commit c85039e413
65 changed files with 4091 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/configs/nuttx_aerocore2_default.cmake
+1
View File
@@ -131,6 +131,7 @@ set(config_module_list
lib/version
lib/DriverFramework/framework
platforms/nuttx
lib/micro-CDR
# had to add for cmake, not sure why wasn't in original config
platforms/common
cmake/configs/nuttx_aerofc-v1_default.cmake
+1
View File
@@ -108,6 +108,7 @@ set(config_module_list
lib/DriverFramework/framework
lib/rc
platforms/nuttx
lib/micro-CDR
# had to add for cmake, not sure why wasn't in original config
platforms/common
cmake/configs/nuttx_auav-x21_default.cmake
+1
View File
@@ -152,6 +152,7 @@ set(config_module_list
lib/version
lib/DriverFramework/framework
platforms/nuttx
lib/micro-CDR
# had to add for cmake, not sure why wasn't in original config
platforms/common
cmake/configs/nuttx_crazyflie_default.cmake
+1
View File
@@ -100,6 +100,7 @@ set(config_module_list
lib/version
lib/DriverFramework/framework
platforms/nuttx
lib/micro-CDR
# had to add for cmake, not sure why wasn't in original config
platforms/common
cmake/configs/nuttx_esc35-v1_default.cmake
+1
View File
@@ -76,6 +76,7 @@ set(config_module_list
platforms/nuttx
platforms/common
platforms/nuttx/px4_layer
lib/micro-CDR
)
cmake/configs/nuttx_mindpx-v2_default.cmake
+1
View File
@@ -156,6 +156,7 @@ set(config_module_list
lib/version
lib/DriverFramework/framework
platforms/nuttx
lib/micro-CDR
# had to add for cmake, not sure why wasn't in original config
platforms/common
cmake/configs/nuttx_px4-stm32f4discovery_default.cmake
+1
View File
@@ -48,6 +48,7 @@ set(config_module_list
lib/version
lib/DriverFramework/framework
platforms/nuttx
lib/micro-CDR
# had to add for cmake, not sure why wasn't in original config
platforms/common
cmake/configs/nuttx_px4cannode-v1_default.cmake
+1
View File
@@ -67,6 +67,7 @@ set(config_module_list
platforms/nuttx
platforms/common
platforms/nuttx/px4_layer
lib/micro-CDR
)
cmake/configs/nuttx_px4esc-v1_default.cmake
+1
View File
@@ -76,6 +76,7 @@ set(config_module_list
platforms/common
platforms/nuttx/px4_layer
modules/uORB
lib/micro-CDR
)
cmake/configs/nuttx_px4fmu-v1_default.cmake
+1
View File
@@ -125,6 +125,7 @@ set(config_module_list
lib/version
lib/DriverFramework/framework
platforms/nuttx
lib/micro-CDR
# had to add for cmake, not sure why wasn't in original config
platforms/common
cmake/configs/nuttx_px4fmu-v2_default.cmake
+1
View File
@@ -155,6 +155,7 @@ set(config_module_list
lib/version
lib/DriverFramework/framework
platforms/nuttx
lib/micro-CDR
# had to add for cmake, not sure why wasn't in original config
platforms/common
cmake/configs/nuttx_px4fmu-v2_test.cmake
+1
View File
@@ -150,6 +150,7 @@ set(config_module_list
lib/version
lib/DriverFramework/framework
platforms/nuttx
lib/micro-CDR
# had to add for cmake, not sure why wasn't in original config
platforms/common
cmake/configs/nuttx_px4fmu-v3_default.cmake
+1
View File
@@ -159,6 +159,7 @@ set(config_module_list
lib/tailsitter_recovery
lib/terrain_estimation
lib/version
lib/micro-CDR
#
# Platform
cmake/configs/nuttx_px4fmu-v4_default.cmake
+15
View File
@@ -141,6 +141,9 @@ set(config_module_list
modules/uORB
modules/dataman
# micro RTPS
modules/micrortps_bridge/micrortps_client
#
# Libraries
#
@@ -161,6 +164,7 @@ set(config_module_list
lib/version
lib/DriverFramework/framework
platforms/nuttx
lib/micro-CDR
# had to add for cmake, not sure why wasn't in original config
platforms/common
@@ -203,6 +207,17 @@ set(config_module_list
examples/ekf_att_pos_estimator
)
set(GENERATE_RTPS_BRIDGE on)
set(config_rtps_send_topics
sensor_combined
)
set(config_rtps_receive_topics
sensor_baro
)
set(config_extra_builtin_cmds
serdis
sercon
cmake/configs/nuttx_px4fmu-v4pro_default.cmake
+1
View File
@@ -160,6 +160,7 @@ set(config_module_list
lib/tailsitter_recovery
lib/terrain_estimation
lib/version
lib/micro-CDR
#
# Platform
cmake/configs/nuttx_px4fmu-v5_default.cmake
+1
View File
@@ -159,6 +159,7 @@ set(config_module_list
lib/tailsitter_recovery
lib/terrain_estimation
lib/version
lib/micro-CDR
#
# Platform
cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake
+1
View File
@@ -139,6 +139,7 @@ set(config_module_list
lib/version
lib/DriverFramework/framework
platforms/nuttx
lib/micro-CDR
# had to add for cmake, not sure why wasn't in original config
platforms/common
cmake/configs/nuttx_tap-v1_default.cmake
+1
View File
@@ -106,6 +106,7 @@ set(config_module_list
lib/version
lib/DriverFramework/framework
platforms/nuttx
lib/micro-CDR
# had to add for cmake, not sure why wasn't in original config
platforms/common
cmake/configs/posix_bebop_default.cmake
+1
View File
@@ -88,6 +88,7 @@ set(config_module_list
lib/tailsitter_recovery
lib/version
lib/DriverFramework/framework
lib/micro-CDR
#
# POSIX
cmake/configs/posix_eagle_hil.cmake
+1
View File
@@ -47,6 +47,7 @@ set(config_module_list
lib/conversion
lib/version
lib/DriverFramework/framework
lib/micro-CDR
platforms/common
platforms/posix/px4_layer
cmake/configs/posix_eagle_muorb.cmake
+1
View File
@@ -19,6 +19,7 @@ set(config_module_list
modules/uORB
lib/DriverFramework/framework
lib/micro-CDR
platforms/posix/px4_layer
platforms/posix/work_queue
cmake/configs/posix_ocpoc_cross.cmake
+1
View File
@@ -93,6 +93,7 @@ set(config_module_list
lib/DriverFramework/framework
lib/rc
lib/led
lib/micro-CDR
#
# POSIX
cmake/configs/posix_rpi_common.cmake
+1
View File
@@ -101,6 +101,7 @@ set(config_module_list
lib/tailsitter_recovery
lib/version
lib/DriverFramework/framework
lib/micro-CDR
#
# POSIX
cmake/configs/posix_sdflight_default.cmake
+4
View File
@@ -65,6 +65,9 @@ set(config_module_list
modules/commander
modules/navigator
# micro RTPS
modules/micrortps_bridge/micrortps_client
lib/controllib
lib/mathlib
lib/mathlib/math/filter
@@ -78,6 +81,7 @@ set(config_module_list
lib/tailsitter_recovery
lib/version
lib/DriverFramework/framework
lib/micro-CDR
platforms/common
platforms/posix/px4_layer
cmake/configs/posix_sdflight_legacy.cmake
+4
View File
@@ -57,6 +57,9 @@ set(config_module_list
modules/commander
modules/navigator
# micro RTPS
modules/micrortps_bridge/micrortps_client
lib/controllib
lib/mathlib
lib/mathlib/math/filter
@@ -70,6 +73,7 @@ set(config_module_list
lib/tailsitter_recovery
lib/version
lib/DriverFramework/framework
lib/micro-CDR
platforms/common
platforms/posix/px4_layer
cmake/configs/posix_sitl_default.cmake
+16
View File
@@ -104,6 +104,9 @@ set(config_module_list
modules/systemlib/mixer
modules/uORB
# micro RTPS
modules/micrortps_bridge/micrortps_client
#
# Libraries
#
@@ -171,6 +174,9 @@ set(config_module_list
# EKF
examples/ekf_att_pos_estimator
# micro-RTPS
lib/micro-CDR
)
set(config_extra_builtin_cmds
@@ -178,6 +184,16 @@ set(config_extra_builtin_cmds
sercon
)
set(GENERATE_RTPS_BRIDGE on)
set(config_rtps_send_topics
sensor_baro
)
set(config_rtps_receive_topics
sensor_combined
)
# Default config_sitl_rcS_dir (posix_sitl_default), this is overwritten later
# for the config posix_sitl_efk2 and set again, explicitly, for posix_sitl_lpe,
# which are based on posix_sitl_default.
cmake/configs/posix_sitl_replay.cmake
+1
View File
@@ -28,6 +28,7 @@ set(config_module_list
lib/geo_lookup
lib/version
lib/DriverFramework/framework
lib/micro-CDR
)
set(config_extra_builtin_cmds
cmake/configs/qurt_eagle_hello.cmake
+5
View File
@@ -34,6 +34,11 @@ set(config_module_list
modules/systemlib/param
modules/systemlib
modules/uORB
#
# Libraries
#
lib/micro-CDR
#
# QuRT port
cmake/configs/qurt_eagle_hil.cmake
+1
View File
@@ -73,6 +73,7 @@ set(config_module_list
lib/controllib
lib/version
lib/DriverFramework/framework
lib/micro-CDR
#
# QuRT port
cmake/configs/qurt_eagle_muorb.cmake
+1
View File
@@ -45,6 +45,7 @@ set(config_module_list
lib/conversion
lib/version
lib/DriverFramework/framework
lib/micro-CDR
#
# QuRT port
cmake/configs/qurt_eagle_test.cmake
+1
View File
@@ -43,6 +43,7 @@ set(config_module_list
lib/mathlib/math/filter
lib/conversion
lib/DriverFramework/framework
lib/micro-CDR
#
# QuRT port
cmake/configs/qurt_eagle_travis.cmake
+1
View File
@@ -79,6 +79,7 @@ set(config_module_list
lib/tailsitter_recovery
lib/version
lib/DriverFramework/framework
lib/micro-CDR
#
# QuRT port
cmake/configs/qurt_sdflight_default.cmake
+1
View File
@@ -94,6 +94,7 @@ set(config_module_list
lib/rc
lib/version
lib/DriverFramework/framework
lib/micro-CDR
#
# QuRT port
cmake/configs/qurt_sdflight_legacy.cmake
+1
View File
@@ -93,6 +93,7 @@ set(config_module_list
lib/tailsitter_recovery
lib/version
lib/DriverFramework/framework
lib/micro-CDR
#
# QuRT port