From 3003e7d0fc9b2f43c4ed44997b207f32817ae180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Mon, 26 Aug 2019 16:16:31 +0200 Subject: [PATCH] drv_led_pwm: move to arch-specific directory --- .../src/px4/nxp/common/led_pwm/CMakeLists.txt | 36 +++++++++++++++++++ .../src/px4/nxp/common/led_pwm/led_pwm.cpp | 2 +- .../nuttx/src/px4/nxp/kinetis/CMakeLists.txt | 1 + .../stm/stm32_common/led_pwm/CMakeLists.txt | 36 +++++++++++++++++++ .../px4/stm/stm32_common/led_pwm/led_pwm.cpp | 0 .../nuttx/src/px4/stm/stm32f4/CMakeLists.txt | 1 + .../nuttx/src/px4/stm/stm32f7/CMakeLists.txt | 1 + src/drivers/kinetis/CMakeLists.txt | 1 - src/drivers/lights/rgbled_pwm/CMakeLists.txt | 3 +- src/drivers/stm32/CMakeLists.txt | 1 - 10 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 platforms/nuttx/src/px4/nxp/common/led_pwm/CMakeLists.txt rename src/drivers/kinetis/drv_led_pwm.cpp => platforms/nuttx/src/px4/nxp/common/led_pwm/led_pwm.cpp (99%) create mode 100644 platforms/nuttx/src/px4/stm/stm32_common/led_pwm/CMakeLists.txt rename src/drivers/stm32/drv_led_pwm.cpp => platforms/nuttx/src/px4/stm/stm32_common/led_pwm/led_pwm.cpp (100%) diff --git a/platforms/nuttx/src/px4/nxp/common/led_pwm/CMakeLists.txt b/platforms/nuttx/src/px4/nxp/common/led_pwm/CMakeLists.txt new file mode 100644 index 0000000000..1b15043526 --- /dev/null +++ b/platforms/nuttx/src/px4/nxp/common/led_pwm/CMakeLists.txt @@ -0,0 +1,36 @@ +############################################################################ +# +# Copyright (c) 2015-2019 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. +# +############################################################################ + +px4_add_library(arch_led_pwm + led_pwm.cpp +) diff --git a/src/drivers/kinetis/drv_led_pwm.cpp b/platforms/nuttx/src/px4/nxp/common/led_pwm/led_pwm.cpp similarity index 99% rename from src/drivers/kinetis/drv_led_pwm.cpp rename to platforms/nuttx/src/px4/nxp/common/led_pwm/led_pwm.cpp index b11ca0e458..68a2d40b6c 100644 --- a/src/drivers/kinetis/drv_led_pwm.cpp +++ b/platforms/nuttx/src/px4/nxp/common/led_pwm/led_pwm.cpp @@ -56,7 +56,7 @@ #include #include -#include "drv_io_timer.h" +#include #include #include "chip/kinetis_sim.h" diff --git a/platforms/nuttx/src/px4/nxp/kinetis/CMakeLists.txt b/platforms/nuttx/src/px4/nxp/kinetis/CMakeLists.txt index 6b62fc697f..482262fff2 100644 --- a/platforms/nuttx/src/px4/nxp/kinetis/CMakeLists.txt +++ b/platforms/nuttx/src/px4/nxp/kinetis/CMakeLists.txt @@ -33,6 +33,7 @@ add_subdirectory(../common/adc adc) +add_subdirectory(../common/led_pwm led_pwm) add_subdirectory(../common/hrt hrt) add_subdirectory(../common/tone_alarm tone_alarm) diff --git a/platforms/nuttx/src/px4/stm/stm32_common/led_pwm/CMakeLists.txt b/platforms/nuttx/src/px4/stm/stm32_common/led_pwm/CMakeLists.txt new file mode 100644 index 0000000000..1b15043526 --- /dev/null +++ b/platforms/nuttx/src/px4/stm/stm32_common/led_pwm/CMakeLists.txt @@ -0,0 +1,36 @@ +############################################################################ +# +# Copyright (c) 2015-2019 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. +# +############################################################################ + +px4_add_library(arch_led_pwm + led_pwm.cpp +) diff --git a/src/drivers/stm32/drv_led_pwm.cpp b/platforms/nuttx/src/px4/stm/stm32_common/led_pwm/led_pwm.cpp similarity index 100% rename from src/drivers/stm32/drv_led_pwm.cpp rename to platforms/nuttx/src/px4/stm/stm32_common/led_pwm/led_pwm.cpp diff --git a/platforms/nuttx/src/px4/stm/stm32f4/CMakeLists.txt b/platforms/nuttx/src/px4/stm/stm32f4/CMakeLists.txt index 4792b81713..a4fc7ce2c2 100644 --- a/platforms/nuttx/src/px4/stm/stm32f4/CMakeLists.txt +++ b/platforms/nuttx/src/px4/stm/stm32f4/CMakeLists.txt @@ -34,6 +34,7 @@ add_subdirectory(../stm32_common/adc adc) add_subdirectory(../stm32_common/hrt hrt) +add_subdirectory(../stm32_common/led_pwm led_pwm) add_subdirectory(../stm32_common/tone_alarm tone_alarm) add_subdirectory(px4io_serial) diff --git a/platforms/nuttx/src/px4/stm/stm32f7/CMakeLists.txt b/platforms/nuttx/src/px4/stm/stm32f7/CMakeLists.txt index 4792b81713..a4fc7ce2c2 100644 --- a/platforms/nuttx/src/px4/stm/stm32f7/CMakeLists.txt +++ b/platforms/nuttx/src/px4/stm/stm32f7/CMakeLists.txt @@ -34,6 +34,7 @@ add_subdirectory(../stm32_common/adc adc) add_subdirectory(../stm32_common/hrt hrt) +add_subdirectory(../stm32_common/led_pwm led_pwm) add_subdirectory(../stm32_common/tone_alarm tone_alarm) add_subdirectory(px4io_serial) diff --git a/src/drivers/kinetis/CMakeLists.txt b/src/drivers/kinetis/CMakeLists.txt index b01e11ee1c..de68197948 100644 --- a/src/drivers/kinetis/CMakeLists.txt +++ b/src/drivers/kinetis/CMakeLists.txt @@ -36,7 +36,6 @@ add_library(drivers_arch drv_pwm_servo.c drv_pwm_trigger.c drv_input_capture.c - drv_led_pwm.cpp ) add_dependencies(drivers_arch prebuild_targets) target_link_libraries(drivers_arch PRIVATE drivers_board) diff --git a/src/drivers/lights/rgbled_pwm/CMakeLists.txt b/src/drivers/lights/rgbled_pwm/CMakeLists.txt index dc85022c79..a5e2ee6914 100644 --- a/src/drivers/lights/rgbled_pwm/CMakeLists.txt +++ b/src/drivers/lights/rgbled_pwm/CMakeLists.txt @@ -40,4 +40,5 @@ px4_add_module( rgbled_pwm.cpp DEPENDS led - ) \ No newline at end of file + arch_led_pwm + ) diff --git a/src/drivers/stm32/CMakeLists.txt b/src/drivers/stm32/CMakeLists.txt index fa3537378f..c8eb1e9e83 100644 --- a/src/drivers/stm32/CMakeLists.txt +++ b/src/drivers/stm32/CMakeLists.txt @@ -36,7 +36,6 @@ add_library(drivers_arch drv_pwm_servo.c drv_pwm_trigger.c drv_input_capture.c - drv_led_pwm.cpp ) add_dependencies(drivers_arch prebuild_targets) target_link_libraries(drivers_arch PRIVATE drivers_board)