forked from Archive/PX4-Autopilot
move posix, nuttx, qurt components into platforms
This commit is contained in:
parent
a644ed90dd
commit
2ff81393bc
|
@ -397,6 +397,8 @@ endif()
|
|||
#=============================================================================
|
||||
# subdirectories
|
||||
#
|
||||
add_subdirectory(src/platforms/common)
|
||||
|
||||
foreach(module ${config_module_list})
|
||||
add_subdirectory(src/${module})
|
||||
endforeach()
|
||||
|
|
|
@ -8,9 +8,9 @@ then
|
|||
PATTERN="$1"
|
||||
fi
|
||||
|
||||
exec find src \
|
||||
-path src/examples/attitude_estimator_ekf -prune -o \
|
||||
-path src/examples/ekf_att_pos_estimator -prune -o \
|
||||
exec find src platforms \
|
||||
-path platforms/nuttx/NuttX -prune -o \
|
||||
-path platforms/nuttx/nuttx-configs -prune -o \
|
||||
-path src/lib/DriverFramework -prune -o \
|
||||
-path src/lib/ecl -prune -o \
|
||||
-path src/lib/matrix -prune -o \
|
||||
|
|
|
@ -126,11 +126,6 @@ set(config_module_list
|
|||
lib/terrain_estimation
|
||||
lib/tunes
|
||||
lib/version
|
||||
platforms/nuttx
|
||||
|
||||
# had to add for cmake, not sure why wasn't in original config
|
||||
platforms/common
|
||||
platforms/nuttx/px4_layer
|
||||
|
||||
#
|
||||
# OBC challenge
|
||||
|
|
|
@ -87,7 +87,4 @@ set(config_module_list
|
|||
lib/rc
|
||||
lib/tailsitter_recovery
|
||||
lib/version
|
||||
platforms/common
|
||||
platforms/nuttx
|
||||
platforms/nuttx/px4_layer
|
||||
)
|
||||
|
|
|
@ -137,11 +137,6 @@ set(config_module_list
|
|||
lib/terrain_estimation
|
||||
lib/tunes
|
||||
lib/version
|
||||
platforms/nuttx
|
||||
|
||||
# had to add for cmake, not sure why wasn't in original config
|
||||
platforms/common
|
||||
platforms/nuttx/px4_layer
|
||||
|
||||
#
|
||||
# OBC challenge
|
||||
|
|
|
@ -93,11 +93,6 @@ set(config_module_list
|
|||
lib/tailsitter_recovery
|
||||
lib/terrain_estimation
|
||||
lib/version
|
||||
platforms/nuttx
|
||||
|
||||
# had to add for cmake, not sure why wasn't in original config
|
||||
platforms/common
|
||||
platforms/nuttx/px4_layer
|
||||
|
||||
#
|
||||
# OBC challenge
|
||||
|
|
|
@ -71,7 +71,4 @@ set(config_module_list
|
|||
modules/systemlib
|
||||
modules/systemlib/param
|
||||
modules/uORB
|
||||
platforms/common
|
||||
platforms/nuttx
|
||||
platforms/nuttx/px4_layer
|
||||
)
|
||||
|
|
|
@ -141,11 +141,6 @@ set(config_module_list
|
|||
lib/terrain_estimation
|
||||
lib/tunes
|
||||
lib/version
|
||||
platforms/nuttx
|
||||
|
||||
# had to add for cmake, not sure why wasn't in original config
|
||||
platforms/common
|
||||
platforms/nuttx/px4_layer
|
||||
|
||||
#
|
||||
# OBC challenge
|
||||
|
|
|
@ -150,13 +150,6 @@ set(config_module_list
|
|||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
|
||||
#
|
||||
# Platform
|
||||
#
|
||||
platforms/common
|
||||
platforms/nuttx
|
||||
platforms/nuttx/px4_layer
|
||||
|
||||
#
|
||||
# OBC challenge
|
||||
#
|
||||
|
|
|
@ -119,11 +119,6 @@ set(config_module_list
|
|||
lib/tailsitter_recovery
|
||||
lib/terrain_estimation
|
||||
lib/version
|
||||
platforms/nuttx
|
||||
|
||||
# had to add for cmake, not sure why wasn't in original config
|
||||
platforms/common
|
||||
platforms/nuttx/px4_layer
|
||||
|
||||
#
|
||||
# OBC challenge
|
||||
|
|
|
@ -43,11 +43,6 @@ set(config_module_list
|
|||
lib/mathlib/math/filter
|
||||
lib/mixer
|
||||
lib/version
|
||||
platforms/nuttx
|
||||
|
||||
# had to add for cmake, not sure why wasn't in original config
|
||||
platforms/common
|
||||
platforms/nuttx/px4_layer
|
||||
|
||||
#
|
||||
# Demo apps
|
||||
|
|
|
@ -63,7 +63,5 @@ set(config_module_list
|
|||
modules/systemlib
|
||||
modules/systemlib/param
|
||||
modules/uORB
|
||||
platforms/common
|
||||
platforms/nuttx
|
||||
platforms/nuttx/px4_layer
|
||||
|
||||
)
|
|
@ -72,7 +72,5 @@ set(config_module_list
|
|||
modules/systemlib
|
||||
modules/systemlib/param
|
||||
modules/uORB
|
||||
platforms/common
|
||||
platforms/nuttx
|
||||
platforms/nuttx/px4_layer
|
||||
|
||||
)
|
|
@ -154,13 +154,6 @@ set(config_module_list
|
|||
lib/tunes
|
||||
lib/version
|
||||
|
||||
#
|
||||
# Platform
|
||||
#
|
||||
platforms/common
|
||||
platforms/nuttx
|
||||
platforms/nuttx/px4_layer
|
||||
|
||||
#
|
||||
# OBC challenge
|
||||
#
|
||||
|
|
|
@ -138,11 +138,6 @@ set(config_module_list
|
|||
lib/terrain_estimation
|
||||
lib/tunes
|
||||
lib/version
|
||||
platforms/nuttx
|
||||
|
||||
# had to add for cmake, not sure why wasn't in original config
|
||||
platforms/common
|
||||
platforms/nuttx/px4_layer
|
||||
|
||||
#
|
||||
# OBC challenge
|
||||
|
|
|
@ -155,13 +155,6 @@ set(config_module_list
|
|||
lib/tunes
|
||||
lib/version
|
||||
|
||||
#
|
||||
# Platform
|
||||
#
|
||||
platforms/common
|
||||
platforms/nuttx
|
||||
platforms/nuttx/px4_layer
|
||||
|
||||
#
|
||||
# OBC challenge
|
||||
#
|
||||
|
|
|
@ -148,13 +148,6 @@ set(config_module_list
|
|||
lib/tunes
|
||||
lib/version
|
||||
|
||||
#
|
||||
# Platform
|
||||
#
|
||||
platforms/common
|
||||
platforms/nuttx
|
||||
platforms/nuttx/px4_layer
|
||||
|
||||
#
|
||||
# OBC challenge
|
||||
#
|
||||
|
|
|
@ -147,13 +147,6 @@ set(config_module_list
|
|||
lib/tunes
|
||||
lib/version
|
||||
|
||||
#
|
||||
# Platform
|
||||
#
|
||||
platforms/common
|
||||
platforms/nuttx
|
||||
platforms/nuttx/px4_layer
|
||||
|
||||
#
|
||||
# OBC challenge
|
||||
#
|
||||
|
|
|
@ -149,13 +149,6 @@ set(config_module_list
|
|||
lib/tunes
|
||||
lib/version
|
||||
|
||||
#
|
||||
# Platform
|
||||
#
|
||||
platforms/common
|
||||
platforms/nuttx
|
||||
platforms/nuttx/px4_layer
|
||||
|
||||
#
|
||||
# OBC challenge
|
||||
#
|
||||
|
|
|
@ -7,5 +7,4 @@ set(config_module_list
|
|||
lib/mixer
|
||||
lib/rc
|
||||
modules/px4iofirmware
|
||||
platforms/common
|
||||
)
|
||||
|
|
|
@ -126,11 +126,6 @@ set(config_module_list
|
|||
lib/terrain_estimation
|
||||
lib/tunes
|
||||
lib/version
|
||||
platforms/nuttx
|
||||
|
||||
# had to add for cmake, not sure why wasn't in original config
|
||||
platforms/common
|
||||
platforms/nuttx/px4_layer
|
||||
|
||||
#
|
||||
# OBC challenge
|
||||
|
|
|
@ -60,12 +60,4 @@ set(config_module_list
|
|||
modules/systemlib/param
|
||||
modules/systemlib
|
||||
lib/version
|
||||
|
||||
#
|
||||
# Libraries
|
||||
#
|
||||
# had to add for cmake, not sure why wasn't in original config
|
||||
platforms/nuttx
|
||||
platforms/common
|
||||
platforms/nuttx/px4_layer
|
||||
)
|
||||
|
|
|
@ -102,9 +102,4 @@ set(config_module_list
|
|||
lib/terrain_estimation
|
||||
lib/tunes
|
||||
lib/version
|
||||
platforms/nuttx
|
||||
|
||||
# had to add for cmake, not sure why wasn't in original config
|
||||
platforms/common
|
||||
platforms/nuttx/px4_layer
|
||||
)
|
||||
|
|
|
@ -85,13 +85,6 @@ set(config_module_list
|
|||
lib/tailsitter_recovery
|
||||
lib/terrain_estimation
|
||||
lib/version
|
||||
|
||||
#
|
||||
# POSIX
|
||||
#
|
||||
platforms/common
|
||||
platforms/posix/px4_layer
|
||||
platforms/posix/work_queue
|
||||
)
|
||||
|
||||
set(config_df_driver_list
|
||||
|
|
|
@ -48,9 +48,6 @@ set(config_module_list
|
|||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
|
||||
platforms/common
|
||||
platforms/posix/px4_layer
|
||||
platforms/posix/work_queue
|
||||
modules/muorb/krait
|
||||
)
|
||||
|
||||
|
|
|
@ -19,9 +19,6 @@ set(config_module_list
|
|||
|
||||
lib/DriverFramework/framework
|
||||
|
||||
platforms/posix/px4_layer
|
||||
platforms/posix/work_queue
|
||||
|
||||
modules/muorb/krait
|
||||
)
|
||||
|
||||
|
|
|
@ -95,13 +95,6 @@ set(config_module_list
|
|||
lib/tailsitter_recovery
|
||||
lib/terrain_estimation
|
||||
lib/version
|
||||
|
||||
#
|
||||
# POSIX
|
||||
#
|
||||
platforms/common
|
||||
platforms/posix/px4_layer
|
||||
platforms/posix/work_queue
|
||||
|
||||
examples/px4_simple_app
|
||||
)
|
||||
|
|
|
@ -94,13 +94,6 @@ set(config_module_list
|
|||
lib/tailsitter_recovery
|
||||
lib/terrain_estimation
|
||||
lib/version
|
||||
|
||||
#
|
||||
# POSIX
|
||||
#
|
||||
platforms/common
|
||||
platforms/posix/px4_layer
|
||||
platforms/posix/work_queue
|
||||
|
||||
examples/px4_simple_app
|
||||
)
|
||||
|
|
|
@ -107,13 +107,6 @@ set(config_module_list
|
|||
lib/terrain_estimation
|
||||
lib/tunes
|
||||
lib/version
|
||||
|
||||
#
|
||||
# POSIX
|
||||
#
|
||||
platforms/common
|
||||
platforms/posix/px4_layer
|
||||
platforms/posix/work_queue
|
||||
)
|
||||
|
||||
#
|
||||
|
|
|
@ -83,8 +83,4 @@ set(config_module_list
|
|||
lib/terrain_estimation
|
||||
lib/tunes
|
||||
lib/version
|
||||
|
||||
platforms/common
|
||||
platforms/posix/px4_layer
|
||||
platforms/posix/work_queue
|
||||
)
|
||||
)
|
||||
|
|
|
@ -75,8 +75,4 @@ set(config_module_list
|
|||
lib/terrain_estimation
|
||||
lib/tunes
|
||||
lib/version
|
||||
|
||||
platforms/common
|
||||
platforms/posix/px4_layer
|
||||
platforms/posix/work_queue
|
||||
)
|
||||
|
|
|
@ -64,7 +64,6 @@ set(config_module_list
|
|||
platforms/posix/tests/hrt_test
|
||||
platforms/posix/tests/muorb
|
||||
platforms/posix/tests/vcdev_test
|
||||
platforms/posix/tests/wqueue
|
||||
|
||||
#
|
||||
# General system control
|
||||
|
@ -135,13 +134,6 @@ set(config_module_list
|
|||
lib/tunes
|
||||
lib/version
|
||||
|
||||
#
|
||||
# Platform
|
||||
#
|
||||
platforms/common
|
||||
platforms/posix/px4_layer
|
||||
platforms/posix/work_queue
|
||||
|
||||
#
|
||||
# OBC challenge
|
||||
#
|
||||
|
|
|
@ -4,9 +4,6 @@ set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-native.cma
|
|||
set(config_module_list
|
||||
drivers/device
|
||||
drivers/boards/sitl
|
||||
platforms/common
|
||||
platforms/posix/px4_layer
|
||||
platforms/posix/work_queue
|
||||
systemcmds/param
|
||||
systemcmds/ver
|
||||
systemcmds/perf
|
||||
|
|
|
@ -33,13 +33,5 @@ set(config_module_list
|
|||
modules/systemlib/param
|
||||
modules/systemlib
|
||||
modules/uORB
|
||||
|
||||
#
|
||||
# QuRT port
|
||||
#
|
||||
platforms/common
|
||||
platforms/qurt/px4_layer
|
||||
platforms/posix/work_queue
|
||||
platforms/qurt/tests/hello
|
||||
)
|
||||
|
||||
|
|
|
@ -73,13 +73,6 @@ set(config_module_list
|
|||
lib/terrain_estimation
|
||||
lib/version
|
||||
|
||||
#
|
||||
# QuRT port
|
||||
#
|
||||
platforms/common
|
||||
platforms/qurt/px4_layer
|
||||
platforms/posix/work_queue
|
||||
|
||||
#
|
||||
# sources for muorb over fastrpc
|
||||
#
|
||||
|
|
|
@ -45,14 +45,6 @@ set(config_module_list
|
|||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
|
||||
#
|
||||
# QuRT port
|
||||
#
|
||||
platforms/common
|
||||
platforms/qurt/px4_layer
|
||||
platforms/posix/work_queue
|
||||
platforms/qurt/tests/muorb
|
||||
|
||||
#
|
||||
# sources for muorb over fastrpc
|
||||
#
|
||||
|
|
|
@ -42,16 +42,5 @@ set(config_module_list
|
|||
lib/mathlib
|
||||
lib/mathlib/math/filter
|
||||
lib/mixer
|
||||
|
||||
#
|
||||
# QuRT port
|
||||
#
|
||||
platforms/common
|
||||
platforms/qurt/px4_layer
|
||||
platforms/posix/work_queue
|
||||
platforms/qurt/tests/hello
|
||||
platforms/posix/tests/vcdev_test
|
||||
platforms/posix/tests/hrt_test
|
||||
platforms/posix/tests/wqueue
|
||||
)
|
||||
|
||||
|
|
|
@ -79,13 +79,6 @@ set(config_module_list
|
|||
lib/terrain_estimation
|
||||
lib/version
|
||||
|
||||
#
|
||||
# QuRT port
|
||||
#
|
||||
platforms/common
|
||||
platforms/qurt/px4_layer
|
||||
platforms/posix/work_queue
|
||||
|
||||
#
|
||||
# sources for muorb over fastrpc
|
||||
#
|
||||
|
|
|
@ -97,13 +97,6 @@ set(config_module_list
|
|||
lib/terrain_estimation
|
||||
lib/version
|
||||
|
||||
#
|
||||
# QuRT port
|
||||
#
|
||||
platforms/common
|
||||
platforms/qurt/px4_layer
|
||||
platforms/posix/work_queue
|
||||
|
||||
#
|
||||
# sources for muorb over fastrpc
|
||||
#
|
||||
|
|
|
@ -96,13 +96,6 @@ set(config_module_list
|
|||
lib/terrain_estimation
|
||||
lib/version
|
||||
|
||||
#
|
||||
# QuRT port
|
||||
#
|
||||
platforms/common
|
||||
platforms/qurt/px4_layer
|
||||
platforms/posix/work_queue
|
||||
|
||||
#
|
||||
# sources for muorb over fastrpc
|
||||
#
|
||||
|
|
|
@ -1,6 +1,41 @@
|
|||
############################################################################
|
||||
#
|
||||
# Copyright (c) 2017 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.
|
||||
#
|
||||
############################################################################
|
||||
|
||||
include(common/px4_upload)
|
||||
include(cygwin_cygpath)
|
||||
|
||||
add_subdirectory(src)
|
||||
|
||||
if (NOT FW_NAME)
|
||||
set(FW_NAME ${CONFIG}.elf)
|
||||
endif()
|
||||
|
|
|
@ -175,13 +175,17 @@ function(px4_os_add_flags)
|
|||
LINK_DIRS ${LINK_DIRS}
|
||||
DEFINITIONS ${DEFINITIONS})
|
||||
|
||||
set(added_include_dirs
|
||||
include_directories(BEFORE SYSTEM
|
||||
${PX4_BINARY_DIR}/NuttX/nuttx/include
|
||||
${PX4_BINARY_DIR}/NuttX/nuttx/include/cxx
|
||||
)
|
||||
|
||||
include_directories(
|
||||
${PX4_BINARY_DIR}/NuttX/nuttx/arch/arm/src/armv7-m
|
||||
${PX4_BINARY_DIR}/NuttX/nuttx/arch/arm/src/chip
|
||||
${PX4_BINARY_DIR}/NuttX/nuttx/arch/arm/src/common
|
||||
${PX4_BINARY_DIR}/NuttX/nuttx/include
|
||||
${PX4_BINARY_DIR}/NuttX/nuttx/include/cxx
|
||||
${PX4_SOURCE_DIR}/platforms/nuttx/NuttX/apps/include
|
||||
|
||||
${PX4_BINARY_DIR}/NuttX/apps/include
|
||||
)
|
||||
|
||||
#set(added_exe_linker_flags)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
############################################################################
|
||||
#
|
||||
# Copyright (c) 2015 PX4 Development Team. All rights reserved.
|
||||
# Copyright (c) 2017 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
|
||||
|
@ -30,13 +30,5 @@
|
|||
# POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
############################################################################
|
||||
px4_add_module(
|
||||
MODULE platforms__nuttx__px4_layer
|
||||
COMPILE_FLAGS
|
||||
SRCS
|
||||
px4_nuttx_tasks.c
|
||||
../../posix/px4_layer/px4_log.c
|
||||
DEPENDS
|
||||
platforms__common
|
||||
)
|
||||
# vim: set noet ft=cmake fenc=utf-8 ff=unix :
|
||||
|
||||
add_subdirectory(px4_layer)
|
|
@ -30,12 +30,16 @@
|
|||
# POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
############################################################################
|
||||
px4_add_module(
|
||||
MODULE platforms__nuttx
|
||||
COMPILE_FLAGS
|
||||
SRCS
|
||||
px4_nuttx_impl.cpp
|
||||
DEPENDS
|
||||
platforms__common
|
||||
)
|
||||
# vim: set noet ft=cmake fenc=utf-8 ff=unix :
|
||||
|
||||
# skip for px4_layer support on an IO board
|
||||
if (NOT ${BOARD} MATCHES "px4io")
|
||||
|
||||
px4_add_module(
|
||||
MODULE platform_px4_layer
|
||||
SRCS
|
||||
px4_nuttx_tasks.c
|
||||
px4_nuttx_impl.cpp
|
||||
DEPENDS
|
||||
prebuild_targets
|
||||
)
|
||||
endif()
|
|
@ -41,7 +41,6 @@
|
|||
#include <px4_middleware.h>
|
||||
#include <drivers/drv_hrt.h>
|
||||
|
||||
|
||||
namespace px4
|
||||
{
|
||||
|
|
@ -37,24 +37,22 @@
|
|||
* Implementation of existing task API for NuttX
|
||||
*/
|
||||
|
||||
#include <px4_config.h>
|
||||
#include <px4_tasks.h>
|
||||
#include <unistd.h>
|
||||
#include <nuttx/config.h>
|
||||
|
||||
#include <sys/wait.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdio.h>
|
||||
#include <fcntl.h>
|
||||
#include <sched.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <float.h>
|
||||
#include <signal.h>
|
||||
#include <string.h>
|
||||
#include <sched.h>
|
||||
#include <errno.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
|
||||
#include <px4_config.h>
|
||||
#include <px4_log.h>
|
||||
#include <systemlib/systemlib.h>
|
||||
|
||||
#include <px4_tasks.h>
|
||||
|
||||
void
|
||||
px4_systemreset(bool to_bootloader)
|
||||
|
@ -115,4 +113,3 @@ const char *px4_get_taskname(void)
|
|||
return "app";
|
||||
#endif
|
||||
}
|
||||
|
|
@ -1,5 +1,7 @@
|
|||
include (common/px4_upload)
|
||||
|
||||
add_subdirectory(src)
|
||||
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
get_property(module_libraries GLOBAL PROPERTY PX4_LIBRARIES)
|
||||
|
@ -10,7 +12,7 @@ px4_posix_generate_builtin_commands(
|
|||
|
||||
# Define build target
|
||||
set(APP_NAME px4)
|
||||
set(MAIN_SRC ${PX4_SOURCE_DIR}/src/platforms/posix/main.cpp)
|
||||
set(MAIN_SRC src/main.cpp)
|
||||
set(UPLOAD_NAME upload)
|
||||
|
||||
if ("${BOARD}" STREQUAL "eagle" OR ("${BOARD}" STREQUAL "excelsior"))
|
||||
|
|
|
@ -165,9 +165,7 @@ function(px4_os_add_flags)
|
|||
DEFINITIONS ${DEFINITIONS})
|
||||
|
||||
set(added_include_dirs
|
||||
src/modules/systemlib
|
||||
src/platforms/posix/include
|
||||
mavlink/include/mavlink
|
||||
platforms/posix/include
|
||||
)
|
||||
|
||||
# This block sets added_definitions and added_cxx_flags.
|
||||
|
|
|
@ -32,7 +32,7 @@ endfunction()
|
|||
# sitl run targets
|
||||
#
|
||||
|
||||
set(SITL_RUNNER_MAIN_CPP ${PX4_SOURCE_DIR}/src/platforms/posix/main.cpp)
|
||||
set(SITL_RUNNER_MAIN_CPP src/main.cpp)
|
||||
px4_add_sitl_app(APP_NAME px4
|
||||
UPLOAD_NAME upload
|
||||
MAIN_SRC ${SITL_RUNNER_MAIN_CPP}
|
||||
|
@ -111,7 +111,7 @@ foreach(viewer ${viewers})
|
|||
set(SITL_RUNNER_MODEL_FILE ${PX4_SOURCE_DIR}/${config_sitl_rcS_dir}/${model})
|
||||
set(SITL_RUNNER_WORKING_DIRECTORY ${SITL_WORKING_DIR})
|
||||
|
||||
configure_file(${PX4_SOURCE_DIR}/src/platforms/posix/sitl_runner_main.cpp.in sitl_runner_main_${model}.cpp @ONLY)
|
||||
configure_file(src/sitl_runner_main.cpp.in sitl_runner_main_${model}.cpp @ONLY)
|
||||
|
||||
px4_add_sitl_app(APP_NAME px4_${model}
|
||||
UPLOAD_NAME upload_${model}
|
||||
|
|
|
@ -0,0 +1,34 @@
|
|||
############################################################################
|
||||
#
|
||||
# Copyright (c) 2017 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(px4_layer)
|
|
@ -54,7 +54,6 @@ px4_add_module(
|
|||
px4_sem.cpp
|
||||
lib_crc32.c
|
||||
drv_hrt.c
|
||||
px4_log.c
|
||||
${SHMEM_SRCS}
|
||||
DEPENDS
|
||||
platforms__common
|
|
@ -5,6 +5,8 @@ include(fastrpc)
|
|||
include(qurt_lib)
|
||||
include(qurt_flags)
|
||||
|
||||
add_subdirectory(src)
|
||||
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-prototypes")
|
||||
|
|
|
@ -168,8 +168,9 @@ function(px4_os_add_flags)
|
|||
${DSPAL_ROOT}/sys
|
||||
${DSPAL_ROOT}/sys/sys
|
||||
${DSPAL_ROOT}/uart_esc/inc
|
||||
src/platforms/posix/include
|
||||
src/platforms/qurt/include
|
||||
|
||||
platforms/posix/include
|
||||
platforms/qurt/include
|
||||
)
|
||||
|
||||
set(added_definitions
|
||||
|
|
|
@ -0,0 +1,34 @@
|
|||
############################################################################
|
||||
#
|
||||
# Copyright (c) 2017 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(px4_layer)
|
|
@ -39,11 +39,12 @@ set(QURT_LAYER_SRCS
|
|||
px4_qurt_impl.cpp
|
||||
px4_qurt_tasks.cpp
|
||||
lib_crc32.c
|
||||
../../posix/px4_layer/drv_hrt.c
|
||||
../../../posix/src/px4_layer/drv_hrt.c
|
||||
qurt_stubs.c
|
||||
main.cpp
|
||||
shmem_qurt.c
|
||||
)
|
||||
|
||||
if ("${QURT_ENABLE_STUBS}" STREQUAL "1")
|
||||
list(APPEND QURT_LAYER_SRCS
|
||||
../stubs/stubs_posix.c
|
||||
|
@ -51,9 +52,8 @@ if ("${QURT_ENABLE_STUBS}" STREQUAL "1")
|
|||
)
|
||||
endif()
|
||||
|
||||
|
||||
px4_add_module(
|
||||
MODULE platforms__qurt__px4_layer
|
||||
MODULE platforms_px4_layer
|
||||
COMPILE_FLAGS
|
||||
SRCS
|
||||
${QURT_LAYER_SRCS}
|
||||
|
@ -61,4 +61,3 @@ px4_add_module(
|
|||
DEPENDS
|
||||
platforms__common
|
||||
)
|
||||
# vim: set noet ft=cmake fenc=utf-8 ff=unix :
|
|
@ -38,5 +38,5 @@ px4_add_module(
|
|||
snapdragon_pwm_out.cpp
|
||||
DEPENDS
|
||||
platforms__common
|
||||
mixer_gen
|
||||
)
|
||||
# vim: set noet ft=cmake fenc=utf-8 ff=unix :
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 843ad727f2e9c310563dcd70173d6c859a246c07
|
||||
Subproject commit 29f386628af2c9dd6a95cb873d0624c0c0c58381
|
|
@ -53,7 +53,7 @@ add_definitions(
|
|||
set(LIBUAVCAN_DIR ${PX4_SOURCE_DIR}/src/modules/uavcan/libuavcan)
|
||||
|
||||
add_subdirectory(${LIBUAVCAN_DIR} uavcanesc_libuavcan)
|
||||
add_dependencies(uavcan platforms__nuttx)
|
||||
add_dependencies(uavcan prebuild_targets)
|
||||
|
||||
include_directories(${PX4_SOURCE_DIR}/src/modules/systemlib/flashparams)
|
||||
include_directories(${LIBUAVCAN_DIR}/libuavcan/include)
|
||||
|
|
|
@ -53,7 +53,7 @@ add_definitions(
|
|||
set(LIBUAVCAN_DIR ${PX4_SOURCE_DIR}/src/modules/uavcan/libuavcan)
|
||||
|
||||
add_subdirectory(${LIBUAVCAN_DIR} uavcannode_libuavcan)
|
||||
add_dependencies(uavcan platforms__nuttx)
|
||||
add_dependencies(uavcan prebuild_targets)
|
||||
|
||||
include_directories(${LIBUAVCAN_DIR}/libuavcan/include)
|
||||
include_directories(${LIBUAVCAN_DIR}/libuavcan/include/dsdlc_generated)
|
||||
|
@ -79,7 +79,7 @@ px4_add_module(
|
|||
uavcannode_params.c
|
||||
|
||||
DEPENDS
|
||||
platforms__common
|
||||
prebuild_targets
|
||||
uavcan
|
||||
)
|
||||
|
||||
|
|
|
@ -31,15 +31,25 @@
|
|||
#
|
||||
############################################################################
|
||||
|
||||
set(SRCS)
|
||||
|
||||
if (NOT "${OS}" MATCHES "qurt")
|
||||
list(APPEND SRCS
|
||||
px4_log.c
|
||||
)
|
||||
endif()
|
||||
|
||||
px4_add_module(
|
||||
MODULE platforms__common
|
||||
SRCS
|
||||
module.cpp
|
||||
px4_getopt.c
|
||||
shutdown.cpp
|
||||
${SRCS}
|
||||
DEPENDS
|
||||
prebuild_targets
|
||||
uorb_headers
|
||||
uorb_msgs
|
||||
)
|
||||
# vim: set noet ft=cmake fenc=utf-8 ff=unix :
|
||||
|
||||
add_subdirectory(work_queue)
|
|
@ -1,9 +1,45 @@
|
|||
/****************************************************************************
|
||||
*
|
||||
* Copyright (C) 2017 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.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#include <px4_log.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <px4_log.h>
|
||||
|
||||
#if defined(__PX4_POSIX) && !defined(__PX4_CYGWIN)
|
||||
#include <execinfo.h>
|
||||
#endif
|
||||
|
||||
#include <uORB/uORB.h>
|
||||
#include <uORB/topics/log_message.h>
|
||||
#include <drivers/drv_hrt.h>
|
||||
|
@ -92,7 +128,5 @@ __EXPORT void px4_log_modulename(int level, const char *moduleName, const char *
|
|||
log_message.text[max_length - 1] = 0; //ensure 0-termination
|
||||
|
||||
orb_publish(ORB_ID(log_message), orb_log_message_pub, &log_message);
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -30,25 +30,28 @@
|
|||
# POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
############################################################################
|
||||
px4_add_module(
|
||||
MODULE platforms__posix__work_queue
|
||||
COMPILE_FLAGS
|
||||
SRCS
|
||||
hrt_thread.c
|
||||
hrt_queue.c
|
||||
hrt_work_cancel.c
|
||||
work_thread.c
|
||||
work_lock.c
|
||||
work_queue.c
|
||||
work_cancel.c
|
||||
queue.c
|
||||
dq_addlast.c
|
||||
dq_remfirst.c
|
||||
sq_addlast.c
|
||||
sq_remfirst.c
|
||||
sq_addafter.c
|
||||
dq_rem.c
|
||||
DEPENDS
|
||||
platforms__common
|
||||
)
|
||||
# vim: set noet ft=cmake fenc=utf-8 ff=unix :
|
||||
|
||||
# nuttx uses internal work queue currently
|
||||
if (NOT "${OS}" MATCHES "nuttx")
|
||||
px4_add_module(
|
||||
MODULE platforms__posix__work_queue
|
||||
COMPILE_FLAGS
|
||||
SRCS
|
||||
hrt_thread.c
|
||||
hrt_queue.c
|
||||
hrt_work_cancel.c
|
||||
work_thread.c
|
||||
work_lock.c
|
||||
work_queue.c
|
||||
work_cancel.c
|
||||
queue.c
|
||||
dq_addlast.c
|
||||
dq_remfirst.c
|
||||
sq_addlast.c
|
||||
sq_remfirst.c
|
||||
sq_addafter.c
|
||||
dq_rem.c
|
||||
DEPENDS
|
||||
platforms__common
|
||||
)
|
||||
endif()
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue