diff --git a/src/main/drivers/accgyro_mpu.c b/src/main/drivers/accgyro_mpu.c index 51cdcc7dc..f5cd4a2d0 100644 --- a/src/main/drivers/accgyro_mpu.c +++ b/src/main/drivers/accgyro_mpu.c @@ -259,7 +259,7 @@ void mpuIntExtiInit(void) #if defined (STM32F7) IOInit(mpuIntIO, OWNER_MPU, RESOURCE_EXTI, 0); EXTIHandlerInit(&mpuIntCallbackRec, mpuIntExtiHandler); - EXTIConfig(mpuIntIO, &mpuIntCallbackRec, NVIC_PRIO_MPU_INT_EXTI, IO_CONFIG(GPIO_MODE_IT_RISING,0,GPIO_NOPULL)); // TODO - maybe pullup / pulldown ? + EXTIConfig(mpuIntIO, &mpuIntCallbackRec, NVIC_PRIO_MPU_INT_EXTI, IO_CONFIG(GPIO_MODE_INPUT,0,GPIO_NOPULL)); // TODO - maybe pullup / pulldown ? #else IOInit(mpuIntIO, OWNER_MPU, RESOURCE_EXTI, 0); diff --git a/src/main/drivers/bus_i2c_hal.c b/src/main/drivers/bus_i2c_hal.c index 6667f5c40..701128d4d 100644 --- a/src/main/drivers/bus_i2c_hal.c +++ b/src/main/drivers/bus_i2c_hal.c @@ -34,8 +34,6 @@ #define CLOCKSPEED 800000 // i2c clockspeed 400kHz default (conform specs), 800kHz and 1200kHz (Betaflight default) -static void i2c_er_handler(I2CDevice device); -static void i2c_ev_handler(I2CDevice device); static void i2cUnstick(IO_t scl, IO_t sda); #define IOCFG_I2C IOCFG_AF_OD @@ -132,6 +130,7 @@ void i2cSetOverclock(uint8_t OverClock) { static bool i2cHandleHardwareFailure(I2CDevice device) { + (void)device; i2cErrorCount++; // reinit peripheral + clock out garbage //i2cInit(device); @@ -203,7 +202,7 @@ void i2cInit(I2CDevice device) i2cDevice_t *i2c; i2c = &(i2cHardwareMap[device]); - I2C_InitTypeDef i2cInit; + //I2C_InitTypeDef i2cInit; IO_t scl = IOGetByTag(i2c->scl); IO_t sda = IOGetByTag(i2c->sda); diff --git a/src/main/drivers/exti.c b/src/main/drivers/exti.c index a43d78da9..bc783cc45 100644 --- a/src/main/drivers/exti.c +++ b/src/main/drivers/exti.c @@ -69,6 +69,7 @@ void EXTIHandlerInit(extiCallbackRec_t *self, extiHandlerCallback *fn) #if defined(STM32F7) void EXTIConfig(IO_t io, extiCallbackRec_t *cb, int irqPriority, ioConfig_t config) { + (void)config; int chIdx; chIdx = IO_GPIOPinIdx(io); if(chIdx < 0) @@ -85,7 +86,7 @@ void EXTIConfig(IO_t io, extiCallbackRec_t *cb, int irqPriority, ioConfig_t conf HAL_GPIO_Init(IO_GPIO(io), &init); rec->handler = cb; - uint32_t extiLine = IO_EXTI_Line(io); + //uint32_t extiLine = IO_EXTI_Line(io); //EXTI_ClearITPendingBit(extiLine); @@ -164,6 +165,8 @@ void EXTIEnable(IO_t io, bool enable) else EXTI->IMR &= ~extiLine; #elif defined(STM32F7) + (void)io; + (void)enable; #elif defined(STM32F303xC) int extiLine = IO_EXTI_Line(io); if(extiLine < 0) @@ -203,7 +206,7 @@ void EXTI_IRQHandler(void) _EXTI_IRQ_HANDLER(EXTI0_IRQHandler); _EXTI_IRQ_HANDLER(EXTI1_IRQHandler); -#if defined(STM32F1) +#if defined(STM32F1) || defined(STM32F7) _EXTI_IRQ_HANDLER(EXTI2_IRQHandler); #elif defined(STM32F3) || defined(STM32F4) _EXTI_IRQ_HANDLER(EXTI2_TS_IRQHandler); diff --git a/src/main/drivers/gpio_stm32f7xx.c b/src/main/drivers/gpio_stm32f7xx.c index 91062e4e6..e6a18ba1f 100644 --- a/src/main/drivers/gpio_stm32f7xx.c +++ b/src/main/drivers/gpio_stm32f7xx.c @@ -65,5 +65,7 @@ void gpioInit(GPIO_TypeDef *gpio, gpio_config_t *config) void gpioExtiLineConfig(uint8_t portsrc, uint8_t pinsrc) { + (void)portsrc; + (void)pinsrc; //SYSCFG_EXTILineConfig(portsrc, pinsrc); } diff --git a/src/main/drivers/io.c b/src/main/drivers/io.c index 71dde30d4..5104e5cf7 100644 --- a/src/main/drivers/io.c +++ b/src/main/drivers/io.c @@ -214,6 +214,7 @@ void IOToggle(IO_t io) // high in the mask value rather than all pins. XORing ODR directly risks // setting other pins incorrectly because it change all pins' state. #if defined(USE_HAL_DRIVER) + (void)mask; HAL_GPIO_TogglePin(IO_GPIO(io),IO_Pin(io)); #elif defined(STM32F4) if (IO_GPIO(io)->ODR & mask) { diff --git a/src/main/drivers/rcc.c b/src/main/drivers/rcc.c index 4e23d093e..7047a0181 100644 --- a/src/main/drivers/rcc.c +++ b/src/main/drivers/rcc.c @@ -7,6 +7,9 @@ void RCC_ClockCmd(rccPeriphTag_t periphTag, FunctionalState NewState) int tag = periphTag >> 5; uint32_t mask = 1 << (periphTag & 0x1f); #if defined(USE_HAL_DRIVER) + (void)tag; + (void)mask; + (void)NewState; #else switch (tag) { #if defined(STM32F3) || defined(STM32F1) @@ -34,6 +37,9 @@ void RCC_ResetCmd(rccPeriphTag_t periphTag, FunctionalState NewState) int tag = periphTag >> 5; uint32_t mask = 1 << (periphTag & 0x1f); #if defined(USE_HAL_DRIVER) + (void)tag; + (void)mask; + (void)NewState; #else switch (tag) { #if defined(STM32F3) || defined(STM32F10X_CL) diff --git a/src/main/drivers/serial_uart_hal.c b/src/main/drivers/serial_uart_hal.c index 155f98025..6a0d32c65 100644 --- a/src/main/drivers/serial_uart_hal.c +++ b/src/main/drivers/serial_uart_hal.c @@ -57,7 +57,7 @@ static void usartConfigurePinInversion(uartPort_t *uartPort) { static void uartReconfigure(uartPort_t *uartPort) { - HAL_StatusTypeDef status; + HAL_StatusTypeDef status = HAL_ERROR; /*RCC_PeriphCLKInitTypeDef RCC_PeriphClkInit; RCC_PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USART1|RCC_PERIPHCLK_USART2|RCC_PERIPHCLK_USART3| RCC_PERIPHCLK_UART4|RCC_PERIPHCLK_UART5|RCC_PERIPHCLK_USART6|RCC_PERIPHCLK_UART7|RCC_PERIPHCLK_UART8; @@ -176,7 +176,7 @@ serialPort_t *uartOpen(USART_TypeDef *USARTx, serialReceiveCallbackPtr callback, /* Associate the initialized DMA handle to the UART handle */ __HAL_LINKDMA(&s->Handle, hdmarx, s->rxDMAHandle); - HAL_UART_Receive_DMA(&s->Handle, (uint32_t)s->port.rxBuffer, s->port.rxBufferSize); + HAL_UART_Receive_DMA(&s->Handle, (uint8_t*)s->port.rxBuffer, s->port.rxBufferSize); s->rxDMAPos = __HAL_DMA_GET_COUNTER(&s->rxDMAHandle); @@ -185,7 +185,7 @@ serialPort_t *uartOpen(USART_TypeDef *USARTx, serialReceiveCallbackPtr callback, { // __HAL_UART_CLEAR_IT(&cfg.uartport->Handle, UART_FLAG_RXNE); // __HAL_UART_ENABLE_IT(&cfg.uartport->Handle, UART_IT_RXNE); - HAL_UART_Receive_IT(&s->Handle, (uint32_t)s->port.rxBuffer, s->port.rxBufferSize); + HAL_UART_Receive_IT(&s->Handle, (uint8_t*)s->port.rxBuffer, s->port.rxBufferSize); } } diff --git a/src/main/drivers/system_stm32f7xx.c b/src/main/drivers/system_stm32f7xx.c index 311caa1cf..b19bbbdab 100644 --- a/src/main/drivers/system_stm32f7xx.c +++ b/src/main/drivers/system_stm32f7xx.c @@ -170,7 +170,7 @@ void systemInit(void) cachedRccCsrValue = RCC->CSR; /* Accounts for OP Bootloader, set the Vector Table base address as specified in .ld file */ - extern void *isr_vector_table_base; + //extern void *isr_vector_table_base; //NVIC_SetVectorTable((uint32_t)&isr_vector_table_base, 0x0); //__HAL_RCC_USB_OTG_FS_CLK_DISABLE; diff --git a/src/main/drivers/timer.h b/src/main/drivers/timer.h index 007d4d325..d3bec2e7c 100644 --- a/src/main/drivers/timer.h +++ b/src/main/drivers/timer.h @@ -169,4 +169,8 @@ void configTimeBase(TIM_TypeDef *tim, uint16_t period, uint8_t mhz); // TODO - rccPeriphTag_t timerRCC(TIM_TypeDef *tim); -const timerHardware_t *timerGetByTag(ioTag_t tag, timerFlag_e flag); \ No newline at end of file +const timerHardware_t *timerGetByTag(ioTag_t tag, timerFlag_e flag); + +#if defined(USE_HAL_DRIVER) +TIM_HandleTypeDef* timerFindTimerHandle(TIM_TypeDef *tim); +#endif diff --git a/src/main/vcp_hal/usbd_desc.c b/src/main/vcp_hal/usbd_desc.c index 0987b4942..d79eba51e 100644 --- a/src/main/vcp_hal/usbd_desc.c +++ b/src/main/vcp_hal/usbd_desc.c @@ -146,6 +146,7 @@ static void Get_SerialNum(void); */ uint8_t *USBD_VCP_DeviceDescriptor(USBD_SpeedTypeDef speed, uint16_t *length) { + (void)speed; *length = sizeof(USBD_DeviceDesc); return (uint8_t*)USBD_DeviceDesc; } @@ -158,6 +159,7 @@ uint8_t *USBD_VCP_DeviceDescriptor(USBD_SpeedTypeDef speed, uint16_t *length) */ uint8_t *USBD_VCP_LangIDStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length) { + (void)speed; *length = sizeof(USBD_LangIDDesc); return (uint8_t*)USBD_LangIDDesc; } @@ -189,6 +191,7 @@ uint8_t *USBD_VCP_ProductStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length */ uint8_t *USBD_VCP_ManufacturerStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length) { + (void)speed; USBD_GetString((uint8_t *)USBD_MANUFACTURER_STRING, USBD_StrDesc, length); return USBD_StrDesc; } @@ -201,6 +204,7 @@ uint8_t *USBD_VCP_ManufacturerStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *l */ uint8_t *USBD_VCP_SerialStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length) { + (void)speed; *length = USB_SIZ_STRING_SERIAL; /* Update the serial number string descriptor with the data from the unique ID*/