dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

TAP_V1 removed unused GPIO defines 

Removed GPIO pins defines that were never user GPIO.
  Removed the camera_trigger driver as it depends on
  GPIO that are not on the TAP V1 HW
This commit is contained in:
David Sidrane 2017-01-18 13:58:58 -10:00 committed by Lorenz Meier
parent d0f2d5e07f
commit cf893b6e89
3 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/configs/nuttx_tap-v1_default.cmake
View File

@ -27,7 +27,6 @@ set(config_module_list
drivers/meas_airspeed drivers/meas_airspeed
modules/sensors modules/sensors
drivers/vmount drivers/vmount
drivers/camera_trigger
# #
# System commands # System commands

23
src/drivers/boards/tap-v1/board_config.h
View File

@ -134,7 +134,7 @@
#define ADC_BATTERY_CURRENT_CHANNEL ((uint8_t)(-1)) #define ADC_BATTERY_CURRENT_CHANNEL ((uint8_t)(-1))
/* User GPIOs /* No User GPIOs
* *
* TIM3_CH1 PA6 LED_R JP2-23,24 * TIM3_CH1 PA6 LED_R JP2-23,24
* TIM3_CH2 PA7 LED_G JP2-25,26 * TIM3_CH2 PA7 LED_G JP2-25,26
@ -143,21 +143,7 @@
* *
* I2C2_SDA PB11 Sonar Echo/I2C_SDA JP2-31,32 * I2C2_SDA PB11 Sonar Echo/I2C_SDA JP2-31,32
* I2C2_SDL PB10 Sonar Trig/I2C_SCL JP2-29,30 * I2C2_SDL PB10 Sonar Trig/I2C_SCL JP2-29,30
*
*/ */
#define GPIO_GPIO0_INPUT (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTA|GPIO_PIN6)
#define GPIO_GPIO1_INPUT (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTA|GPIO_PIN7)
#define GPIO_GPIO2_INPUT (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN0)
#define GPIO_GPIO3_INPUT (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN1)
#define GPIO_GPIO4_INPUT (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN10)
#define GPIO_GPIO5_INPUT (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN11)
#define GPIO_GPIO0_OUTPUT (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTA|GPIO_PIN6)
#define GPIO_GPIO1_OUTPUT (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTA|GPIO_PIN7)
#define GPIO_GPIO2_OUTPUT (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN0)
#define GPIO_GPIO3_OUTPUT (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN1)
#define GPIO_GPIO4_OUTPUT (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN10)
#define GPIO_GPIO5_OUTPUT (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN11)
/* /*
* Tone alarm output * Tone alarm output
@ -230,13 +216,6 @@
#define BOARD_HAS_PWM DIRECT_PWM_OUTPUT_CHANNELS #define BOARD_HAS_PWM DIRECT_PWM_OUTPUT_CHANNELS
#define BOARD_FMU_GPIO_TAB { \
{GPIO_GPIO0_INPUT, GPIO_GPIO0_OUTPUT, 0}, \
{GPIO_GPIO1_INPUT, GPIO_GPIO1_OUTPUT, 0}, \
{GPIO_GPIO2_INPUT, GPIO_GPIO2_OUTPUT, 0}, \
{GPIO_GPIO3_INPUT, GPIO_GPIO3_OUTPUT, 0}, \
{GPIO_GPIO4_INPUT, GPIO_GPIO4_OUTPUT, 0}, \
{GPIO_GPIO5_INPUT, GPIO_GPIO5_OUTPUT, 0}, }
/* This board provides a DMA pool and APIs */ /* This board provides a DMA pool and APIs */

21
src/drivers/drv_gpio.h
View File

@ -50,24 +50,6 @@
#define PX4FMU_DEVICE_PATH "/dev/px4fmu" #define PX4FMU_DEVICE_PATH "/dev/px4fmu"
#define PX4IO_DEVICE_PATH "/dev/px4io" #define PX4IO_DEVICE_PATH "/dev/px4io"
#ifdef CONFIG_ARCH_BOARD_TAP_V1
/*
* PX4FMUv3 GPIO numbers.
*
* There are no alternate functions on this board.
*/
# define GPIO_SERVO_1 (1<<0) /**< servo 1 output */
# define GPIO_SERVO_2 (1<<1) /**< servo 2 output */
# define GPIO_SERVO_3 (1<<2) /**< servo 3 output */
# define GPIO_SERVO_4 (1<<3) /**< servo 4 output */
/**
* Device paths for things that support the GPIO ioctl protocol.
*/
# define PX4FMU_DEVICE_PATH "/dev/px4fmu"
#endif
#ifdef CONFIG_ARCH_BOARD_AEROFC_V1 #ifdef CONFIG_ARCH_BOARD_AEROFC_V1
# define PX4FMU_DEVICE_PATH "/dev/px4fmu" # define PX4FMU_DEVICE_PATH "/dev/px4fmu"
#endif #endif
@ -99,8 +81,7 @@
!defined(CONFIG_ARCH_BOARD_PX4_STM32F4DISCOVERY) && \ !defined(CONFIG_ARCH_BOARD_PX4_STM32F4DISCOVERY) && \
!defined(CONFIG_ARCH_BOARD_PX4IO_V1) && \ !defined(CONFIG_ARCH_BOARD_PX4IO_V1) && \
!defined(CONFIG_ARCH_BOARD_PX4IO_V2) && \ !defined(CONFIG_ARCH_BOARD_PX4IO_V2) && \
!defined(CONFIG_ARCH_BOARD_SITL) && \ !defined(CONFIG_ARCH_BOARD_SITL)
!defined(CONFIG_ARCH_BOARD_TAP_V1)
# error No CONFIG_ARCH_BOARD_xxxx set # error No CONFIG_ARCH_BOARD_xxxx set
#endif #endif
/* /*