fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-06-25 09:20:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #156 from UAVCAN/master_kinetis_flexcan

Browse Source 
kinetis:UAVCAN driver
This commit is contained in:
Pavel Kirienko
2018-08-16 22:12:43 +03:00
committed by GitHub
parent 0dc5751ffd 3ca697e64d
commit aa3650d34d
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitmodules
+3
View File
@@ -4,3 +4,6 @@
[submodule "libuavcan/dsdl_compiler/pyuavcan"] [submodule "libuavcan/dsdl_compiler/pyuavcan"]
path = libuavcan/dsdl_compiler/pyuavcan path = libuavcan/dsdl_compiler/pyuavcan
url = https://github.com/UAVCAN/pyuavcan url = https://github.com/UAVCAN/pyuavcan
[submodule "libuavcan_drivers/kinetis"]
path = libuavcan_drivers/kinetis
url = https://github.com/UAVCAN/libuavcan_kinetis.git
.travis.yml
+2
View File
@@ -9,6 +9,7 @@ env:
- TARGET=native - TARGET=native
- TARGET=lpc11c24 - TARGET=lpc11c24
- TARGET=stm32 - TARGET=stm32
- TARGET=kinetis
addons: addons:
coverity_scan: coverity_scan:
project: project:
@@ -25,3 +26,4 @@ script:
- if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TARGET}" == "native" ]; then make && make ARGS=-VV test; fi - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TARGET}" == "native" ]; then make && make ARGS=-VV test; fi
- if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TARGET}" == "lpc11c24" ]; then cd "$TRAVIS_BUILD_DIR/libuavcan_drivers/lpc11c24/test_olimex_lpc_p11c24" && make all; fi - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TARGET}" == "lpc11c24" ]; then cd "$TRAVIS_BUILD_DIR/libuavcan_drivers/lpc11c24/test_olimex_lpc_p11c24" && make all; fi
- if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TARGET}" == "stm32" ]; then echo "TODO STM32 test environment is not configured"; fi - if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TARGET}" == "stm32" ]; then echo "TODO STM32 test environment is not configured"; fi
- if [ "${COVERITY_SCAN_BRANCH}" != 1 ] && [ "${TARGET}" == "kinetis" ]; then echo "TODO Kinetis test environment is not configured"; fi
CMakeLists.txt
+5 -2
View File
@@ -19,7 +19,7 @@ set(opts
"CMAKE_BUILD_TYPE:STRING:RelWithDebInfo:Debug Release RelWithDebInfo MinSizeRel:Build type." "CMAKE_BUILD_TYPE:STRING:RelWithDebInfo:Debug Release RelWithDebInfo MinSizeRel:Build type."
"CMAKE_CXX_FLAGS:STRING:::C++ flags." "CMAKE_CXX_FLAGS:STRING:::C++ flags."
"CMAKE_C_FLAGS:STRING:::C flags." "CMAKE_C_FLAGS:STRING:::C flags."
"UAVCAN_PLATFORM:STRING:generic:generic linux stm32:Platform." "UAVCAN_PLATFORM:STRING:generic:generic kinetis linux stm32:Platform."
"CONTINUOUS_INTEGRATION_BUILD:BOOL:OFF::Disable error redirection and timing tests" "CONTINUOUS_INTEGRATION_BUILD:BOOL:OFF::Disable error redirection and timing tests"
"UAVCAN_CMAKE_VERBOSE:BOOL:OFF::Verbose CMake configure output" "UAVCAN_CMAKE_VERBOSE:BOOL:OFF::Verbose CMake configure output"
) )
@@ -119,6 +119,9 @@ elseif(${UAVCAN_PLATFORM} STREQUAL "stm32")
message(STATUS "Adding UAVCAN STM32 platform driver") message(STATUS "Adding UAVCAN STM32 platform driver")
add_subdirectory(libuavcan_drivers/posix) add_subdirectory(libuavcan_drivers/posix)
add_subdirectory(libuavcan_drivers/stm32/driver) add_subdirectory(libuavcan_drivers/stm32/driver)
elseif(${UAVCAN_PLATFORM} STREQUAL "kinetis")
message(STATUS "Adding UAVCAN Kinetis platform driver")
add_subdirectory(libuavcan_drivers/posix)
add_subdirectory(libuavcan_drivers/kinetis/driver)
endif() endif()
# vim: set et ft=cmake fenc=utf-8 ff=unix sts=4 sw=4 ts=4 : # vim: set et ft=cmake fenc=utf-8 ff=unix sts=4 sw=4 ts=4 :
libuavcan_drivers/kinetis
Submodule
+1
Submodule libuavcan_drivers/kinetis added at 2b30b3b933