From 1efad64f0c83ffc8674eff4337bedd56f8630c79 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sat, 1 Dec 2018 12:54:41 -0500
Subject: [PATCH] bebop move flow driver to board directory
---
boards/parrot/bebop/CMakeLists.txt | 34 +++++++++++++++++++
boards/parrot/bebop/default.cmake | 2 +-
.../parrot/bebop/flow}/CMakeLists.txt | 6 ++--
.../parrot/bebop/flow}/bebop_flow.cpp | 0
.../parrot/bebop/flow}/dump_pgm.cpp | 0
.../parrot/bebop/flow}/dump_pgm.h | 0
.../parrot/bebop/flow}/video_device.cpp | 0
.../parrot/bebop/flow}/video_device.h | 0
cmake/px4_add_board.cmake | 5 ++-
platforms/posix/CMakeLists.txt | 2 +-
10 files changed, 43 insertions(+), 6 deletions(-)
create mode 100644 boards/parrot/bebop/CMakeLists.txt
rename {src/platforms/posix/drivers/bebop_flow => boards/parrot/bebop/flow}/CMakeLists.txt (94%)
rename {src/platforms/posix/drivers/bebop_flow => boards/parrot/bebop/flow}/bebop_flow.cpp (100%)
rename {src/platforms/posix/drivers/bebop_flow => boards/parrot/bebop/flow}/dump_pgm.cpp (100%)
rename {src/platforms/posix/drivers/bebop_flow => boards/parrot/bebop/flow}/dump_pgm.h (100%)
rename {src/platforms/posix/drivers/bebop_flow => boards/parrot/bebop/flow}/video_device.cpp (100%)
rename {src/platforms/posix/drivers/bebop_flow => boards/parrot/bebop/flow}/video_device.h (100%)
diff --git a/boards/parrot/bebop/CMakeLists.txt b/boards/parrot/bebop/CMakeLists.txt
new file mode 100644
index 0000000000..650c1b615e
--- /dev/null
+++ b/boards/parrot/bebop/CMakeLists.txt
@@ -0,0 +1,34 @@
+############################################################################
+#
+# 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(flow)
diff --git a/boards/parrot/bebop/default.cmake b/boards/parrot/bebop/default.cmake
index 2d88437e5a..5d6174a0f4 100644
--- a/boards/parrot/bebop/default.cmake
+++ b/boards/parrot/bebop/default.cmake
@@ -17,7 +17,7 @@ px4_add_board(
ak8963
bebop_bus
bebop_rangefinder
- #bebop_flow
+ mt9v117
MODULES
attitude_estimator_q
diff --git a/src/platforms/posix/drivers/bebop_flow/CMakeLists.txt b/boards/parrot/bebop/flow/CMakeLists.txt
similarity index 94%
rename from src/platforms/posix/drivers/bebop_flow/CMakeLists.txt
rename to boards/parrot/bebop/flow/CMakeLists.txt
index 412a9e66ce..0c7e5ee1a6 100644
--- a/src/platforms/posix/drivers/bebop_flow/CMakeLists.txt
+++ b/boards/parrot/bebop/flow/CMakeLists.txt
@@ -31,11 +31,11 @@
#
############################################################################
-include_directories(../../../../lib/DriverFramework/drivers)
-
px4_add_module(
- MODULE platforms__posix__drivers__bebop_flow
+ MODULE drivers__bebop_flow
MAIN bebop_flow
+ INCLUDES
+ ${PX4_SOURCE_DIR}/src/lib/DriverFramework/drivers
SRCS
bebop_flow.cpp
video_device.cpp
diff --git a/src/platforms/posix/drivers/bebop_flow/bebop_flow.cpp b/boards/parrot/bebop/flow/bebop_flow.cpp
similarity index 100%
rename from src/platforms/posix/drivers/bebop_flow/bebop_flow.cpp
rename to boards/parrot/bebop/flow/bebop_flow.cpp
diff --git a/src/platforms/posix/drivers/bebop_flow/dump_pgm.cpp b/boards/parrot/bebop/flow/dump_pgm.cpp
similarity index 100%
rename from src/platforms/posix/drivers/bebop_flow/dump_pgm.cpp
rename to boards/parrot/bebop/flow/dump_pgm.cpp
diff --git a/src/platforms/posix/drivers/bebop_flow/dump_pgm.h b/boards/parrot/bebop/flow/dump_pgm.h
similarity index 100%
rename from src/platforms/posix/drivers/bebop_flow/dump_pgm.h
rename to boards/parrot/bebop/flow/dump_pgm.h
diff --git a/src/platforms/posix/drivers/bebop_flow/video_device.cpp b/boards/parrot/bebop/flow/video_device.cpp
similarity index 100%
rename from src/platforms/posix/drivers/bebop_flow/video_device.cpp
rename to boards/parrot/bebop/flow/video_device.cpp
diff --git a/src/platforms/posix/drivers/bebop_flow/video_device.h b/boards/parrot/bebop/flow/video_device.h
similarity index 100%
rename from src/platforms/posix/drivers/bebop_flow/video_device.h
rename to boards/parrot/bebop/flow/video_device.h
diff --git a/cmake/px4_add_board.cmake b/cmake/px4_add_board.cmake
index 89026b5417..0db0c78692 100644
--- a/cmake/px4_add_board.cmake
+++ b/cmake/px4_add_board.cmake
@@ -260,7 +260,10 @@ function(px4_add_board)
set(config_df_driver_list)
foreach(driver ${DF_DRIVERS})
list(APPEND config_df_driver_list ${driver})
- list(APPEND config_module_list platforms/posix/drivers/df_${driver}_wrapper)
+
+ if(EXISTS "${PX4_SOUCE_DIR}/platforms/posix/drivers/df_${driver}_wrapper")
+ list(APPEND config_module_list platforms/posix/drivers/df_${driver}_wrapper)
+ endif()
endforeach()
set(config_df_driver_list ${config_df_driver_list} PARENT_SCOPE)
endif()
diff --git a/platforms/posix/CMakeLists.txt b/platforms/posix/CMakeLists.txt
index 04806e4ae6..b06cfb56d9 100644
--- a/platforms/posix/CMakeLists.txt
+++ b/platforms/posix/CMakeLists.txt
@@ -62,8 +62,8 @@ else()
target_link_libraries(px4
PRIVATE
${module_libraries}
- df_driver_framework
${df_driver_libs}
+ df_driver_framework
pthread m
)
--
GitLab