diff options
author | px4dev <px4@purgatory.org> | 2013-04-06 23:04:32 -0700 |
---|---|---|
committer | px4dev <px4@purgatory.org> | 2013-04-06 23:04:32 -0700 |
commit | 2557f0d2de80e2df690b40b60f8ec79de799657e (patch) | |
tree | 935286e8325064c24d31d18dd9facadcf50cd634 | |
parent | 8eeefcce057012400d94ec855c9103d390b6365b (diff) | |
download | px4-firmware-2557f0d2de80e2df690b40b60f8ec79de799657e.tar.gz px4-firmware-2557f0d2de80e2df690b40b60f8ec79de799657e.tar.bz2 px4-firmware-2557f0d2de80e2df690b40b60f8ec79de799657e.zip |
Rename the 'device' directory back to 'drivers', it's less confusing that way.
Move the fmuv2 board driver out into the new world.
-rw-r--r-- | apps/drivers/boards/px4fmuv2/Makefile | 41 | ||||
-rw-r--r-- | makefiles/config_px4fmu_default.mk | 2 | ||||
-rw-r--r-- | makefiles/config_px4fmuv2_default.mk | 7 | ||||
-rw-r--r-- | src/drivers/boards/px4fmuv2/module.mk | 9 | ||||
-rw-r--r-- | src/drivers/boards/px4fmuv2/px4fmu_can.c (renamed from apps/drivers/boards/px4fmuv2/px4fmu_can.c) | 0 | ||||
-rw-r--r-- | src/drivers/boards/px4fmuv2/px4fmu_init.c (renamed from apps/drivers/boards/px4fmuv2/px4fmu_init.c) | 0 | ||||
-rw-r--r-- | src/drivers/boards/px4fmuv2/px4fmu_internal.h (renamed from apps/drivers/boards/px4fmuv2/px4fmu_internal.h) | 0 | ||||
-rw-r--r-- | src/drivers/boards/px4fmuv2/px4fmu_pwm_servo.c (renamed from apps/drivers/boards/px4fmuv2/px4fmu_pwm_servo.c) | 0 | ||||
-rw-r--r-- | src/drivers/boards/px4fmuv2/px4fmu_spi.c (renamed from apps/drivers/boards/px4fmuv2/px4fmu_spi.c) | 0 | ||||
-rw-r--r-- | src/drivers/boards/px4fmuv2/px4fmu_usb.c (renamed from apps/drivers/boards/px4fmuv2/px4fmu_usb.c) | 0 | ||||
-rw-r--r-- | src/drivers/lsm303d/lsm303d.cpp (renamed from src/device/lsm303d/lsm303d.cpp) | 0 | ||||
-rw-r--r-- | src/drivers/lsm303d/module.mk (renamed from src/device/lsm303d/module.mk) | 0 | ||||
-rw-r--r-- | src/drivers/px4fmu/fmu.cpp (renamed from src/device/px4fmu/fmu.cpp) | 0 | ||||
-rw-r--r-- | src/drivers/px4fmu/module.mk (renamed from src/device/px4fmu/module.mk) | 0 | ||||
-rw-r--r-- | src/drivers/rgbled/module.mk (renamed from src/device/rgbled/module.mk) | 0 | ||||
-rw-r--r-- | src/drivers/rgbled/rgbled.cpp (renamed from src/device/rgbled/rgbled.cpp) | 0 |
16 files changed, 14 insertions, 45 deletions
diff --git a/apps/drivers/boards/px4fmuv2/Makefile b/apps/drivers/boards/px4fmuv2/Makefile deleted file mode 100644 index 9c04a8c42..000000000 --- a/apps/drivers/boards/px4fmuv2/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################ -# -# Copyright (C) 2012 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. -# -############################################################################ - -# -# Board-specific startup code for the PX4FMUv2 -# - -INCLUDES = $(TOPDIR)/arch/arm/src/stm32 $(TOPDIR)/arch/arm/src/common -LIBNAME = brd_px4fmuv2 - -include $(APPDIR)/mk/app.mk diff --git a/makefiles/config_px4fmu_default.mk b/makefiles/config_px4fmu_default.mk index 39b47d817..1a6c91b26 100644 --- a/makefiles/config_px4fmu_default.mk +++ b/makefiles/config_px4fmu_default.mk @@ -10,7 +10,7 @@ ROMFS_ROOT = $(PX4_BASE)/ROMFS/px4fmu_common # # Board support modules # -MODULES += device/px4fmu +MODULES += drivers/px4fmu # # Transitional support - add commands from the NuttX export archive. diff --git a/makefiles/config_px4fmuv2_default.mk b/makefiles/config_px4fmuv2_default.mk index 11ca5227e..d296c5379 100644 --- a/makefiles/config_px4fmuv2_default.mk +++ b/makefiles/config_px4fmuv2_default.mk @@ -10,9 +10,10 @@ ROMFS_ROOT = $(PX4_BASE)/ROMFS/px4fmu_common # # Board support modules # -MODULES += device/lsm303d -MODULES += device/px4fmu -MODULES += device/rgbled +MODULES += drivers/boards/px4fmuv2 +MODULES += drivers/lsm303d +MODULES += drivers/px4fmu +MODULES += drivers/rgbled # # Transitional support - add commands from the NuttX export archive. diff --git a/src/drivers/boards/px4fmuv2/module.mk b/src/drivers/boards/px4fmuv2/module.mk new file mode 100644 index 000000000..eb8841e4d --- /dev/null +++ b/src/drivers/boards/px4fmuv2/module.mk @@ -0,0 +1,9 @@ +# +# Board-specific startup code for the PX4FMUv2 +# + +SRCS = px4fmu_can.c \ + px4fmu_init.c \ + px4fmu_pwm_servo.c \ + px4fmu_spi.c \ + px4fmu_usb.c diff --git a/apps/drivers/boards/px4fmuv2/px4fmu_can.c b/src/drivers/boards/px4fmuv2/px4fmu_can.c index 86ba183b8..86ba183b8 100644 --- a/apps/drivers/boards/px4fmuv2/px4fmu_can.c +++ b/src/drivers/boards/px4fmuv2/px4fmu_can.c diff --git a/apps/drivers/boards/px4fmuv2/px4fmu_init.c b/src/drivers/boards/px4fmuv2/px4fmu_init.c index 1d99f15bf..1d99f15bf 100644 --- a/apps/drivers/boards/px4fmuv2/px4fmu_init.c +++ b/src/drivers/boards/px4fmuv2/px4fmu_init.c diff --git a/apps/drivers/boards/px4fmuv2/px4fmu_internal.h b/src/drivers/boards/px4fmuv2/px4fmu_internal.h index cc4e9529d..cc4e9529d 100644 --- a/apps/drivers/boards/px4fmuv2/px4fmu_internal.h +++ b/src/drivers/boards/px4fmuv2/px4fmu_internal.h diff --git a/apps/drivers/boards/px4fmuv2/px4fmu_pwm_servo.c b/src/drivers/boards/px4fmuv2/px4fmu_pwm_servo.c index 14e4052be..14e4052be 100644 --- a/apps/drivers/boards/px4fmuv2/px4fmu_pwm_servo.c +++ b/src/drivers/boards/px4fmuv2/px4fmu_pwm_servo.c diff --git a/apps/drivers/boards/px4fmuv2/px4fmu_spi.c b/src/drivers/boards/px4fmuv2/px4fmu_spi.c index f90f25071..f90f25071 100644 --- a/apps/drivers/boards/px4fmuv2/px4fmu_spi.c +++ b/src/drivers/boards/px4fmuv2/px4fmu_spi.c diff --git a/apps/drivers/boards/px4fmuv2/px4fmu_usb.c b/src/drivers/boards/px4fmuv2/px4fmu_usb.c index b0b669fbe..b0b669fbe 100644 --- a/apps/drivers/boards/px4fmuv2/px4fmu_usb.c +++ b/src/drivers/boards/px4fmuv2/px4fmu_usb.c diff --git a/src/device/lsm303d/lsm303d.cpp b/src/drivers/lsm303d/lsm303d.cpp index 32030a1f7..32030a1f7 100644 --- a/src/device/lsm303d/lsm303d.cpp +++ b/src/drivers/lsm303d/lsm303d.cpp diff --git a/src/device/lsm303d/module.mk b/src/drivers/lsm303d/module.mk index e93b1e331..e93b1e331 100644 --- a/src/device/lsm303d/module.mk +++ b/src/drivers/lsm303d/module.mk diff --git a/src/device/px4fmu/fmu.cpp b/src/drivers/px4fmu/fmu.cpp index d3865f053..d3865f053 100644 --- a/src/device/px4fmu/fmu.cpp +++ b/src/drivers/px4fmu/fmu.cpp diff --git a/src/device/px4fmu/module.mk b/src/drivers/px4fmu/module.mk index 05bc7a5b3..05bc7a5b3 100644 --- a/src/device/px4fmu/module.mk +++ b/src/drivers/px4fmu/module.mk diff --git a/src/device/rgbled/module.mk b/src/drivers/rgbled/module.mk index 39b53ec9e..39b53ec9e 100644 --- a/src/device/rgbled/module.mk +++ b/src/drivers/rgbled/module.mk diff --git a/src/device/rgbled/rgbled.cpp b/src/drivers/rgbled/rgbled.cpp index dc1e469c0..dc1e469c0 100644 --- a/src/device/rgbled/rgbled.cpp +++ b/src/drivers/rgbled/rgbled.cpp |