diff options
author | px4dev <px4@purgatory.org> | 2013-07-07 17:53:55 -0700 |
---|---|---|
committer | px4dev <px4@purgatory.org> | 2013-07-07 17:53:55 -0700 |
commit | b4029dd824cec7a0b53c62e960f80d90ddc6e13c (patch) | |
tree | 2bae71f23af17bb0d9de26a914c859ec9af1e010 /src/drivers/boards | |
parent | 43f1843cc750fcef07122feaeca07863ed28c036 (diff) | |
download | px4-firmware-b4029dd824cec7a0b53c62e960f80d90ddc6e13c.tar.gz px4-firmware-b4029dd824cec7a0b53c62e960f80d90ddc6e13c.tar.bz2 px4-firmware-b4029dd824cec7a0b53c62e960f80d90ddc6e13c.zip |
Pull v2 pieces up to build with the merge
Diffstat (limited to 'src/drivers/boards')
-rw-r--r-- | src/drivers/boards/px4fmuv2/px4fmu_init.c | 4 | ||||
-rw-r--r-- | src/drivers/boards/px4fmuv2/px4fmu_internal.h | 2 | ||||
-rw-r--r-- | src/drivers/boards/px4fmuv2/px4fmu_pwm_servo.c | 2 | ||||
-rw-r--r-- | src/drivers/boards/px4fmuv2/px4fmu_spi.c | 6 | ||||
-rw-r--r-- | src/drivers/boards/px4fmuv2/px4fmu_usb.c | 4 | ||||
-rw-r--r-- | src/drivers/boards/px4iov2/px4iov2_init.c | 2 | ||||
-rwxr-xr-x | src/drivers/boards/px4iov2/px4iov2_internal.h | 2 | ||||
-rw-r--r-- | src/drivers/boards/px4iov2/px4iov2_pwm_servo.c | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/src/drivers/boards/px4fmuv2/px4fmu_init.c b/src/drivers/boards/px4fmuv2/px4fmu_init.c index 03ec5a255..f9d1b8022 100644 --- a/src/drivers/boards/px4fmuv2/px4fmu_init.c +++ b/src/drivers/boards/px4fmuv2/px4fmu_init.c @@ -59,9 +59,9 @@ #include <nuttx/mmcsd.h> #include <nuttx/analog/adc.h> -#include "stm32_internal.h" +#include <stm32.h> #include "px4fmu_internal.h" -#include "stm32_uart.h" +#include <stm32_uart.h> #include <arch/board/board.h> diff --git a/src/drivers/boards/px4fmuv2/px4fmu_internal.h b/src/drivers/boards/px4fmuv2/px4fmu_internal.h index dd291b9b7..dce51bcda 100644 --- a/src/drivers/boards/px4fmuv2/px4fmu_internal.h +++ b/src/drivers/boards/px4fmuv2/px4fmu_internal.h @@ -50,7 +50,7 @@ __BEGIN_DECLS /* these headers are not C++ safe */ -#include <stm32_internal.h> +#include <stm32.h> /**************************************************************************************************** diff --git a/src/drivers/boards/px4fmuv2/px4fmu_pwm_servo.c b/src/drivers/boards/px4fmuv2/px4fmu_pwm_servo.c index 14e4052be..d1656005b 100644 --- a/src/drivers/boards/px4fmuv2/px4fmu_pwm_servo.c +++ b/src/drivers/boards/px4fmuv2/px4fmu_pwm_servo.c @@ -46,7 +46,7 @@ #include <arch/board/board.h> #include <drivers/drv_pwm_output.h> -#include <stm32_internal.h> +#include <stm32.h> #include <stm32_gpio.h> #include <stm32_tim.h> diff --git a/src/drivers/boards/px4fmuv2/px4fmu_spi.c b/src/drivers/boards/px4fmuv2/px4fmu_spi.c index f90f25071..5e90c227d 100644 --- a/src/drivers/boards/px4fmuv2/px4fmu_spi.c +++ b/src/drivers/boards/px4fmuv2/px4fmu_spi.c @@ -50,9 +50,9 @@ #include <nuttx/spi.h> #include <arch/board/board.h> -#include "up_arch.h" -#include "chip.h" -#include "stm32_internal.h" +#include <up_arch.h> +#include <chip.h> +#include <stm32.h> #include "px4fmu_internal.h" /************************************************************************************ diff --git a/src/drivers/boards/px4fmuv2/px4fmu_usb.c b/src/drivers/boards/px4fmuv2/px4fmu_usb.c index b0b669fbe..3492e2c68 100644 --- a/src/drivers/boards/px4fmuv2/px4fmu_usb.c +++ b/src/drivers/boards/px4fmuv2/px4fmu_usb.c @@ -51,8 +51,8 @@ #include <nuttx/usb/usbdev.h> #include <nuttx/usb/usbdev_trace.h> -#include "up_arch.h" -#include "stm32_internal.h" +#include <up_arch.h> +#include <stm32.h> #include "px4fmu_internal.h" /************************************************************************************ diff --git a/src/drivers/boards/px4iov2/px4iov2_init.c b/src/drivers/boards/px4iov2/px4iov2_init.c index 5d7b22560..e95298bf5 100644 --- a/src/drivers/boards/px4iov2/px4iov2_init.c +++ b/src/drivers/boards/px4iov2/px4iov2_init.c @@ -54,7 +54,7 @@ #include <nuttx/arch.h> -#include "stm32_internal.h" +#include <stm32.h> #include "px4iov2_internal.h" #include <arch/board/board.h> diff --git a/src/drivers/boards/px4iov2/px4iov2_internal.h b/src/drivers/boards/px4iov2/px4iov2_internal.h index 81a75431c..2bf65e047 100755 --- a/src/drivers/boards/px4iov2/px4iov2_internal.h +++ b/src/drivers/boards/px4iov2/px4iov2_internal.h @@ -48,7 +48,7 @@ #include <stdint.h> /* these headers are not C++ safe */ -#include <stm32_internal.h> +#include <stm32.h> /****************************************************************************** diff --git a/src/drivers/boards/px4iov2/px4iov2_pwm_servo.c b/src/drivers/boards/px4iov2/px4iov2_pwm_servo.c index 5e1aafa49..4f1b9487c 100644 --- a/src/drivers/boards/px4iov2/px4iov2_pwm_servo.c +++ b/src/drivers/boards/px4iov2/px4iov2_pwm_servo.c @@ -46,7 +46,7 @@ #include <arch/board/board.h> #include <drivers/drv_pwm_output.h> -#include <stm32_internal.h> +#include <stm32.h> #include <stm32_gpio.h> #include <stm32_tim.h> |