yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 01:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

boards: remove deprecated SPI + I2C defines from board_config.h

Browse Source 
chip-selects are deselected in stm32_spiinitialize()
This commit is contained in:
Beat Küng
2020-03-20 13:58:42 +01:00
committed by Daniel Agar
parent f4ab1b8a78
commit b156fe5787
41 changed files with 278 additions and 2071 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
boards/omnibus/f4sd/src/board_config.h
View File

@@ -108,93 +108,12 @@
//#define GPIO_GPIO4_OUTPUT _MK_GPIO_OUTPUT(GPIO_TIM5_CH2OUT)
//#define GPIO_GPIO5_OUTPUT _MK_GPIO_OUTPUT(GPIO_TIM1_CH1OUT)
/*----------------------------------------------------------*/
/* OMNIBUSF4SD SPI chip selects and DRDY */
/*----------------------------------------------------------*/
#include <drivers/drv_sensor.h>
/* SPI chip selects */
/*
* Define the Chip Selects for SPI1
*
* MPU6000: PA4
*
*/
#define GPIO_SPI_CS_MEMS (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTA|GPIO_PIN4)
/*
* Define the Chip Selects for SPI2
*
* SD Card: PB12
*
*/
#define GPIO_SPI_CS_SDCARD (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTB|GPIO_PIN12)
/*
* Define the Chip Selects for SPI3
*
* BMP280: PB3
* ABT7456: PA15
*
*/
#define GPIO_SPI3_CS_BARO (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTB|GPIO_PIN3)
#define GPIO_SPI3_CS_OSD (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTA|GPIO_PIN15)
/*
* Define the ability to shut off off the sensor signals
* by changing the signals to inputs
*/
#define _PIN_OFF(def) (((def) & (GPIO_PORT_MASK | GPIO_PIN_MASK)) | (GPIO_INPUT|GPIO_PULLDOWN|GPIO_SPEED_2MHz))
/* SPI 1 bus off */
#define GPIO_SPI1_SCK_OFF _PIN_OFF(GPIO_SPI1_SCK)
#define GPIO_SPI1_MISO_OFF _PIN_OFF(GPIO_SPI1_MISO)
#define GPIO_SPI1_MOSI_OFF _PIN_OFF(GPIO_SPI1_MOSI)
/* SPI 1 CS's off */
#define GPIO_SPI1_CS_MEMS_OFF _PIN_OFF(GPIO_SPI_CS_MEMS)
/* SPI 2 bus off */
#define GPIO_SPI2_SCK_OFF _PIN_OFF(GPIO_SPI2_SCK)
#define GPIO_SPI2_MISO_OFF _PIN_OFF(GPIO_SPI2_MISO)
#define GPIO_SPI2_MOSI_OFF _PIN_OFF(GPIO_SPI2_MOSI)
/* SPI 2 CS's off */
#define GPIO_SPI2_CS_SDCARD_OFF _PIN_OFF(GPIO_SPI_CS_SDCARD)
/* SPI 3 bus off */
#define GPIO_SPI3_SCK_OFF _PIN_OFF(GPIO_SPI3_SCK)
#define GPIO_SPI3_MISO_OFF _PIN_OFF(GPIO_SPI3_MISO)
#define GPIO_SPI3_MOSI_OFF _PIN_OFF(GPIO_SPI3_MOSI)
/* SPI 3 CS's off */
#define GPIO_SPI3_CS_BARO_OFF _PIN_OFF(GPIO_SPI3_CS_BARO)
#define GPIO_SPI3_CS_OSD_OFF _PIN_OFF(GPIO_SPI3_CS_OSD)
// One device per bus
#define PX4_SPI_BUS_SENSORS 1
#define PX4_SPIDEV_MPU PX4_MK_SPI_SEL(0, DRV_IMU_DEVTYPE_MPU6000)
#define PX4_SPIDEV_ICM_20602 PX4_MK_SPI_SEL(0, DRV_IMU_DEVTYPE_ICM20602)
#define PX4_SPIDEV_BARO_BUS 3
#define PX4_SPIDEV_BARO PX4_MK_SPI_SEL(0, DRV_BARO_DEVTYPE_BMP280)
#define PX4_SPIDEV_OSD PX4_MK_SPI_SEL(0, DRV_OSD_DEVTYPE_ATXXXX)
/* USB OTG FS
*
* PA9 OTG_FS_VBUS VBUS sensing
*/
#define GPIO_OTGFS_VBUS (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|GPIO_OPENDRAIN|GPIO_PORTC|GPIO_PIN5)
/*----------------------------------------------------------*/
/* End OMNIBUSF4SD SPI chip selects and DRDY */
/*----------------------------------------------------------*/
#define PX4_SPI_BUS_BARO 3
#define PX4_SPI_BUS_OSD 3
#define PX4_I2C_BUS_EXPANSION 2
#define PX4_I2C_BUS_LED PX4_I2C_BUS_EXPANSION
/* PWM
*
* Alternatively CH3/CH4 could be assigned to UART6_TX/RX

2
boards/omnibus/f4sd/src/init.c
View File

@@ -284,7 +284,6 @@ __EXPORT int board_app_initialize(uintptr_t arg)
SPI_SETFREQUENCY(spi1, 10000000);
SPI_SETBITS(spi1, 8);
SPI_SETMODE(spi1, SPIDEV_MODE3);
SPI_SELECT(spi1, PX4_SPIDEV_MPU, false);
up_udelay(20);
// SPI2: SDCard
@@ -327,7 +326,6 @@ __EXPORT int board_app_initialize(uintptr_t arg)
SPI_SETFREQUENCY(spi3, 10 * 1000 * 1000);
SPI_SETBITS(spi3, 8);
SPI_SETMODE(spi3, SPIDEV_MODE3);
SPI_SELECT(spi3, PX4_SPIDEV_BARO, false);
up_udelay(20);
#if defined(FLASH_BASED_PARAMS)