Browse Source

boards: cuav can-gps-v1 add safety button and LED

release/1.12
Daniel Agar 4 years ago
parent
commit
58909b208d
  1. 9
      boards/cuav/can-gps-v1/default.cmake
  2. 26
      boards/cuav/can-gps-v1/nuttx-config/include/board.h
  3. 2
      boards/cuav/can-gps-v1/src/board_config.h
  4. 3
      boards/cuav/can-gps-v1/src/init.c

9
boards/cuav/can-gps-v1/default.cmake

@ -30,13 +30,12 @@ px4_add_board(
SERIAL_PORTS SERIAL_PORTS
GPS1:/dev/ttyS1 GPS1:/dev/ttyS1
DRIVERS DRIVERS
#adc
barometer/ms5611 barometer/ms5611
bootloaders bootloaders
gps gps
magnetometer/rm3100 magnetometer/rm3100
#safety_button safety_button
#tone_alarm tone_alarm
uavcannode uavcannode
MODULES MODULES
#ekf2 #ekf2
@ -50,7 +49,7 @@ px4_add_board(
#esc_calib #esc_calib
#hardfault_log #hardfault_log
#i2cdetect #i2cdetect
#led_control led_control
#mft #mft
#mixer #mixer
#motor_ramp #motor_ramp
@ -65,7 +64,7 @@ px4_add_board(
#shutdown #shutdown
top top
topic_listener topic_listener
#tune_control tune_control
ver ver
work_queue work_queue
) )

26
boards/cuav/can-gps-v1/nuttx-config/include/board.h

@ -128,40 +128,22 @@
/* Alternate function pin selections ************************************************/ /* Alternate function pin selections ************************************************/
/* /* UARTs */
* UARTs.
*/
#define GPIO_USART1_RX GPIO_USART1_RX_2 #define GPIO_USART1_RX GPIO_USART1_RX_2
#define GPIO_USART1_TX GPIO_USART1_TX_2 #define GPIO_USART1_TX GPIO_USART1_TX_2
#define GPIO_USART2_RX GPIO_USART2_RX_1 #define GPIO_USART2_RX GPIO_USART2_RX_1
#define GPIO_USART2_TX GPIO_USART2_TX_1 #define GPIO_USART2_TX GPIO_USART2_TX_1
/* /* CAN */
* CAN
*
* CAN1 is routed to the onboard transceiver.
*/
#define GPIO_CAN1_RX GPIO_CAN1_RX_2 #define GPIO_CAN1_RX GPIO_CAN1_RX_2
#define GPIO_CAN1_TX GPIO_CAN1_TX_2 #define GPIO_CAN1_TX GPIO_CAN1_TX_2
/* /* I2C */
* I2C
*
* The optional _GPIO configurations allow the I2C driver to manually
* reset the bus to clear stuck slaves. They match the pin configuration,
* but are normally-high GPIOs.
*/
#define GPIO_I2C3_SCL GPIO_I2C3_SCL_2 #define GPIO_I2C3_SCL GPIO_I2C3_SCL_2
#define GPIO_I2C3_SDA GPIO_I2C3_SDA_2 #define GPIO_I2C3_SDA GPIO_I2C3_SDA_2
#define GPIO_I2C3_SCL_GPIO (GPIO_OUTPUT|GPIO_OPENDRAIN|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTA|GPIO_PIN8)
#define GPIO_I2C3_SDA_GPIO (GPIO_OUTPUT|GPIO_OPENDRAIN|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTB|GPIO_PIN4)
/* /* SPI */
* SPI
*
* There are sensors on SPI1, and SPI2 is connected to the FRAM.
*/
#define GPIO_SPI1_MISO (GPIO_SPI1_MISO_1|GPIO_SPEED_50MHz) #define GPIO_SPI1_MISO (GPIO_SPI1_MISO_1|GPIO_SPEED_50MHz)
#define GPIO_SPI1_MOSI (GPIO_SPI1_MOSI_1|GPIO_SPEED_50MHz) #define GPIO_SPI1_MOSI (GPIO_SPI1_MOSI_1|GPIO_SPEED_50MHz)
#define GPIO_SPI1_SCK (GPIO_SPI1_SCK_1|GPIO_SPEED_50MHz) #define GPIO_SPI1_SCK (GPIO_SPI1_SCK_1|GPIO_SPEED_50MHz)

2
boards/cuav/can-gps-v1/src/board_config.h

@ -57,6 +57,8 @@
*/ */
#define GPIO_CAN1_SILENT_S0 /* PB5 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN5) #define GPIO_CAN1_SILENT_S0 /* PB5 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN5)
#define GPIO_LED_SAFETY (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTB|GPIO_PIN1)
#define GPIO_BTN_SAFETY (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN3)
/* Tone alarm output. */ /* Tone alarm output. */
#define TONE_ALARM_TIMER 2 /* timer 2 */ #define TONE_ALARM_TIMER 2 /* timer 2 */

3
boards/cuav/can-gps-v1/src/init.c

@ -90,6 +90,9 @@ stm32_boardinitialize(void)
stm32_configgpio(GPIO_CAN1_SILENT_S0); stm32_configgpio(GPIO_CAN1_SILENT_S0);
stm32_configgpio(GPIO_LED_SAFETY);
stm32_configgpio(GPIO_BTN_SAFETY);
// Configure SPI all interfaces GPIO & enable power. // Configure SPI all interfaces GPIO & enable power.
stm32_spiinitialize(); stm32_spiinitialize();
} }

Loading…
Cancel
Save