fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-14 21:43:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Restructure things so that the PX4 configs move out of the NuttX tree, and most of the PX4-specific board configuration data moves out of the config and into the board driver.

Browse Source 
Rename some directories that got left behind in the great board renaming.
This commit is contained in:
px4dev
2013-08-02 22:34:55 -07:00
parent a9c1882ea0
commit 9d6ec6b365
89 changed files with 6364 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/blinkm/blinkm.cpp
+7 -9
View File
@@ -92,12 +92,6 @@
#include <nuttx/config.h>
__BEGIN_DECLS
#include <arch/board/board.h>
__END_DECLS
#include <systemlib/systemlib.h>
#include <drivers/device/i2c.h>
#include <sys/types.h>
#include <stdint.h>
#include <string.h>
@@ -107,15 +101,19 @@ __END_DECLS
#include <unistd.h>
#include <stdio.h>
#include <ctype.h>
#include <drivers/drv_blinkm.h>
#include <poll.h>
#include <nuttx/wqueue.h>
#include <systemlib/perf_counter.h>
#include <systemlib/err.h>
#include <systemlib/systemlib.h>
#include <board_config.h>
#include <drivers/device/i2c.h>
#include <drivers/drv_blinkm.h>
#include <poll.h>
#include <uORB/uORB.h>
#include <uORB/topics/vehicle_status.h>
#include <uORB/topics/vehicle_gps_position.h>
src/drivers/bma180/bma180.cpp
+1 -1
View File
@@ -59,7 +59,7 @@
#include <nuttx/clock.h>
#include <drivers/drv_hrt.h>
#include <arch/board/board.h>
#include <board_config.h>
#include <drivers/device/spi.h>
#include <drivers/drv_accel.h>
src/drivers/boards/px4fmu/px4fmu_internal.h → src/drivers/boards/px4fmu-v1/board_config.h
+66 -22
View File
@@ -32,7 +32,7 @@
****************************************************************************/
/**
* @file px4fmu_internal.h
* @file board_config.h
*
* PX4FMU internal definitions
*/
@@ -51,7 +51,7 @@ __BEGIN_DECLS
/* these headers are not C++ safe */
#include <stm32.h>
#include <arch/board/board.h>
/****************************************************************************************************
* Definitions
@@ -77,15 +77,45 @@ __BEGIN_DECLS
/* External interrupts */
#define GPIO_EXTI_COMPASS (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTB|GPIO_PIN1)
// XXX MPU6000 DRDY?
/* SPI chip selects */
#define GPIO_SPI_CS_GYRO (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTC|GPIO_PIN14)
#define GPIO_SPI_CS_ACCEL (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTC|GPIO_PIN15)
#define GPIO_SPI_CS_MPU (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTB|GPIO_PIN0)
#define GPIO_SPI_CS_SDCARD (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTA|GPIO_PIN4)
/*
* Use these in place of the spi_dev_e enumeration to
* select a specific SPI device on SPI1
*/
#define PX4_SPIDEV_GYRO 1
#define PX4_SPIDEV_ACCEL 2
#define PX4_SPIDEV_MPU 3
/*
* Optional devices on IO's external port
*/
#define PX4_SPIDEV_ACCEL_MAG 2
/*
* I2C busses
*/
#define PX4_I2C_BUS_ESC 1
#define PX4_I2C_BUS_ONBOARD 2
#define PX4_I2C_BUS_EXPANSION 3
/*
* Devices on the onboard bus.
*
* Note that these are unshifted addresses.
*/
#define PX4_I2C_OBDEV_HMC5883 0x1e
#define PX4_I2C_OBDEV_MS5611 0x76
#define PX4_I2C_OBDEV_EEPROM NOTDEFINED
#define PX4_I2C_OBDEV_PX4IO_BL 0x18
#define PX4_I2C_OBDEV_PX4IO 0x1a
/* User GPIOs
*
* GPIO0-1 are the buffered high-power GPIOs.
@@ -110,31 +140,45 @@ __BEGIN_DECLS
#define GPIO_GPIO7_OUTPUT (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN12)
#define GPIO_GPIO_DIR (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTC|GPIO_PIN13)
/*
* Tone alarm output
*/
#define TONE_ALARM_TIMER 3 /* timer 3 */
#define TONE_ALARM_CHANNEL 3 /* channel 3 */
#define GPIO_TONE_ALARM_IDLE (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTC|GPIO_PIN8)
#define GPIO_TONE_ALARM (GPIO_ALT|GPIO_AF2|GPIO_SPEED_2MHz|GPIO_FLOAT|GPIO_PUSHPULL|GPIO_PORTC|GPIO_PIN8)
/*
* PWM
*
* Four PWM outputs can be configured on pins otherwise shared with
* USART2; two can take the flow control pins if they are not being used.
*
* Pins:
*
* CTS - PA0 - TIM2CH1
* RTS - PA1 - TIM2CH2
* TX - PA2 - TIM2CH3
* RX - PA3 - TIM2CH4
*
*/
#define GPIO_TIM2_CH1OUT GPIO_TIM2_CH1OUT_1
#define GPIO_TIM2_CH2OUT GPIO_TIM2_CH2OUT_1
#define GPIO_TIM2_CH3OUT GPIO_TIM2_CH3OUT_1
#define GPIO_TIM2_CH4OUT GPIO_TIM2_CH4OUT_1
/* USB OTG FS
*
* PA9 OTG_FS_VBUS VBUS sensing (also connected to the green LED)
*/
#define GPIO_OTGFS_VBUS (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|GPIO_OPENDRAIN|GPIO_PORTA|GPIO_PIN9)
/* PWM
*
* The PX4FMU has five PWM outputs, of which only the output on
* pin PC8 is fixed assigned to this function. The other four possible
* pwm sources are the TX, RX, RTS and CTS pins of USART2
*
* Alternate function mapping:
* PC8 - BUZZER - TIM8_CH3/SDIO_D0 /TIM3_CH3/ USART6_CK / DCMI_D2
/* High-resolution timer
*/
#ifdef CONFIG_PWM
# if defined(CONFIG_STM32_TIM3_PWM)
# define BUZZER_PWMCHANNEL 3
# define BUZZER_PWMTIMER 3
# elif defined(CONFIG_STM32_TIM8_PWM)
# define BUZZER_PWMCHANNEL 3
# define BUZZER_PWMTIMER 8
# endif
#endif
#define HRT_TIMER 1 /* use timer1 for the HRT */
#define HRT_TIMER_CHANNEL 1 /* use capture/compare channel */
#define HRT_PPM_CHANNEL 3 /* use capture/compare channel 3 */
#define GPIO_PPM_IN (GPIO_ALT|GPIO_AF1|GPIO_SPEED_50MHz|GPIO_PULLUP|GPIO_PORTA|GPIO_PIN10)
/****************************************************************************************************
* Public Types
src/drivers/boards/px4fmu/module.mk → src/drivers/boards/px4fmu-v1/module.mk
View File
src/drivers/boards/px4fmu/px4fmu_can.c → src/drivers/boards/px4fmu-v1/px4fmu_can.c
+1 -1
View File
@@ -54,7 +54,7 @@
#include "stm32.h"
#include "stm32_can.h"
#include "px4fmu_internal.h"
#include "board_config.h"
#ifdef CONFIG_CAN
src/drivers/boards/px4fmu/px4fmu_init.c → src/drivers/boards/px4fmu-v1/px4fmu_init.c
+1 -1
View File
@@ -59,7 +59,7 @@
#include <nuttx/analog/adc.h>
#include "stm32.h"
#include "px4fmu_internal.h"
#include "board_config.h"
#include "stm32_uart.h"
#include <arch/board/board.h>
src/drivers/boards/px4fmu/px4fmu_led.c → src/drivers/boards/px4fmu-v1/px4fmu_led.c
+1 -1
View File
@@ -42,7 +42,7 @@
#include <stdbool.h>
#include "stm32.h"
#include "px4fmu_internal.h"
#include "board_config.h"
#include <arch/board/board.h>
src/drivers/boards/px4fmu/px4fmu_pwm_servo.c → src/drivers/boards/px4fmu-v1/px4fmu_pwm_servo.c
+5 -5
View File
@@ -41,15 +41,15 @@
#include <stdint.h>
#include <drivers/stm32/drv_pwm_servo.h>
#include <arch/board/board.h>
#include <drivers/drv_pwm_output.h>
#include <stm32.h>
#include <stm32_gpio.h>
#include <stm32_tim.h>
#include <drivers/stm32/drv_pwm_servo.h>
#include <drivers/drv_pwm_output.h>
#include "board_config.h"
__EXPORT const struct pwm_servo_timer pwm_timers[PWM_SERVO_MAX_TIMERS] = {
{
.base = STM32_TIM2_BASE,
src/drivers/boards/px4fmu/px4fmu_spi.c → src/drivers/boards/px4fmu-v1/px4fmu_spi.c
+1 -1
View File
@@ -53,7 +53,7 @@
#include "up_arch.h"
#include "chip.h"
#include "stm32.h"
#include "px4fmu_internal.h"
#include "board_config.h"
/************************************************************************************
* Public Functions
src/drivers/boards/px4fmu/px4fmu_usb.c → src/drivers/boards/px4fmu-v1/px4fmu_usb.c
+1 -1
View File
@@ -53,7 +53,7 @@
#include "up_arch.h"
#include "stm32.h"
#include "px4fmu_internal.h"
#include "board_config.h"
/************************************************************************************
* Definitions
src/drivers/boards/px4fmuv2/px4fmu_internal.h → src/drivers/boards/px4fmu-v2/board_config.h
+51 -2
View File
@@ -32,7 +32,7 @@
****************************************************************************/
/**
* @file px4fmu_internal.h
* @file board_config.h
*
* PX4FMU internal definitions
*/
@@ -51,7 +51,7 @@ __BEGIN_DECLS
/* these headers are not C++ safe */
#include <stm32.h>
#include <arch/board/board.h>
/****************************************************************************************************
* Definitions
@@ -76,6 +76,9 @@ __BEGIN_DECLS
#define GPIO_LED1 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTE|GPIO_PIN12)
/* External interrupts */
#define GPIO_EXTI_GYRO_DRDY (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTB|GPIO_PIN0)
#define GPIO_EXTI_MAG_DRDY (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTB|GPIO_PIN1)
#define GPIO_EXTI_ACCEL_DRDY (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTB|GPIO_PIN4)
/* SPI chip selects */
#define GPIO_SPI_CS_GYRO (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTC|GPIO_PIN13)
@@ -83,6 +86,22 @@ __BEGIN_DECLS
#define GPIO_SPI_CS_BARO (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTD|GPIO_PIN7)
#define GPIO_SPI_CS_FRAM (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTD|GPIO_PIN10)
/* Use these in place of the spi_dev_e enumeration to select a specific SPI device on SPI1 */
#define PX4_SPIDEV_GYRO 1
#define PX4_SPIDEV_ACCEL_MAG 2
#define PX4_SPIDEV_BARO 3
/* I2C busses */
#define PX4_I2C_BUS_EXPANSION 1
#define PX4_I2C_BUS_LED 2
/* Devices on the onboard bus.
*
* Note that these are unshifted addresses.
*/
#define PX4_I2C_OBDEV_LED 0x55
#define PX4_I2C_OBDEV_HMC5883 0x1e
/* User GPIOs
*
* GPIO0-5 are the PWM servo outputs.
@@ -108,12 +127,42 @@ __BEGIN_DECLS
#define GPIO_VDD_5V_HIPOWER_OC (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTE|GPIO_PIN10)
#define GPIO_VDD_5V_PERIPH_OC (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTE|GPIO_PIN15)
/* Tone alarm output */
#define TONE_ALARM_TIMER 2 /* timer 2 */
#define TONE_ALARM_CHANNEL 1 /* channel 1 */
#define GPIO_TONE_ALARM_IDLE (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTA|GPIO_PIN15)
#define GPIO_TONE_ALARM (GPIO_ALT|GPIO_AF1|GPIO_SPEED_2MHz|GPIO_PUSHPULL|GPIO_PORTA|GPIO_PIN15)
/* PWM
*
* Six PWM outputs are configured.
*
* Pins:
*
* CH1 : PE14 : TIM1_CH4
* CH2 : PE13 : TIM1_CH3
* CH3 : PE11 : TIM1_CH2
* CH4 : PE9 : TIM1_CH1
* CH5 : PD13 : TIM4_CH2
* CH6 : PD14 : TIM4_CH3
*/
#define GPIO_TIM1_CH1OUT GPIO_TIM1_CH1OUT_2
#define GPIO_TIM1_CH2OUT GPIO_TIM1_CH2OUT_2
#define GPIO_TIM1_CH3OUT GPIO_TIM1_CH3OUT_2
#define GPIO_TIM1_CH4OUT GPIO_TIM1_CH4OUT_2
#define GPIO_TIM4_CH2OUT GPIO_TIM4_CH2OUT_2
#define GPIO_TIM4_CH3OUT GPIO_TIM4_CH3OUT_2
/* USB OTG FS
*
* PA9 OTG_FS_VBUS VBUS sensing (also connected to the green LED)
*/
#define GPIO_OTGFS_VBUS (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|GPIO_OPENDRAIN|GPIO_PORTA|GPIO_PIN9)
/* High-resolution timer */
#define HRT_TIMER 8 /* use timer8 for the HRT */
#define HRT_TIMER_CHANNEL 1 /* use capture/compare channel */
/****************************************************************************************************
* Public Types
****************************************************************************************************/
src/drivers/boards/px4fmuv2/module.mk → src/drivers/boards/px4fmu-v2/module.mk
View File
src/drivers/boards/px4fmuv2/px4fmu2_init.c → src/drivers/boards/px4fmu-v2/px4fmu2_init.c
+1 -1
View File
@@ -60,7 +60,7 @@
#include <nuttx/analog/adc.h>
#include <stm32.h>
#include "px4fmu_internal.h"
#include "board_config.h"
#include <stm32_uart.h>
#include <arch/board/board.h>
src/drivers/boards/px4fmuv2/px4fmu2_led.c → src/drivers/boards/px4fmu-v2/px4fmu2_led.c
+1 -1
View File
@@ -42,7 +42,7 @@
#include <stdbool.h>
#include "stm32.h"
#include "px4fmu_internal.h"
#include "board_config.h"
#include <arch/board/board.h>
src/drivers/boards/px4fmuv2/px4fmu_can.c → src/drivers/boards/px4fmu-v2/px4fmu_can.c
+1 -1
View File
@@ -54,7 +54,7 @@
#include "stm32.h"
#include "stm32_can.h"
#include "px4fmu_internal.h"
#include "board_config.h"
#ifdef CONFIG_CAN
src/drivers/boards/px4fmuv2/px4fmu_pwm_servo.c → src/drivers/boards/px4fmu-v2/px4fmu_pwm_servo.c
+5 -5
View File
@@ -41,15 +41,15 @@
#include <stdint.h>
#include <drivers/stm32/drv_pwm_servo.h>
#include <arch/board/board.h>
#include <drivers/drv_pwm_output.h>
#include <stm32.h>
#include <stm32_gpio.h>
#include <stm32_tim.h>
#include <drivers/stm32/drv_pwm_servo.h>
#include <drivers/drv_pwm_output.h>
#include "board_config.h"
__EXPORT const struct pwm_servo_timer pwm_timers[PWM_SERVO_MAX_TIMERS] = {
{
.base = STM32_TIM1_BASE,
src/drivers/boards/px4fmuv2/px4fmu_spi.c → src/drivers/boards/px4fmu-v2/px4fmu_spi.c
+1 -1
View File
@@ -53,7 +53,7 @@
#include <up_arch.h>
#include <chip.h>
#include <stm32.h>
#include "px4fmu_internal.h"
#include "board_config.h"
/************************************************************************************
* Public Functions
src/drivers/boards/px4fmuv2/px4fmu_usb.c → src/drivers/boards/px4fmu-v2/px4fmu_usb.c
+1 -1
View File
@@ -53,7 +53,7 @@
#include <up_arch.h>
#include <stm32.h>
#include "px4fmu_internal.h"
#include "board_config.h"
/************************************************************************************
* Definitions
src/drivers/boards/px4io/px4io_internal.h → src/drivers/boards/px4io-v1/board_config.h
+11 -1
View File
@@ -32,7 +32,7 @@
****************************************************************************/
/**
* @file px4io_internal.h
* @file board_config.h
*
* PX4IO hardware definitions.
*/
@@ -47,7 +47,9 @@
#include <nuttx/compiler.h>
#include <stdint.h>
/* these headers are not C++ safe */
#include <stm32.h>
#include <arch/board/board.h>
/************************************************************************************
* Definitions
@@ -83,3 +85,11 @@
#define GPIO_ADC_VBATT (GPIO_INPUT|GPIO_CNF_ANALOGIN|GPIO_MODE_INPUT|GPIO_PORTA|GPIO_PIN4)
#define GPIO_ADC_IN5 (GPIO_INPUT|GPIO_CNF_ANALOGIN|GPIO_MODE_INPUT|GPIO_PORTA|GPIO_PIN5)
/*
* High-resolution timer
*/
#define HRT_TIMER 1 /* use timer1 for the HRT */
#define HRT_TIMER_CHANNEL 2 /* use capture/compare channel 2 */
#define HRT_PPM_CHANNEL 1 /* use capture/compare channel 1 */
#define GPIO_PPM_IN GPIO_TIM1_CH1IN
src/drivers/boards/px4io/module.mk → src/drivers/boards/px4io-v1/module.mk
View File
src/drivers/boards/px4io/px4io_init.c → src/drivers/boards/px4io-v1/px4io_init.c
+1 -1
View File
@@ -55,7 +55,7 @@
#include <nuttx/arch.h>
#include "stm32.h"
#include "px4io_internal.h"
#include "board_config.h"
#include "stm32_uart.h"
#include <arch/board/board.h>
src/drivers/boards/px4io/px4io_pwm_servo.c → src/drivers/boards/px4io-v1/px4io_pwm_servo.c
View File
src/drivers/boards/px4iov2/px4iov2_internal.h → src/drivers/boards/px4io-v2/board_config.h
Executable → Regular
+21 -1
View File
@@ -49,7 +49,7 @@
/* these headers are not C++ safe */
#include <stm32.h>
#include <arch/board/board.h>
/******************************************************************************
* Definitions
@@ -116,3 +116,23 @@
#define GPIO_SBUS_OUTPUT (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN10)
#define GPIO_SBUS_OENABLE (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN4)
/*
* High-resolution timer
*/
#define HRT_TIMER 1 /* use timer1 for the HRT */
#define HRT_TIMER_CHANNEL 2 /* use capture/compare channel 2 */
#define HRT_PPM_CHANNEL 1 /* use capture/compare channel 1 */
#define GPIO_PPM_IN GPIO_TIM1_CH1IN
/* LED definitions ******************************************************************/
/* PX4 has two LEDs that we will encode as: */
#define LED_STARTED 0 /* LED? */
#define LED_HEAPALLOCATE 1 /* LED? */
#define LED_IRQSENABLED 2 /* LED? + LED? */
#define LED_STACKCREATED 3 /* LED? */
#define LED_INIRQ 4 /* LED? + LED? */
#define LED_SIGNAL 5 /* LED? + LED? */
#define LED_ASSERTION 6 /* LED? + LED? + LED? */
#define LED_PANIC 7 /* N/C + N/C + N/C + LED? */
src/drivers/boards/px4iov2/module.mk → src/drivers/boards/px4io-v2/module.mk
View File
src/drivers/boards/px4iov2/px4iov2_init.c → src/drivers/boards/px4io-v2/px4iov2_init.c
+1 -1
View File
@@ -55,7 +55,7 @@
#include <nuttx/arch.h>
#include <stm32.h>
#include "px4iov2_internal.h"
#include "board_config.h"
#include <arch/board/board.h>
src/drivers/boards/px4iov2/px4iov2_pwm_servo.c → src/drivers/boards/px4io-v2/px4iov2_pwm_servo.c
View File
src/drivers/drv_gpio.h
+2 -6
View File
@@ -59,9 +59,7 @@
# define GPIO_CAN_RX (1<<7) /**< CAN2 RX */
/**
* Default GPIO device - other devices may also support this protocol if
* they also export GPIO-like things. This is always the GPIOs on the
* main board.
* Device paths for things that support the GPIO ioctl protocol.
*/
# define PX4FMU_DEVICE_PATH "/dev/px4fmu"
# define PX4IO_DEVICE_PATH "/dev/px4io"
@@ -89,9 +87,7 @@
# define GPIO_5V_PERIPH_OC (1<<11) /**< PE10 - !VDD_5V_PERIPH_OC */
/**
* Default GPIO device - other devices may also support this protocol if
* they also export GPIO-like things. This is always the GPIOs on the
* main board.
* Device paths for things that support the GPIO ioctl protocol.
*/
# define PX4FMU_DEVICE_PATH "/dev/px4fmu"
# define PX4IO_DEVICE_PATH "/dev/px4io"
src/drivers/ets_airspeed/ets_airspeed.cpp
+1 -1
View File
@@ -59,7 +59,7 @@
#include <nuttx/wqueue.h>
#include <nuttx/clock.h>
#include <arch/board/board.h>
#include <board_config.h>
#include <systemlib/airspeed.h>
#include <systemlib/err.h>
src/drivers/hmc5883/hmc5883.cpp
+1 -1
View File
@@ -58,7 +58,7 @@
#include <nuttx/wqueue.h>
#include <nuttx/clock.h>
#include <arch/board/board.h>
#include <board_config.h>
#include <systemlib/perf_counter.h>
#include <systemlib/err.h>
src/drivers/l3gd20/l3gd20.cpp
+1 -2
View File
@@ -59,11 +59,10 @@
#include <nuttx/clock.h>
#include <drivers/drv_hrt.h>
#include <arch/board/board.h>
#include <drivers/device/spi.h>
#include <drivers/drv_gyro.h>
#include <board_config.h>
/* oddly, ERROR is not defined for c++ */
#ifdef ERROR
src/drivers/lsm303d/lsm303d.cpp
+2 -2
View File
@@ -59,12 +59,12 @@
#include <nuttx/clock.h>
#include <drivers/drv_hrt.h>
#include <arch/board/board.h>
#include <drivers/device/spi.h>
#include <drivers/drv_accel.h>
#include <drivers/drv_mag.h>
#include <board_config.h>
#include "iirFilter.h"
/* oddly, ERROR is not defined for c++ */
src/drivers/mb12xx/mb12xx.cpp
+2 -2
View File
@@ -59,8 +59,6 @@
#include <nuttx/wqueue.h>
#include <nuttx/clock.h>
#include <arch/board/board.h>
#include <systemlib/perf_counter.h>
#include <systemlib/err.h>
@@ -70,6 +68,8 @@
#include <uORB/uORB.h>
#include <uORB/topics/subsystem_info.h>
#include <board_config.h>
/* Configuration Constants */
#define MB12XX_BUS PX4_I2C_BUS_EXPANSION
#define MB12XX_BASEADDR 0x70 /* 7-bit address. 8-bit address is 0xE0 */
src/drivers/meas_airspeed/meas_airspeed.cpp
+1 -1
View File
@@ -69,7 +69,7 @@
#include <nuttx/wqueue.h>
#include <nuttx/clock.h>
#include <arch/board/board.h>
#include <board_config.h>
#include <systemlib/airspeed.h>
#include <systemlib/err.h>
src/drivers/mkblctrl/mkblctrl.cpp
+2 -1
View File
@@ -59,10 +59,11 @@
#include <nuttx/arch.h>
#include <nuttx/i2c.h>
#include <board_config.h>
#include <drivers/device/device.h>
#include <drivers/drv_pwm_output.h>
#include <drivers/drv_gpio.h>
#include <drivers/boards/px4fmu/px4fmu_internal.h>
#include <drivers/drv_hrt.h>
#include <drivers/drv_rc_input.h>
src/drivers/mpu6000/mpu6000.cpp
+1 -1
View File
@@ -63,7 +63,7 @@
#include <nuttx/arch.h>
#include <nuttx/clock.h>
#include <arch/board/board.h>
#include <board_config.h>
#include <drivers/drv_hrt.h>
#include <drivers/device/spi.h>
src/drivers/px4fmu/fmu.cpp
+4 -12
View File
@@ -59,15 +59,7 @@
#include <drivers/drv_gpio.h>
#include <drivers/drv_hrt.h>
#if defined(CONFIG_ARCH_BOARD_PX4FMU_V1)
# include <drivers/boards/px4fmu/px4fmu_internal.h>
# define FMU_HAVE_PPM
#elif defined(CONFIG_ARCH_BOARD_PX4FMU_V2)
# include <drivers/boards/px4fmuv2/px4fmu_internal.h>
# undef FMU_HAVE_PPM
#else
# error Unrecognised FMU board.
#endif
# include <board_config.h>
#include <systemlib/systemlib.h>
#include <systemlib/err.h>
@@ -80,7 +72,7 @@
#include <uORB/topics/actuator_outputs.h>
#include <systemlib/err.h>
#ifdef FMU_HAVE_PPM
#ifdef HRT_PPM_CHANNEL
# include <systemlib/ppm_decode.h>
#endif
@@ -455,7 +447,7 @@ PX4FMU::task_main()
fds[1].fd = _t_armed;
fds[1].events = POLLIN;
#ifdef FMU_HAVE_PPM
#ifdef HRT_PPM_CHANNEL
// rc input, published to ORB
struct rc_input_values rc_in;
orb_advert_t to_input_rc = 0;
@@ -585,7 +577,7 @@ PX4FMU::task_main()
}
}
#ifdef FMU_HAVE_PPM
#ifdef HRT_PPM_CHANNEL
// see if we have new PPM input data
if (ppm_last_valid_decode != rc_in.timestamp) {
// we have a new PPM frame. Publish it.
src/drivers/px4io/px4io_serial.cpp
+1 -1
View File
@@ -61,7 +61,7 @@
#include <drivers/device/device.h>
#include <drivers/drv_hrt.h>
#include <drivers/boards/px4fmuv2/px4fmu_internal.h> /* XXX should really not be hardcoding v2 here */
#include <board_config.h>
#include <systemlib/perf_counter.h>
src/drivers/px4io/px4io_uploader.cpp
+1 -6
View File
@@ -56,12 +56,7 @@
#include "uploader.h"
#ifdef CONFIG_ARCH_BOARD_PX4FMU_V2
#include <drivers/boards/px4fmuv2/px4fmu_internal.h>
#endif
#ifdef CONFIG_ARCH_BOARD_PX4FMU_V1
#include <drivers/boards/px4fmu/px4fmu_internal.h>
#endif
#include <board_config.h>
// define for comms logging
//#define UDEBUG
src/drivers/rgbled/rgbled.cpp
+2 -1
View File
@@ -41,7 +41,6 @@
#include <nuttx/config.h>
#include <arch/board/board.h>
#include <drivers/device/i2c.h>
#include <sys/types.h>
@@ -60,6 +59,8 @@
#include <systemlib/err.h>
#include <systemlib/systemlib.h>
#include <board_config.h>
#include "device/rgbled.h"
#define LED_ONTIME 120
src/drivers/stm32/drv_hrt.c
+1 -6
View File
@@ -59,7 +59,7 @@
#include <errno.h>
#include <string.h>
#include <arch/board/board.h>
#include <board_config.h>
#include <drivers/drv_hrt.h>
#include "chip.h"
@@ -70,8 +70,6 @@
#include "stm32_gpio.h"
#include "stm32_tim.h"
#ifdef HRT_TIMER
/* HRT configuration */
#if HRT_TIMER == 1
# define HRT_TIMER_BASE STM32_TIM1_BASE
@@ -905,6 +903,3 @@ hrt_latency_update(void)
/* catch-all at the end */
latency_counters[index]++;
}
#endif /* HRT_TIMER */
src/drivers/stm32/tone_alarm/tone_alarm.cpp
+1 -1
View File
@@ -104,7 +104,7 @@
#include <math.h>
#include <ctype.h>
#include <arch/board/board.h>
#include <board_config.h>
#include <drivers/drv_hrt.h>
#include <arch/stm32/chip.h>
src/modules/px4iofirmware/px4io.h
+1 -6
View File
@@ -42,12 +42,7 @@
#include <stdbool.h>
#include <stdint.h>
#ifdef CONFIG_ARCH_BOARD_PX4IO_V1
# include <drivers/boards/px4io/px4io_internal.h>
#endif
#ifdef CONFIG_ARCH_BOARD_PX4IO_V2
# include <drivers/boards/px4iov2/px4iov2_internal.h>
#endif
#include <board_config.h>
#include "protocol.h"
src/modules/systemlib/systemlib.c
+3 -1
View File
@@ -43,11 +43,13 @@
#include <fcntl.h>
#include <sched.h>
#include <signal.h>
#include <sys/stat.h>
#include <unistd.h>
#include <float.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
#include "systemlib.h"
__EXPORT extern void systemreset(void) {
src/systemcmds/eeprom/eeprom.c
+1 -1
View File
@@ -55,7 +55,7 @@
#include <nuttx/fs/nxffs.h>
#include <nuttx/fs/ioctl.h>
#include <arch/board/board.h>
#include <board_config.h>
#include "systemlib/systemlib.h"
#include "systemlib/param/param.h"
src/systemcmds/i2c/i2c.c
+1 -1
View File
@@ -52,7 +52,7 @@
#include <nuttx/i2c.h>
#include <arch/board/board.h>
#include <board_config.h>
#include "systemlib/systemlib.h"
#include "systemlib/err.h"