From 3ca697e64d52ba86c8e831d563c746827473e5e3 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Tue, 7 Aug 2018 10:10:11 -0700 Subject: [PATCH] Adds kinetis Flexcan driver as a submodule --- .gitmodules | 3 +++ .travis.yml | 2 ++ CMakeLists.txt | 7 +++++-- libuavcan_drivers/kinetis | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) create mode 160000 libuavcan_drivers/kinetis diff --git a/.gitmodules b/.gitmodules index 5cf2995db3..ddf8aaa382 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "libuavcan/dsdl_compiler/pyuavcan"] path = libuavcan/dsdl_compiler/pyuavcan url = https://github.com/UAVCAN/pyuavcan +[submodule "libuavcan_drivers/kinetis"] + path = libuavcan_drivers/kinetis + url = https://github.com/UAVCAN/libuavcan_kinetis.git diff --git a/.travis.yml b/.travis.yml index 163fb692b9..a4e39856b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ env: - TARGET=native - TARGET=lpc11c24 - TARGET=stm32 + - TARGET=kinetis addons: coverity_scan: 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}" == "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}" == "kinetis" ]; then echo "TODO Kinetis test environment is not configured"; fi diff --git a/CMakeLists.txt b/CMakeLists.txt index 87d8f72b98..54655f2af1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ set(opts "CMAKE_BUILD_TYPE:STRING:RelWithDebInfo:Debug Release RelWithDebInfo MinSizeRel:Build type." "CMAKE_CXX_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" "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") add_subdirectory(libuavcan_drivers/posix) 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() - # vim: set et ft=cmake fenc=utf-8 ff=unix sts=4 sw=4 ts=4 : diff --git a/libuavcan_drivers/kinetis b/libuavcan_drivers/kinetis new file mode 160000 index 0000000000..2b30b3b933 --- /dev/null +++ b/libuavcan_drivers/kinetis @@ -0,0 +1 @@ +Subproject commit 2b30b3b9339bc2f7cd2de4c83f435462ef44ec42