Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-26 01:17:51 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

boards: add new spi+i2c config

Browse Source 
Chip-select and SPI initialization uses the new config, whereas the drivers
still use the existing defines.

The configuration in board_config.h can be removed after all drivers are
updated.
This commit is contained in:
Beat Küng
2020-02-18 17:14:10 +01:00
committed by Daniel Agar
parent 06712450a7
commit 1851665fab
142 changed files with 2607 additions and 5655 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/common/CMakeLists.txt
+3 -3
View File
@@ -41,13 +41,13 @@ endif()
add_library(px4_platform
board_identity.c
#i2c.cpp
#i2c_spi_buses.cpp
i2c.cpp
i2c_spi_buses.cpp
module.cpp
px4_getopt.c
px4_cli.cpp
shutdown.cpp
#spi.cpp
spi.cpp
${SRCS}
)
add_dependencies(px4_platform prebuild_targets)
platforms/common/include/px4_platform_common/board_common.h
+50 -58
View File
@@ -101,27 +101,22 @@
/* I2C PX4 clock configuration
*
* A board may override BOARD_NUMBER_I2C_BUSES and BOARD_I2C_BUS_CLOCK_INIT
* simply by defining the #defines.
*
* If none are provided the default number of I2C busses will be taken from
* the px4 micro hal and the init will be from the legacy values of 100K.
* A board may override BOARD_I2C_BUS_CLOCK_INIT simply by defining the #defines.
*/
#if !defined(BOARD_NUMBER_I2C_BUSES)
# define BOARD_NUMBER_I2C_BUSES PX4_NUMBER_I2C_BUSES
#endif
#if !defined(BOARD_I2C_BUS_CLOCK_INIT)
# if (BOARD_NUMBER_I2C_BUSES) == 1
# define BOARD_I2C_BUS_CLOCK_INIT {100000}
# elif (BOARD_NUMBER_I2C_BUSES) == 2
# define BOARD_I2C_BUS_CLOCK_INIT {100000, 100000}
# elif (BOARD_NUMBER_I2C_BUSES) == 3
# define BOARD_I2C_BUS_CLOCK_INIT {100000, 100000, 100000}
# elif (BOARD_NUMBER_I2C_BUSES) == 4
# define BOARD_I2C_BUS_CLOCK_INIT {100000, 100000, 100000, 100000}
#if defined(BOARD_I2C_BUS_CLOCK_INIT)
# define PX4_I2C_BUS_CLOCK_INIT BOARD_I2C_BUS_CLOCK_INIT
#else
# if (PX4_NUMBER_I2C_BUSES) == 1
# define PX4_I2C_BUS_CLOCK_INIT {100000}
# elif (PX4_NUMBER_I2C_BUSES) == 2
# define PX4_I2C_BUS_CLOCK_INIT {100000, 100000}
# elif (PX4_NUMBER_I2C_BUSES) == 3
# define PX4_I2C_BUS_CLOCK_INIT {100000, 100000, 100000}
# elif (PX4_NUMBER_I2C_BUSES) == 4
# define PX4_I2C_BUS_CLOCK_INIT {100000, 100000, 100000, 100000}
# else
# error BOARD_NUMBER_I2C_BUSES not supported
# error PX4_NUMBER_I2C_BUSES not supported
# endif
#endif
@@ -1024,46 +1019,6 @@ int board_shutdown(void);
static inline int board_register_power_state_notification_cb(power_button_state_notification_t cb) { return 0; }
static inline int board_shutdown(void) { return -EINVAL; }
#endif
__END_DECLS
/************************************************************************************
* Name: px4_i2c_bus_external
*
************************************************************************************/
#if defined(BOARD_HAS_SIMPLE_HW_VERSIONING)
__EXPORT bool px4_i2c_bus_external(int bus);
#else
#ifdef PX4_I2C_BUS_ONBOARD
#define px4_i2c_bus_external(bus) (bus != PX4_I2C_BUS_ONBOARD)
#else
#define px4_i2c_bus_external(bus) true
#endif /* PX4_I2C_BUS_ONBOARD */
#endif /* BOARD_HAS_SIMPLE_HW_VERSIONING */
/************************************************************************************
* Name: px4_spi_bus_external
*
************************************************************************************/
#if defined(BOARD_HAS_SIMPLE_HW_VERSIONING)
__EXPORT bool px4_spi_bus_external(int bus);
#else
#ifdef PX4_SPI_BUS_EXT
#define px4_spi_bus_external(bus) (bus == PX4_SPI_BUS_EXT)
#else
#define px4_spi_bus_external(bus) false
#endif /* PX4_SPI_BUS_EXT */
#endif /* BOARD_HAS_SIMPLE_HW_VERSIONING */
/************************************************************************************
* Name: board_has_bus
@@ -1084,6 +1039,41 @@ __EXPORT bool board_has_bus(enum board_bus_types type, uint32_t bus);
# define board_has_bus(t, b) true
#endif /* BOARD_HAS_BUS_MANIFEST */
/************************************************************************************
* Name: board_spi_reset
*
* Description:
* Reset SPI buses and devices
*
* Input Parameters:
* ms - delay in msbetween powering off the devices and re-enabling power.
*
* bus_mask - bitmask to select buses - use 0xffff to select all.
*/
__EXPORT void board_spi_reset(int ms, int bus_mask);
/************************************************************************************
* Name: board_control_spi_sensors_power_configgpio
*
* Description:
* Initialize GPIO pins for all SPI bus power enable pins
*/
__EXPORT void board_control_spi_sensors_power_configgpio(void);
/************************************************************************************
* Name: board_control_spi_sensors_power
*
* Description:
* Control the power of SPI buses
*
* Input Parameters:
* enable_power - true to enable power, false to disable
*
* bus_mask - bitmask to select buses - use 0xffff to select all.
*/
__EXPORT void board_control_spi_sensors_power(bool enable_power, int bus_mask);
/************************************************************************************
* Name: board_hardfault_init
*
@@ -1108,3 +1098,5 @@ __EXPORT bool board_has_bus(enum board_bus_types type, uint32_t bus);
* 32000 resets.
*/
int board_hardfault_init(int display_to_console, bool allow_prompt);
__END_DECLS
platforms/common/include/px4_platform_common/spi.h
+1 -1
View File
@@ -69,7 +69,7 @@ struct px4_spi_bus_t {
struct px4_spi_bus_all_hw_t {
px4_spi_bus_t buses[SPI_BUS_MAX_BUS_ITEMS];
int board_hw_version; ///< 0=default, >0 for a specific revision (see board_get_hw_version)
int board_hw_version{-1}; ///< 0=default, >0 for a specific revision (see board_get_hw_version), -1=unused
};
#if BOARD_NUM_SPI_CFG_HW_VERSIONS > 1
platforms/nuttx/src/px4/stm/stm32_common/spi/spi.cpp
+1
View File
@@ -106,6 +106,7 @@ __EXPORT void stm32_spiinitialize()
{
px4_set_spi_buses_from_hw_version();
board_control_spi_sensors_power_configgpio();
board_control_spi_sensors_power(true, 0xffff);
for (int i = 0; i < SPI_BUS_MAX_BUS_ITEMS; ++i) {
switch (px4_spi_buses[i].bus) {