fix(h7): various build fixes (#5283)

Co-authored-by: raphaelcoeffic <1050031+raphaelcoeffic@users.noreply.github.com>
This commit is contained in:
Raphael Coeffic
2024-07-11 11:28:49 +02:00
committed by GitHub
co-authored by raphaelcoeffic
parent 170bdebcc4
commit c7bc9f01c9
8 changed files with 42 additions and 12 deletions
@@ -112,6 +112,7 @@ bool is_trainer_dsc_connected()
void trainer_init_module_cppm() void trainer_init_module_cppm()
{ {
#if defined(HARDWARE_EXTERNAL_MODULE)
auto port = modulePortFind(EXTERNAL_MODULE, ETX_MOD_TYPE_TIMER, auto port = modulePortFind(EXTERNAL_MODULE, ETX_MOD_TYPE_TIMER,
ETX_MOD_PORT_TIMER, ETX_Pol_Normal, ETX_MOD_PORT_TIMER, ETX_Pol_Normal,
ETX_MOD_DIR_RX); ETX_MOD_DIR_RX);
@@ -122,12 +123,15 @@ void trainer_init_module_cppm()
modulePortSetPower(EXTERNAL_MODULE,true); modulePortSetPower(EXTERNAL_MODULE,true);
trainer_init_capture(tim); trainer_init_capture(tim);
#endif
} }
void trainer_stop_module_cppm() void trainer_stop_module_cppm()
{ {
#if defined(HARDWARE_EXTERNAL_MODULE)
trainer_stop(); trainer_stop();
modulePortSetPower(EXTERNAL_MODULE,false); modulePortSetPower(EXTERNAL_MODULE,false);
#endif
} }
#if defined(TRAINER_TIMER_IRQHandler) #if defined(TRAINER_TIMER_IRQHandler)
+1 -1
View File
@@ -969,7 +969,7 @@ int cliSet(const char **argv)
return -1; return -1;
} }
} }
#if !defined(SOFTWARE_VOLUME) #if !defined(SOFTWARE_VOLUME) && defined(AUDIO)
else if (!strcmp(argv[1], "volume")) { else if (!strcmp(argv[1], "volume")) {
int level = 0; int level = 0;
if (toInt(argv, 2, &level) > 0) { if (toInt(argv, 2, &level) > 0) {
@@ -44,6 +44,13 @@ enum PaddingSize {
// Macros for setting up layout values // Macros for setting up layout values
// LAYOUT_VAL - 2 values - landscape, portrait // LAYOUT_VAL - 2 values - landscape, portrait
#if !defined(LANDSCAPE_LCD)
# error "LANDSCAPE_LCD must be defined"
#endif
#if !defined(PORTRAIT_LCD)
# error "PORTRAIT_LCD must be defined"
#endif
#if LANDSCAPE_LCD #if LANDSCAPE_LCD
#define LAYOUT_VAL(name, landscape, portrait) \ #define LAYOUT_VAL(name, landscape, portrait) \
@@ -241,7 +241,7 @@ static DSTATUS sdio_initialize(BYTE lun)
sdio.Init.ClockEdge = SD_SDIO_CLOCK_EDGE_RISING; sdio.Init.ClockEdge = SD_SDIO_CLOCK_EDGE_RISING;
sdio.Init.ClockPowerSave = SD_SDIO_CLOCK_POWER_SAVE_DISABLE; sdio.Init.ClockPowerSave = SD_SDIO_CLOCK_POWER_SAVE_DISABLE;
sdio.Init.BusWide = SD_SDIO_BUS_WIDE_1B; sdio.Init.BusWide = SD_SDIO_BUS_WIDE_1B;
sdio.Init.HardwareFlowControl = SDIO_HARDWARE_FLOW_CONTROL_DISABLE; sdio.Init.HardwareFlowControl = SD_SDIO_HARDWARE_FLOW_CONTROL_DISABLE;
#if ( USE_SD_TRANSCEIVER > 0U ) #if ( USE_SD_TRANSCEIVER > 0U )
sdio.Init.TranceiverPresent = SDMMC_TRANSCEIVER_PRESENT; sdio.Init.TranceiverPresent = SDMMC_TRANSCEIVER_PRESENT;
#endif #endif
@@ -60,7 +60,13 @@ void rtcGetTime(struct gtm * t)
void rtcInit() void rtcInit()
{ {
rtc.Instance = RTC; rtc.Instance = RTC;
#if !defined(STM32H7) && !defined(STM32H7RS)
// Power management peripheral is active by default at startup level in
// STM32h7xx lines.
__HAL_RCC_PWR_CLK_ENABLE(); __HAL_RCC_PWR_CLK_ENABLE();
#endif
HAL_PWR_EnableBkUpAccess(); HAL_PWR_EnableBkUpAccess();
// Enable LSE Oscillator // Enable LSE Oscillator
@@ -399,13 +399,20 @@ void stm32_usart_send_buffer(const stm32_usart_t* usart, const uint8_t * data, u
LL_DMA_StructInit(&dmaInit); LL_DMA_StructInit(&dmaInit);
#if !defined(STM32H7RS) #if !defined(STM32H7RS)
#if defined(STM32H7)
dmaInit.PeriphRequest = usart->txDMA_Channel;
#else
dmaInit.Channel = usart->txDMA_Channel; dmaInit.Channel = usart->txDMA_Channel;
#endif
#if defined(LL_USART_DMA_REG_DATA_RECEIVE) #if defined(LL_USART_DMA_REG_DATA_RECEIVE)
dmaInit.PeriphOrM2MSrcAddress = dmaInit.PeriphOrM2MSrcAddress =
LL_USART_DMA_GetRegAddr(usart->USARTx, LL_USART_DMA_REG_DATA_RECEIVE); LL_USART_DMA_GetRegAddr(usart->USARTx, LL_USART_DMA_REG_DATA_RECEIVE);
#else #else
dmaInit.PeriphOrM2MSrcAddress = LL_USART_DMA_GetRegAddr(usart->USARTx); dmaInit.PeriphOrM2MSrcAddress = LL_USART_DMA_GetRegAddr(usart->USARTx);
#endif #endif
dmaInit.Direction = LL_DMA_DIRECTION_MEMORY_TO_PERIPH; dmaInit.Direction = LL_DMA_DIRECTION_MEMORY_TO_PERIPH;
dmaInit.MemoryOrM2MDstAddress = (uint32_t)data; dmaInit.MemoryOrM2MDstAddress = (uint32_t)data;
dmaInit.MemoryOrM2MDstIncMode = LL_DMA_MEMORY_INCREMENT; dmaInit.MemoryOrM2MDstIncMode = LL_DMA_MEMORY_INCREMENT;
@@ -418,7 +425,7 @@ void stm32_usart_send_buffer(const stm32_usart_t* usart, const uint8_t * data, u
LL_DMA_EnableIT_TC(usart->txDMA, usart->txDMA_Stream); LL_DMA_EnableIT_TC(usart->txDMA, usart->txDMA_Stream);
} }
LL_DMA_EnableStream(usart->txDMA, usart->txDMA_Stream); LL_DMA_EnableStream(usart->txDMA, usart->txDMA_Stream);
#endif #endif // !STM32H7RS
return; return;
} else { } else {
@@ -102,8 +102,21 @@ void usbInit()
gpio_init(USB_GPIO_VBUS, GPIO_IN, GPIO_PIN_SPEED_LOW); gpio_init(USB_GPIO_VBUS, GPIO_IN, GPIO_PIN_SPEED_LOW);
#endif #endif
#if defined(LL_APB2_GRP1_PERIPH_SYSCFG)
LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_SYSCFG); LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_SYSCFG);
#elif defined(LL_APB4_GRP1_PERIPH_SYSCFG)
LL_APB4_GRP1_EnableClock(LL_APB4_GRP1_PERIPH_SYSCFG);
#else
#error "Unable to enable SYSCFG peripheral clock"
#endif
#if defined(LL_AHB2_GRP1_PERIPH_OTGFS)
LL_AHB2_GRP1_EnableClock(LL_AHB2_GRP1_PERIPH_OTGFS); LL_AHB2_GRP1_EnableClock(LL_AHB2_GRP1_PERIPH_OTGFS);
#elif defined(LL_AHB1_GRP1_PERIPH_USB2OTGHS)
LL_AHB1_GRP1_EnableClock(LL_AHB1_GRP1_PERIPH_USB2OTGHS);
#else
#error "Unable to enable USB peripheral clock"
#endif
usbDriverStarted = false; usbDriverStarted = false;
} }
@@ -136,14 +136,7 @@ USBD_StorageTypeDef USBD_Storage_Interface_fops_FS =
int8_t STORAGE_Init_FS(uint8_t lun) int8_t STORAGE_Init_FS(uint8_t lun)
{ {
NVIC_SetPriority(SDIO_IRQn, 0); // TODO: call generic storage init
NVIC_EnableIRQ(SDIO_IRQn);
/* TODO if no SD ... if( SD_Init() != 0)
{
return (-1);
}
*/
return (USBD_OK); return (USBD_OK);
} }