fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-25 01:23:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

mRo ctrl zero updates

Browse Source 
- add ICM20602 and ICM20648 data ready interrupts
 - enable Bosch BMI088 IMU
 - move HRT_TIMER to TIM3 (same timer as PPM channel)
This commit is contained in:
Daniel Agar
2019-12-01 17:43:15 -05:00
parent a859a6b57c
commit fd72e5e795
6 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/mro/ctrl-zero-f7/src/board_config.h
+5 -5
View File
@@ -81,6 +81,10 @@
#define GPIO_SPI1_CS1_ICM20602 /* PC2 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTC|GPIO_PIN2)
#define GPIO_SPI1_CS2_ICM20948 /* PE15 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTE|GPIO_PIN15)
/* Define the SPI1 Data Ready interrupts */
#define GPIO_SPI1_DRDY1_ICM20602 /* PD15 */ (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTD|GPIO_PIN15)
#define GPIO_SPI1_DRDY2_ICM20948 /* PE12 */ (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTE|GPIO_PIN12)
/* SPI 2 CS */
#define GPIO_SPI2_CS1_FRAM /* PD10 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTD|GPIO_PIN10)
#define GPIO_SPI2_CS2_BARO /* PD7 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTD|GPIO_PIN7)
@@ -253,7 +257,7 @@
#define GPIO_OTGFS_VBUS /* PA9 */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_SPEED_100MHz|GPIO_PORTA|GPIO_PIN9)
/* High-resolution timer */
#define HRT_TIMER 8 /* use timer8 for the HRT */
#define HRT_TIMER 3 /* use timer3 for the HRT */
#define HRT_TIMER_CHANNEL 3 /* use capture/compare channel 3 */
#define HRT_PPM_CHANNEL /* T3C2 */ 2 /* use capture/compare channel 1 */
@@ -328,10 +332,6 @@
GPIO_VDD_3V3_SPEKTRUM_POWER_EN, \
GPIO_TONE_ALARM_IDLE, \
GPIO_SAFETY_SWITCH_IN, \
GPIO_DRDY_BMI088_INT1_ACCEL, \
GPIO_DRDY_BMI088_INT2_ACCEL, \
GPIO_DRDY_BMI088_INT3_GYRO, \
GPIO_DRDY_BMI088_INT4_GYRO, \
}
#define BOARD_ENABLE_CONSOLE_BUFFER
boards/mro/ctrl-zero-f7/src/spi.cpp
+6
View File
@@ -203,6 +203,9 @@ __EXPORT void board_spi_reset(int ms)
stm32_configgpio(_PIN_OFF(GPIO_SPI1_SCK));
stm32_configgpio(_PIN_OFF(GPIO_SPI1_MISO));
stm32_configgpio(_PIN_OFF(GPIO_SPI1_MOSI));
stm32_configgpio(_PIN_OFF(GPIO_SPI1_DRDY1_ICM20602));
stm32_configgpio(_PIN_OFF(GPIO_SPI1_DRDY2_ICM20948));
// SPI5
for (auto cs : spi5selects_gpio) {
@@ -242,6 +245,9 @@ __EXPORT void board_spi_reset(int ms)
stm32_configgpio(GPIO_SPI1_SCK);
stm32_configgpio(GPIO_SPI1_MISO);
stm32_configgpio(GPIO_SPI1_MOSI);
stm32_configgpio(GPIO_SPI1_DRDY1_ICM20602);
stm32_configgpio(GPIO_SPI1_DRDY2_ICM20948);
// SPI5
for (auto cs : spi5selects_gpio) {