Pull v2 pieces up to build with the merge

This commit is contained in:
px4dev
2013-07-07 17:53:55 -07:00
parent 43f1843cc7
commit b4029dd824
60 changed files with 1167 additions and 227 deletions
+2 -2
View File
@@ -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>
@@ -50,7 +50,7 @@
__BEGIN_DECLS
/* these headers are not C++ safe */
#include <stm32_internal.h>
#include <stm32.h>
/****************************************************************************************************
@@ -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>
+3 -3
View File
@@ -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"
/************************************************************************************
+2 -2
View File
@@ -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"
/************************************************************************************
+1 -1
View File
@@ -54,7 +54,7 @@
#include <nuttx/arch.h>
#include "stm32_internal.h"
#include <stm32.h>
#include "px4iov2_internal.h"
#include <arch/board/board.h>
@@ -48,7 +48,7 @@
#include <stdint.h>
/* these headers are not C++ safe */
#include <stm32_internal.h>
#include <stm32.h>
/******************************************************************************
@@ -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>