move uavcan from modules to drivers

75b20532 · Daniel Agar · bbab66d9 · 75b20532 · 75b20532 · 75b20532
Commit 75b20532 authored 6 years ago by Daniel Agar
--- a/src/modules/uavcanesc/commands/selftest/CMakeLists.txt
+++ b/src/modules/uavcanesc/commands/selftest/CMakeLists.txt
--- a/src/modules/uavcanesc/commands/selftest/esc_selftest.cpp
+++ b/src/modules/uavcanesc/commands/selftest/esc_selftest.cpp
--- a/src/modules/uavcanesc/commands/selftest/esc_selftest.hpp
+++ b/src/modules/uavcanesc/commands/selftest/esc_selftest.hpp
--- a/src/modules/uavcanesc/commands/stat/CMakeLists.txt
+++ b/src/modules/uavcanesc/commands/stat/CMakeLists.txt
--- a/src/modules/uavcanesc/commands/stat/esc_stat.cpp
+++ b/src/modules/uavcanesc/commands/stat/esc_stat.cpp
--- a/src/modules/uavcanesc/commands/stat/esc_stat.hpp
+++ b/src/modules/uavcanesc/commands/stat/esc_stat.hpp
--- a/src/modules/uavcanesc/indication_controller.cpp
+++ b/src/modules/uavcanesc/indication_controller.cpp
--- a/src/modules/uavcanesc/indication_controller.hpp
+++ b/src/modules/uavcanesc/indication_controller.hpp
--- a/src/modules/uavcanesc/led.cpp
+++ b/src/modules/uavcanesc/led.cpp
--- a/src/modules/uavcanesc/led.hpp
+++ b/src/modules/uavcanesc/led.hpp
--- a/src/modules/uavcanesc/nshterm/CMakeLists.txt
+++ b/src/modules/uavcanesc/nshterm/CMakeLists.txt
@@ -42,5 +42,3 @@ px4_add_module(
    PRIORITY "SCHED_PRIORITY_DEFAULT-30"
 	DEPENDS
 	)
-
-#
--- a/src/modules/uavcanesc/nshterm/nshterm.c
+++ b/src/modules/uavcanesc/nshterm/nshterm.c
--- a/src/modules/uavcanesc/uavcan_driver.hpp
+++ b/src/modules/uavcanesc/uavcan_driver.hpp
--- a/src/modules/uavcanesc/uavcanesc_main.cpp
+++ b/src/modules/uavcanesc/uavcanesc_main.cpp
--- a/src/modules/uavcanesc/uavcanesc_main.hpp
+++ b/src/modules/uavcanesc/uavcanesc_main.hpp
--- a/src/modules/uavcanesc/uavcanesc_params.c
+++ b/src/modules/uavcanesc/uavcanesc_params.c
--- a/src/modules/uavcannode/.gitignore
+++ b/src/modules/uavcannode/.gitignore
--- a/src/modules/uavcannode/CMakeLists.txt
+++ b/src/modules/uavcannode/CMakeLists.txt
@@ -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)


--- a/src/modules/uavcannode/indication_controller.cpp
+++ b/src/modules/uavcannode/indication_controller.cpp
--- a/src/modules/uavcannode/indication_controller.hpp
+++ b/src/modules/uavcannode/indication_controller.hpp