forked from Archive/PX4-Autopilot
move uavcan from modules to drivers
This commit is contained in:
Daniel Agar
parent
bbab66d974
commit
75b2053243
|
|
@ -2,8 +2,8 @@
|
|||
path = mavlink/include/mavlink/v2.0
|
||||
url = https://github.com/mavlink/c_library_v2.git
|
||||
branch = master
|
||||
[submodule "src/modules/uavcan/libuavcan"]
|
||||
path = src/modules/uavcan/libuavcan
|
||||
[submodule "src/drivers/uavcan/libuavcan"]
|
||||
path = src/drivers/uavcan/libuavcan
|
||||
url = https://github.com/UAVCAN/libuavcan.git
|
||||
branch = master
|
||||
[submodule "msg/tools/genmsg"]
|
||||
|
|
|
|||
|
|
@ -15,5 +15,5 @@ exec find boards src platforms \
|
|||
-path src/lib/matrix -prune -o \
|
||||
-path src/modules/micrortps_bridge/micro-CDR -prune -o \
|
||||
-path src/modules/systemlib/uthash -prune -o \
|
||||
-path src/modules/uavcan/libuavcan -prune -o \
|
||||
-path src/drivers/uavcan/libuavcan -prune -o \
|
||||
-type f \( -name "*.c" -o -name "*.h" -o -name "*.cpp" -o -name "*.hpp" \) | grep $PATTERN
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@ px4_add_board(
|
|||
position_estimator_inav
|
||||
sensors
|
||||
#simulator
|
||||
#uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@ px4_add_board(
|
|||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
uavcan
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
@ -68,7 +69,6 @@ px4_add_board(
|
|||
navigator
|
||||
position_estimator_inav
|
||||
sensors
|
||||
uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -86,7 +86,6 @@ px4_add_board(
|
|||
position_estimator_inav
|
||||
sensors
|
||||
simulator
|
||||
#uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -86,7 +86,6 @@ px4_add_board(
|
|||
position_estimator_inav
|
||||
sensors
|
||||
simulator
|
||||
#uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -69,7 +69,6 @@ px4_add_board(
|
|||
navigator
|
||||
position_estimator_inav
|
||||
sensors
|
||||
#WIP uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -46,15 +46,9 @@ px4_add_board(
|
|||
DRIVERS
|
||||
bootloaders
|
||||
stm32
|
||||
uavcanesc
|
||||
|
||||
MODULES
|
||||
uavcanesc
|
||||
uavcanesc/nshterm
|
||||
uavcanesc/commands/cfg
|
||||
uavcanesc/commands/selftest
|
||||
uavcanesc/commands/dc
|
||||
uavcanesc/commands/rpm
|
||||
uavcanesc/commands/stat
|
||||
|
||||
SYSTEMCMDS
|
||||
config
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@ px4_add_board(
|
|||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
uavcan
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
@ -73,7 +74,6 @@ px4_add_board(
|
|||
navigator
|
||||
position_estimator_inav
|
||||
sensors
|
||||
uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@ px4_add_board(
|
|||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
uavcan
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
@ -73,7 +74,6 @@ px4_add_board(
|
|||
navigator
|
||||
position_estimator_inav
|
||||
sensors
|
||||
uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -49,7 +49,6 @@ px4_add_board(
|
|||
navigator
|
||||
position_estimator_inav
|
||||
sensors
|
||||
#uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -47,7 +47,6 @@ px4_add_board(
|
|||
navigator
|
||||
position_estimator_inav
|
||||
sensors
|
||||
#uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ px4_add_board(
|
|||
navigator
|
||||
position_estimator_inav
|
||||
sensors
|
||||
#uavcan
|
||||
#vtol_att_control
|
||||
wind_estimator
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,6 @@ px4_add_board(
|
|||
position_estimator_inav
|
||||
sensors
|
||||
#simulator
|
||||
#uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@ px4_add_board(
|
|||
position_estimator_inav
|
||||
sensors
|
||||
#simulator
|
||||
#uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@ px4_add_board(
|
|||
#tap_esc
|
||||
#telemetry # all available telemetry drivers
|
||||
#test_ppm
|
||||
#vmount
|
||||
|
||||
MODULES
|
||||
#attitude_estimator_q
|
||||
|
|
@ -72,7 +71,7 @@ px4_add_board(
|
|||
navigator
|
||||
#position_estimator_inav
|
||||
sensors
|
||||
#uavcan
|
||||
vmount
|
||||
#vtol_att_control
|
||||
#wind_estimator
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ px4_add_board(
|
|||
stm32
|
||||
tap_esc
|
||||
#telemetry # all available telemetry drivers
|
||||
#vmount
|
||||
#uavcan
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
@ -54,7 +54,7 @@ px4_add_board(
|
|||
navigator
|
||||
#position_estimator_inav
|
||||
sensors
|
||||
#uavcan
|
||||
vmount
|
||||
#vtol_att_control
|
||||
#wind_estimator
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ px4_add_board(
|
|||
stm32
|
||||
tap_esc
|
||||
#telemetry # all available telemetry drivers
|
||||
#vmount
|
||||
#uavcan
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
@ -57,7 +57,7 @@ px4_add_board(
|
|||
navigator
|
||||
#position_estimator_inav
|
||||
sensors
|
||||
#uavcan
|
||||
vmount
|
||||
#vtol_att_control
|
||||
#wind_estimator
|
||||
|
||||
|
|
|
|||
|
|
@ -70,7 +70,6 @@ px4_add_board(
|
|||
navigator
|
||||
position_estimator_inav
|
||||
sensors
|
||||
uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -42,7 +42,6 @@ px4_add_board(
|
|||
#telemetry # all available telemetry drivers
|
||||
telemetry/frsky_telemetry
|
||||
#test_ppm
|
||||
#vmount
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
@ -66,7 +65,7 @@ px4_add_board(
|
|||
navigator
|
||||
#position_estimator_inav
|
||||
sensors
|
||||
#uavcan
|
||||
#vmount
|
||||
#vtol_att_control
|
||||
#wind_estimator
|
||||
|
||||
|
|
|
|||
|
|
@ -44,9 +44,9 @@ px4_add_board(
|
|||
DRIVERS
|
||||
bootloaders
|
||||
stm32
|
||||
uavcannode
|
||||
|
||||
MODULES
|
||||
uavcannode
|
||||
|
||||
SYSTEMCMDS
|
||||
config
|
||||
|
|
|
|||
|
|
@ -46,15 +46,9 @@ px4_add_board(
|
|||
DRIVERS
|
||||
bootloaders
|
||||
stm32
|
||||
uavcanesc
|
||||
|
||||
MODULES
|
||||
uavcanesc
|
||||
uavcanesc/nshterm
|
||||
uavcanesc/commands/cfg
|
||||
uavcanesc/commands/selftest
|
||||
uavcanesc/commands/dc
|
||||
uavcanesc/commands/rpm
|
||||
uavcanesc/commands/stat
|
||||
|
||||
SYSTEMCMDS
|
||||
config
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ px4_add_board(
|
|||
#tap_esc
|
||||
#telemetry # all available telemetry drivers
|
||||
#test_ppm
|
||||
#uavcan
|
||||
|
||||
MODULES
|
||||
#attitude_estimator_q
|
||||
|
|
@ -80,7 +81,6 @@ px4_add_board(
|
|||
navigator
|
||||
#position_estimator_inav
|
||||
sensors
|
||||
#uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
#wind_estimator
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@ px4_add_board(
|
|||
#tap_esc
|
||||
#telemetry # all available telemetry drivers
|
||||
#test_ppm
|
||||
#uavcan
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
@ -78,7 +79,7 @@ px4_add_board(
|
|||
navigator
|
||||
#position_estimator_inav
|
||||
sensors
|
||||
#uavcan
|
||||
vmount
|
||||
#vtol_att_control
|
||||
#wind_estimator
|
||||
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ px4_add_board(
|
|||
#tap_esc
|
||||
#telemetry # all available telemetry drivers
|
||||
#test_ppm
|
||||
#uavcan
|
||||
|
||||
MODULES
|
||||
#attitude_estimator_q
|
||||
|
|
@ -79,7 +80,6 @@ px4_add_board(
|
|||
navigator
|
||||
#position_estimator_inav
|
||||
sensors
|
||||
#uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
#wind_estimator
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ px4_add_board(
|
|||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
uavcan
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
@ -81,7 +82,6 @@ px4_add_board(
|
|||
navigator
|
||||
position_estimator_inav
|
||||
sensors
|
||||
uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ px4_add_board(
|
|||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
uavcan
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
@ -82,7 +83,6 @@ px4_add_board(
|
|||
navigator
|
||||
position_estimator_inav
|
||||
sensors
|
||||
uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ px4_add_board(
|
|||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
#uavcan
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
@ -81,7 +82,6 @@ px4_add_board(
|
|||
navigator
|
||||
position_estimator_inav
|
||||
sensors
|
||||
#uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ px4_add_board(
|
|||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
uavcan
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
@ -66,7 +67,6 @@ px4_add_board(
|
|||
navigator
|
||||
position_estimator_inav
|
||||
sensors
|
||||
uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ px4_add_board(
|
|||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
uavcan
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
@ -68,7 +69,6 @@ px4_add_board(
|
|||
navigator
|
||||
position_estimator_inav
|
||||
sensors
|
||||
uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ px4_add_board(
|
|||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
#uavcan
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
@ -66,7 +67,6 @@ px4_add_board(
|
|||
navigator
|
||||
position_estimator_inav
|
||||
sensors
|
||||
#uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ px4_add_board(
|
|||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
uavcan
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
@ -80,7 +81,6 @@ px4_add_board(
|
|||
navigator
|
||||
position_estimator_inav
|
||||
sensors
|
||||
uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ px4_add_board(
|
|||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
uavcan
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
@ -81,7 +82,6 @@ px4_add_board(
|
|||
navigator
|
||||
position_estimator_inav
|
||||
sensors
|
||||
uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ px4_add_board(
|
|||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
uavcan
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
@ -80,7 +81,6 @@ px4_add_board(
|
|||
navigator
|
||||
position_estimator_inav
|
||||
sensors
|
||||
uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ px4_add_board(
|
|||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
uavcan
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
@ -82,7 +83,6 @@ px4_add_board(
|
|||
navigator
|
||||
position_estimator_inav
|
||||
sensors
|
||||
uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ px4_add_board(
|
|||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
#uavcan
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
@ -81,7 +82,6 @@ px4_add_board(
|
|||
navigator
|
||||
position_estimator_inav
|
||||
sensors
|
||||
#uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@ px4_add_board(
|
|||
navigator
|
||||
position_estimator_inav
|
||||
sensors
|
||||
#uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -45,7 +45,6 @@ px4_add_board(
|
|||
position_estimator_inav
|
||||
sensors
|
||||
#simulator
|
||||
#uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ px4_add_board(
|
|||
pwm_out_sim
|
||||
#telemetry # all available telemetry drivers
|
||||
tone_alarm_sim
|
||||
#uavcan
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
@ -43,7 +44,6 @@ px4_add_board(
|
|||
replay
|
||||
sensors
|
||||
simulator
|
||||
#uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ px4_add_board(
|
|||
#protocol_splitter
|
||||
pwm_out_sim
|
||||
#telemetry # all available telemetry drivers
|
||||
#uavcan
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
@ -44,7 +45,6 @@ px4_add_board(
|
|||
replay
|
||||
sensors
|
||||
simulator
|
||||
#uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ px4_add_board(
|
|||
#magnetometer # all available magnetometer drivers
|
||||
pwm_out_sim
|
||||
#telemetry # all available telemetry drivers
|
||||
#uavcan
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
@ -42,7 +43,6 @@ px4_add_board(
|
|||
replay
|
||||
sensors
|
||||
simulator
|
||||
#uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ px4_add_board(
|
|||
#tap_esc
|
||||
#telemetry # all available telemetry drivers
|
||||
#test_ppm
|
||||
#vmount
|
||||
#uavcan
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
@ -59,7 +59,7 @@ px4_add_board(
|
|||
#navigator
|
||||
position_estimator_inav
|
||||
#sensors
|
||||
#uavcan
|
||||
#vmount
|
||||
#vtol_att_control
|
||||
wind_estimator
|
||||
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ px4_add_board(
|
|||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
#uavcan
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
@ -67,7 +68,6 @@ px4_add_board(
|
|||
navigator
|
||||
position_estimator_inav
|
||||
sensors
|
||||
#uavcan
|
||||
vmount
|
||||
vtol_att_control
|
||||
wind_estimator
|
||||
|
|
|
|||
|
|
@ -37,9 +37,9 @@ px4_add_board(
|
|||
DRIVERS
|
||||
bootloaders
|
||||
stm32
|
||||
#uavcannode
|
||||
|
||||
MODULES
|
||||
#uavcannode
|
||||
|
||||
SYSTEMCMDS
|
||||
config
|
||||
|
|
|
|||
|
|
@ -31,7 +31,9 @@
|
|||
#
|
||||
############################################################################
|
||||
|
||||
px4_add_git_submodule(TARGET git_uavcan PATH "../uavcan/libuavcan")
|
||||
set(LIBUAVCAN_DIR ${PX4_SOURCE_DIR}/src/drivers/uavcan/libuavcan)
|
||||
|
||||
px4_add_git_submodule(TARGET git_uavcan PATH ${LIBUAVCAN_DIR})
|
||||
|
||||
set(UAVCAN_USE_CPP03 ON CACHE BOOL "uavcan cpp03")
|
||||
set(UAVCAN_PLATFORM stm32 CACHE STRING "uavcan platform")
|
||||
|
|
@ -50,8 +52,6 @@ add_definitions(
|
|||
-DUAVCAN_USE_EXTERNAL_SNPRINT
|
||||
)
|
||||
|
||||
set(LIBUAVCAN_DIR ${PX4_SOURCE_DIR}/src/modules/uavcan/libuavcan)
|
||||
|
||||
add_subdirectory(${LIBUAVCAN_DIR} uavcanesc_libuavcan)
|
||||
add_dependencies(uavcan prebuild_targets)
|
||||
|
||||
|
|
@ -63,7 +63,6 @@ include_directories(${LIBUAVCAN_DIR}/libuavcan_drivers/stm32/driver/include)
|
|||
|
||||
include_directories(${PX4_SOURCE_DIR}/src/drivers/bootloaders)
|
||||
|
||||
|
||||
px4_add_module(
|
||||
MODULE modules__uavcanesc
|
||||
MAIN uavcanesc
|
||||
|
|
@ -86,3 +85,6 @@ px4_add_module(
|
|||
uavcan
|
||||
uavcan_stm32_driver
|
||||
)
|
||||
|
||||
add_subdirectory(commands)
|
||||
add_subdirectory(nshterm)
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
############################################################################
|
||||
#
|
||||
# Copyright (c) 2018 PX4 Development Team. All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
#
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# 2. Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in
|
||||
# the documentation and/or other materials provided with the
|
||||
# distribution.
|
||||
# 3. Neither the name PX4 nor the names of its contributors may be
|
||||
# used to endorse or promote products derived from this software
|
||||
# without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
# POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
############################################################################
|
||||
|
||||
add_subdirectory(cfg)
|
||||
add_subdirectory(dc)
|
||||
add_subdirectory(rpm)
|
||||
add_subdirectory(selftest)
|
||||
add_subdirectory(stat)
|
||||
|
|
@ -42,5 +42,3 @@ px4_add_module(
|
|||
PRIORITY "SCHED_PRIORITY_DEFAULT-30"
|
||||
DEPENDS
|
||||
)
|
||||
|
||||
#
|
||||
|
|
@ -31,7 +31,9 @@
|
|||
#
|
||||
############################################################################
|
||||
|
||||
px4_add_git_submodule(TARGET git_uavcan PATH "../uavcan/libuavcan")
|
||||
set(LIBUAVCAN_DIR ${PX4_SOURCE_DIR}/src/drivers/uavcan/libuavcan)
|
||||
|
||||
px4_add_git_submodule(TARGET git_uavcan PATH ${LIBUAVCAN_DIR})
|
||||
|
||||
set(UAVCAN_USE_CPP03 ON CACHE BOOL "uavcan cpp03")
|
||||
set(UAVCAN_PLATFORM stm32 CACHE STRING "uavcan platform")
|
||||
|
|
@ -50,8 +52,6 @@ add_definitions(
|
|||
-DUAVCAN_USE_EXTERNAL_SNPRINT
|
||||
)
|
||||
|
||||
set(LIBUAVCAN_DIR ${PX4_SOURCE_DIR}/src/modules/uavcan/libuavcan)
|
||||
|
||||
add_subdirectory(${LIBUAVCAN_DIR} uavcannode_libuavcan)
|
||||
add_dependencies(uavcan prebuild_targets)
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue