From b0f4494c4a9fe3d8279c299c2efe594ed21f071e Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 21 Feb 2019 21:31:49 +1100 Subject: [PATCH] HAL_ChibiOS: fixed DMA on SPI for Pixhawk4Pro --- libraries/AP_HAL_ChibiOS/hwdef/Pixhawk4Pro/hwdef.dat | 4 ++-- libraries/AP_HAL_ChibiOS/hwdef/common/stm32h7_mcuconf.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk4Pro/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk4Pro/hwdef.dat index a968beea82..ee93ebddae 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk4Pro/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk4Pro/hwdef.dat @@ -163,7 +163,7 @@ PD0 UART4_RX UART4 NODMA PD1 UART4_TX UART4 NODMA # USART6 is telem3 -PG9 USART6_RX USART6 +PG9 USART6_RX USART6 NODMA # we leave PG14 as an input to prevent it acting as a pullup # on the IOMCU SBUS input # PG14 USART6_TX USART6 @@ -343,5 +343,5 @@ define HAL_BATT_CURR_SCALE 36.364 # there is an issue with DMA on SPI which needs to be solved # before we enable it -define HAL_SPI_USE_POLLED +#define HAL_SPI_USE_POLLED diff --git a/libraries/AP_HAL_ChibiOS/hwdef/common/stm32h7_mcuconf.h b/libraries/AP_HAL_ChibiOS/hwdef/common/stm32h7_mcuconf.h index 9f68b3d242..6f21206f3a 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/common/stm32h7_mcuconf.h +++ b/libraries/AP_HAL_ChibiOS/hwdef/common/stm32h7_mcuconf.h @@ -159,10 +159,10 @@ #define STM32_RTCSEL STM32_RTCSEL_NOCLK #define STM32_D1CPRE STM32_D1CPRE_DIV1 #define STM32_D1HPRE STM32_D1HPRE_DIV4 -#define STM32_D1PPRE3 STM32_D1PPRE3_DIV2 -#define STM32_D2PPRE1 STM32_D2PPRE1_DIV2 -#define STM32_D2PPRE2 STM32_D2PPRE2_DIV2 -#define STM32_D3PPRE4 STM32_D3PPRE4_DIV2 +#define STM32_D1PPRE3 STM32_D1PPRE3_DIV1 +#define STM32_D2PPRE1 STM32_D2PPRE1_DIV1 +#define STM32_D2PPRE2 STM32_D2PPRE2_DIV1 +#define STM32_D3PPRE4 STM32_D3PPRE4_DIV1 /* * Peripherals clocks static settings.