Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-13 03:20:00 +03:00
Code Issues Wiki Activity

Merge remote-tracking branch 'betaflight/master' into RP2350

Browse source
This commit is contained in:
blckmn 2025-06-07 09:45:21 +10:00
commit c517bc002b
86 changed files with 130 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/drivers/adc_impl.h
View file

@ -20,10 +20,14 @@
#pragma once #pragma once
#include "platform.h"
#include "drivers/adc.h" #include "drivers/adc.h"
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/io_types.h" #include "drivers/io_types.h"
#include "drivers/rcc_types.h"
#if PLATFORM_TRAIT_RCC
#include "platform/rcc_types.h"
#endif
#if defined(STM32F4) || defined(STM32F7) #if defined(STM32F4) || defined(STM32F7)
#define ADC_TAG_MAP_COUNT 16 #define ADC_TAG_MAP_COUNT 16
@ -73,8 +77,8 @@ typedef struct adcTagMap_s {
#define ADC_DEVICES_345 ((1 << ADCDEV_3)|(1 << ADCDEV_4)|(1 << ADCDEV_5)) #define ADC_DEVICES_345 ((1 << ADCDEV_3)|(1 << ADCDEV_4)|(1 << ADCDEV_5))
typedef struct adcDevice_s { typedef struct adcDevice_s {
#if !defined(SIMULATOR_BUILD)
ADC_TypeDef* ADCx; ADC_TypeDef* ADCx;
#if PLATFORM_TRAIT_RCC
rccPeriphTag_t rccADC; rccPeriphTag_t rccADC;
#endif #endif
#if !defined(USE_DMA_SPEC) #if !defined(USE_DMA_SPEC)

1
src/main/drivers/bus_i2c.h
View file

@ -23,7 +23,6 @@
#include "platform.h" #include "platform.h"
#include "drivers/io_types.h" #include "drivers/io_types.h"
#include "drivers/rcc_types.h"
#ifndef I2C_DEVICE #ifndef I2C_DEVICE
#define I2C_DEVICE I2CINVALID #define I2C_DEVICE I2CINVALID

5
src/main/drivers/bus_i2c_impl.h
View file

@ -23,7 +23,10 @@
#include "platform.h" #include "platform.h"
#include "drivers/io_types.h" #include "drivers/io_types.h"
#include "drivers/rcc_types.h"
#if PLATFORM_TRAIT_RCC
#include "platform/rcc_types.h"
#endif
#define I2C_TIMEOUT_US 10000 #define I2C_TIMEOUT_US 10000
#define I2C_TIMEOUT_SYS_TICKS (I2C_TIMEOUT_US / 1000) #define I2C_TIMEOUT_SYS_TICKS (I2C_TIMEOUT_US / 1000)

7
src/main/drivers/bus_quadspi.c
View file

@ -32,7 +32,10 @@
#include "drivers/bus_quadspi_impl.h" #include "drivers/bus_quadspi_impl.h"
#include "drivers/exti.h" #include "drivers/exti.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/rcc.h"
#if PLATFORM_TRAIT_RCC
#include "platform/rcc.h"
#endif
#include "pg/bus_quadspi.h" #include "pg/bus_quadspi.h"
@ -264,7 +267,9 @@ void quadSpiPinConfigure(const quadSpiConfig_t *pConfig)
if (haveResources) { if (haveResources) {
pDev->dev = hw->reg; pDev->dev = hw->reg;
#if PLATFORM_TRAIT_RCC
pDev->rcc = hw->rcc; pDev->rcc = hw->rcc;
#endif
} }
} }
} }

1
src/main/drivers/bus_quadspi.h
View file

@ -23,7 +23,6 @@
#pragma once #pragma once
#include "drivers/io_types.h" #include "drivers/io_types.h"
#include "drivers/rcc_types.h"
#include "pg/pg.h" #include "pg/pg.h"
#include "pg/pg_ids.h" #include "pg/pg_ids.h"

19
src/main/drivers/bus_quadspi_impl.h
View file

@ -22,17 +22,19 @@
#pragma once #pragma once
#include "platform.h"
#if PLATFORM_TRAIT_RCC
#include "platform/rcc_types.h"
#endif
typedef struct quadSpiPinDef_s { typedef struct quadSpiPinDef_s {
ioTag_t pin; ioTag_t pin;
#if defined(STM32H7) #if QUADSPI_TRAIT_AF_PIN
uint8_t af; uint8_t af;
#endif #endif
} quadSpiPinDef_t; } quadSpiPinDef_t;
#if defined(STM32H7)
#define MAX_QUADSPI_PIN_SEL 3
#endif
typedef struct quadSpiHardware_s { typedef struct quadSpiHardware_s {
QUADSPIDevice device; QUADSPIDevice device;
QUADSPI_TypeDef *reg; QUADSPI_TypeDef *reg;
@ -48,7 +50,9 @@ typedef struct quadSpiHardware_s {
quadSpiPinDef_t bk2IO3Pins[MAX_QUADSPI_PIN_SEL]; quadSpiPinDef_t bk2IO3Pins[MAX_QUADSPI_PIN_SEL];
quadSpiPinDef_t bk2CSPins[MAX_QUADSPI_PIN_SEL]; quadSpiPinDef_t bk2CSPins[MAX_QUADSPI_PIN_SEL];
#if PLATFORM_TRAIT_RCC
rccPeriphTag_t rcc; rccPeriphTag_t rcc;
#endif
} quadSpiHardware_t; } quadSpiHardware_t;
extern const quadSpiHardware_t quadSpiHardware[]; extern const quadSpiHardware_t quadSpiHardware[];
@ -78,9 +82,12 @@ typedef struct QUADSPIDevice_s {
uint8_t bk2IO3AF; uint8_t bk2IO3AF;
uint8_t bk2CSAF; uint8_t bk2CSAF;
#endif #endif
#if PLATFORM_TRAIT_RCC
rccPeriphTag_t rcc; rccPeriphTag_t rcc;
#endif
volatile uint16_t errorCount; volatile uint16_t errorCount;
#if defined(USE_HAL_DRIVER) #if QUADSPI_TRAIT_HANDLE
QSPI_HandleTypeDef hquadSpi; QSPI_HandleTypeDef hquadSpi;
#endif #endif
} quadSpiDevice_t; } quadSpiDevice_t;

11
src/main/drivers/bus_spi_impl.h
View file

@ -20,6 +20,12 @@
#pragma once #pragma once
#include "platform.h"
#if PLATFORM_TRAIT_RCC
#include "platform/rcc_types.h"
#endif
#define SPI_TIMEOUT_US 10000 #define SPI_TIMEOUT_US 10000
#define BUS_SPI_FREE 0x0 #define BUS_SPI_FREE 0x0
@ -40,9 +46,11 @@ typedef struct spiHardware_s {
#if SPI_TRAIT_AF_PORT #if SPI_TRAIT_AF_PORT
uint8_t af; uint8_t af;
#endif #endif
#if PLATFORM_TRAIT_RCC #if PLATFORM_TRAIT_RCC
rccPeriphTag_t rcc; rccPeriphTag_t rcc;
#endif #endif
#ifdef USE_DMA #ifdef USE_DMA
uint8_t dmaIrqHandler; uint8_t dmaIrqHandler;
#endif #endif
@ -59,7 +67,8 @@ typedef struct SPIDevice_s {
uint8_t sckAF; uint8_t sckAF;
uint8_t misoAF; uint8_t misoAF;
uint8_t mosiAF; uint8_t mosiAF;
#else #endif
#if SPI_TRAIT_AF_PORT
uint8_t af; uint8_t af;
#endif #endif
#if SPI_TRAIT_HANDLE #if SPI_TRAIT_HANDLE

1
src/main/drivers/io.c
View file

@ -22,7 +22,6 @@
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/io_impl.h" #include "drivers/io_impl.h"
#include "drivers/rcc.h"
#include "common/utils.h" #include "common/utils.h"

1
src/main/drivers/rangefinder/rangefinder_hcsr04.c
View file

@ -30,7 +30,6 @@
#include "drivers/exti.h" #include "drivers/exti.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h"
#include "drivers/time.h" #include "drivers/time.h"
#include "drivers/rangefinder/rangefinder.h" #include "drivers/rangefinder/rangefinder.h"

1
src/main/drivers/rx/rx_spi.c
View file

@ -35,7 +35,6 @@
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/io_impl.h" #include "drivers/io_impl.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h"
#include "drivers/system.h" #include "drivers/system.h"
#include "drivers/time.h" #include "drivers/time.h"

1
src/main/drivers/serial_uart.c
View file

@ -42,7 +42,6 @@
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/dma_reqmap.h" #include "drivers/dma_reqmap.h"
#include "drivers/rcc.h"
#include "drivers/serial.h" #include "drivers/serial.h"
#include "drivers/serial_impl.h" #include "drivers/serial_impl.h"
#include "drivers/serial_uart.h" #include "drivers/serial_uart.h"

4
src/main/drivers/serial_uart_impl.h
View file

@ -33,6 +33,10 @@
#include "platform.h" #include "platform.h"
#if PLATFORM_TRAIT_RCC
#include "platform/rcc_types.h"
#endif
#ifndef UART_RX_BUFFER_SIZE #ifndef UART_RX_BUFFER_SIZE
#define UART_RX_BUFFER_SIZE 256 #define UART_RX_BUFFER_SIZE 256
#endif #endif

1
src/main/drivers/serial_uart_pinconfig.c
View file

@ -36,7 +36,6 @@
#include "build/build_config.h" #include "build/build_config.h"
#include "drivers/rcc.h"
#include "drivers/serial.h" #include "drivers/serial.h"
#include "drivers/serial_uart.h" #include "drivers/serial_uart.h"
#include "drivers/serial_uart_impl.h" #include "drivers/serial_uart_impl.h"

10
src/main/drivers/timer.h
View file

@ -25,7 +25,11 @@
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/io_types.h" #include "drivers/io_types.h"
#include "drivers/rcc_types.h"
#if PLATFORM_TRAIT_RCC
#include "platform/rcc_types.h"
#endif
#include "drivers/resource.h" #include "drivers/resource.h"
#ifdef USE_TIMER #ifdef USE_TIMER
@ -69,7 +73,9 @@ typedef struct timerOvrHandlerRec_s {
typedef struct timerDef_s { typedef struct timerDef_s {
TIM_TypeDef *TIMx; TIM_TypeDef *TIMx;
#if PLATFORM_TRAIT_RCC
rccPeriphTag_t rcc; rccPeriphTag_t rcc;
#endif
uint8_t inputIrq; uint8_t inputIrq;
} timerDef_t; } timerDef_t;
@ -180,7 +186,9 @@ uint32_t timerClock(const TIM_TypeDef *tim);
void configTimeBase(TIM_TypeDef *tim, uint16_t period, uint32_t hz); // TODO - just for migration void configTimeBase(TIM_TypeDef *tim, uint16_t period, uint32_t hz); // TODO - just for migration
void timerReconfigureTimeBase(TIM_TypeDef *tim, uint16_t period, uint32_t hz); void timerReconfigureTimeBase(TIM_TypeDef *tim, uint16_t period, uint32_t hz);
#if PLATFORM_TRAIT_RCC
rccPeriphTag_t timerRCC(const TIM_TypeDef *tim); rccPeriphTag_t timerRCC(const TIM_TypeDef *tim);
#endif
uint8_t timerInputIrq(const TIM_TypeDef *tim); uint8_t timerInputIrq(const TIM_TypeDef *tim);
#if defined(USE_TIMER_MGMT) #if defined(USE_TIMER_MGMT)

1
src/main/pg/bus_i2c.h
View file

@ -22,7 +22,6 @@
#include "drivers/bus_i2c.h" #include "drivers/bus_i2c.h"
#include "drivers/io_types.h" #include "drivers/io_types.h"
#include "drivers/rcc_types.h"
#include "pg/pg.h" #include "pg/pg.h"

2
src/platform/APM32/adc_apm32f4xx.c
View file

@ -32,7 +32,7 @@
#include "drivers/dma_reqmap.h" #include "drivers/dma_reqmap.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/io_impl.h" #include "drivers/io_impl.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/sensor.h" #include "drivers/sensor.h"
#include "drivers/adc.h" #include "drivers/adc.h"

2
src/platform/APM32/bus_i2c_apm32.c
View file

@ -31,7 +31,7 @@
#include "drivers/io_impl.h" #include "drivers/io_impl.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/time.h" #include "drivers/time.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/bus_i2c.h" #include "drivers/bus_i2c.h"
#include "drivers/bus_i2c_impl.h" #include "drivers/bus_i2c_impl.h"

2
src/platform/APM32/bus_i2c_apm32_init.c
View file

@ -30,7 +30,7 @@
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/time.h" #include "drivers/time.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/bus_i2c.h" #include "drivers/bus_i2c.h"
#include "drivers/bus_i2c_impl.h" #include "drivers/bus_i2c_impl.h"

2
src/platform/APM32/bus_spi_apm32.c
View file

@ -35,7 +35,7 @@
#include "drivers/bus_spi_impl.h" #include "drivers/bus_spi_impl.h"
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
// Use DMA if possible if this many bytes are to be transferred // Use DMA if possible if this many bytes are to be transferred
#define SPI_DMA_THRESHOLD 8 #define SPI_DMA_THRESHOLD 8

2
src/platform/APM32/dma_apm32f4xx.c
View file

@ -29,7 +29,7 @@
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/resource.h" #include "drivers/resource.h"
/* /*

2
src/platform/APM32/io_apm32.c
View file

@ -23,7 +23,7 @@
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/io_impl.h" #include "drivers/io_impl.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "common/utils.h" #include "common/utils.h"

2
src/platform/APM32/light_ws2811strip_apm32.c
View file

@ -32,7 +32,7 @@
#include "drivers/dma_reqmap.h" #include "drivers/dma_reqmap.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/system.h" #include "drivers/system.h"
#include "drivers/timer.h" #include "drivers/timer.h"

2
src/platform/APM32/pwm_output_dshot_apm32.c
View file

@ -41,7 +41,7 @@
#include "drivers/motor.h" #include "drivers/motor.h"
#include "drivers/pwm_output.h" #include "drivers/pwm_output.h"
#include "pwm_output_dshot_shared.h" #include "pwm_output_dshot_shared.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/time.h" #include "drivers/time.h"
#include "drivers/timer.h" #include "drivers/timer.h"
#include "drivers/system.h" #include "drivers/system.h"

2
src/platform/APM32/rcm_apm32.c
View file

@ -20,7 +20,7 @@
*/ */
#include "platform.h" #include "platform.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
void RCC_ClockCmd(rccPeriphTag_t periphTag, FunctionalState NewState) void RCC_ClockCmd(rccPeriphTag_t periphTag, FunctionalState NewState)
{ {

2
src/platform/APM32/serial_uart_apm32.c
View file

@ -39,7 +39,7 @@
#include "common/utils.h" #include "common/utils.h"
#include "drivers/inverter.h" #include "drivers/inverter.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/serial.h" #include "drivers/serial.h"
#include "drivers/serial_uart.h" #include "drivers/serial_uart.h"

2
src/platform/APM32/serial_uart_apm32f4xx.c
View file

@ -36,7 +36,7 @@
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/serial.h" #include "drivers/serial.h"
#include "drivers/serial_uart.h" #include "drivers/serial_uart.h"

2
src/platform/APM32/timer_apm32.c
View file

@ -37,7 +37,7 @@
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/timer.h" #include "drivers/timer.h"
#include "drivers/timer_impl.h" #include "drivers/timer_impl.h"

2
src/platform/APM32/timer_apm32f4xx.c
View file

@ -30,7 +30,7 @@
#include "timer_def.h" #include "timer_def.h"
#include "apm32f4xx.h" #include "apm32f4xx.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/timer.h" #include "drivers/timer.h"
const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = { const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {

2
src/platform/APM32/transponder_ir_io_apm32.c
View file

@ -31,7 +31,7 @@
#include "drivers/dma_reqmap.h" #include "drivers/dma_reqmap.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/timer.h" #include "drivers/timer.h"
#include "drivers/transponder_ir_arcitimer.h" #include "drivers/transponder_ir_arcitimer.h"
#include "drivers/transponder_ir_erlt.h" #include "drivers/transponder_ir_erlt.h"

2
src/platform/AT32/adc_at32f43x.c
View file

@ -54,7 +54,7 @@
#include "drivers/dma_reqmap.h" #include "drivers/dma_reqmap.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/io_impl.h" #include "drivers/io_impl.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/resource.h" #include "drivers/resource.h"
#include "drivers/dma.h" #include "drivers/dma.h"

2
src/platform/AT32/bus_i2c_atbsp.c
View file

@ -31,7 +31,7 @@
#include "drivers/io_impl.h" #include "drivers/io_impl.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/time.h" #include "drivers/time.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/bus_i2c.h" #include "drivers/bus_i2c.h"
#include "drivers/bus_i2c_impl.h" #include "drivers/bus_i2c_impl.h"

2
src/platform/AT32/bus_i2c_atbsp_init.c
View file

@ -30,7 +30,7 @@
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/time.h" #include "drivers/time.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/bus_i2c.h" #include "drivers/bus_i2c.h"
#include "drivers/bus_i2c_impl.h" #include "drivers/bus_i2c_impl.h"

2
src/platform/AT32/bus_spi_at32bsp.c
View file

@ -35,7 +35,7 @@
#include "drivers/bus_spi_impl.h" #include "drivers/bus_spi_impl.h"
#include "drivers/exti.h" #include "drivers/exti.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
// Use DMA if possible if this many bytes are to be transferred // Use DMA if possible if this many bytes are to be transferred
#define SPI_DMA_THRESHOLD 8 #define SPI_DMA_THRESHOLD 8

2
src/platform/AT32/camera_control_at32.c
View file

@ -28,7 +28,7 @@
#include "drivers/camera_control_impl.h" #include "drivers/camera_control_impl.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/pwm_output.h" #include "drivers/pwm_output.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#ifdef CAMERA_CONTROL_SOFTWARE_PWM_AVAILABLE #ifdef CAMERA_CONTROL_SOFTWARE_PWM_AVAILABLE
#include "build/atomic.h" #include "build/atomic.h"

2
src/platform/AT32/dma_at32f43x.c
View file

@ -29,7 +29,7 @@
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/resource.h" #include "drivers/resource.h"
/* /*

2
src/platform/AT32/io_at32.c
View file

@ -23,7 +23,7 @@
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/io_impl.h" #include "drivers/io_impl.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "common/utils.h" #include "common/utils.h"

2
src/platform/AT32/light_ws2811strip_at32f43x.c
View file

@ -35,7 +35,7 @@
#include "drivers/dma_reqmap.h" #include "drivers/dma_reqmap.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/timer.h" #include "drivers/timer.h"
#include "drivers/light_ws2811strip.h" #include "drivers/light_ws2811strip.h"

2
src/platform/AT32/pwm_output_dshot.c
View file

@ -33,7 +33,7 @@
#include "drivers/dma_reqmap.h" #include "drivers/dma_reqmap.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/time.h" #include "drivers/time.h"
#include "drivers/timer.h" #include "drivers/timer.h"
#include "drivers/system.h" #include "drivers/system.h"

2
src/platform/AT32/rcc_at32.c
View file

@ -23,7 +23,7 @@
*/ */
#include "platform.h" #include "platform.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
void RCC_ClockCmd(rccPeriphTag_t periphTag, FunctionalState NewState) void RCC_ClockCmd(rccPeriphTag_t periphTag, FunctionalState NewState)
{ {

2
src/platform/AT32/serial_uart_at32bsp.c
View file

@ -41,7 +41,7 @@
#include "common/utils.h" #include "common/utils.h"
#include "drivers/inverter.h" #include "drivers/inverter.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/dma.h" #include "drivers/dma.h"

2
src/platform/AT32/serial_uart_at32f43x.c
View file

@ -31,7 +31,7 @@
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/serial.h" #include "drivers/serial.h"
#include "drivers/serial_uart.h" #include "drivers/serial_uart.h"

2
src/platform/AT32/timer_at32bsp.c
View file

@ -35,7 +35,7 @@
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/system.h" #include "drivers/system.h"
#include "drivers/timer.h" #include "drivers/timer.h"
#include "drivers/timer_impl.h" #include "drivers/timer_impl.h"

2
src/platform/AT32/timer_at32f43x.c
View file

@ -28,7 +28,7 @@
#include "timer_def.h" #include "timer_def.h"
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/timer.h" #include "drivers/timer.h"
const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = { const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {

2
src/platform/SIMULATOR/include/platform/platform.h
View file

@ -35,3 +35,5 @@
#define SERIAL_TRAIT_PIN_CONFIG 0 #define SERIAL_TRAIT_PIN_CONFIG 0
#define I2CDEV_COUNT 0 #define I2CDEV_COUNT 0
typedef void* ADC_TypeDef; // Dummy definition for ADC_TypeDef

2
src/platform/STM32/adc_stm32f4xx.c
View file

@ -31,7 +31,7 @@
#include "drivers/dma_reqmap.h" #include "drivers/dma_reqmap.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/io_impl.h" #include "drivers/io_impl.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/sensor.h" #include "drivers/sensor.h"
#include "drivers/adc.h" #include "drivers/adc.h"

2
src/platform/STM32/adc_stm32f7xx.c
View file

@ -30,7 +30,7 @@
#include "drivers/dma_reqmap.h" #include "drivers/dma_reqmap.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/io_impl.h" #include "drivers/io_impl.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/sensor.h" #include "drivers/sensor.h"
#include "drivers/adc.h" #include "drivers/adc.h"

2
src/platform/STM32/adc_stm32g4xx.c
View file

@ -31,7 +31,7 @@
#include "drivers/dma_reqmap.h" #include "drivers/dma_reqmap.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/io_impl.h" #include "drivers/io_impl.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/resource.h" #include "drivers/resource.h"
#include "drivers/dma.h" #include "drivers/dma.h"

2
src/platform/STM32/adc_stm32h7xx.c
View file

@ -31,7 +31,7 @@
#include "drivers/dma_reqmap.h" #include "drivers/dma_reqmap.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/io_impl.h" #include "drivers/io_impl.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/resource.h" #include "drivers/resource.h"
#include "drivers/dma.h" #include "drivers/dma.h"

2
src/platform/STM32/bus_i2c_hal.c
View file

@ -30,7 +30,7 @@
#include "drivers/io_impl.h" #include "drivers/io_impl.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/time.h" #include "drivers/time.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/bus_i2c.h" #include "drivers/bus_i2c.h"
#include "drivers/bus_i2c_impl.h" #include "drivers/bus_i2c_impl.h"

2
src/platform/STM32/bus_i2c_hal_init.c
View file

@ -29,7 +29,7 @@
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/time.h" #include "drivers/time.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/bus_i2c.h" #include "drivers/bus_i2c.h"
#include "drivers/bus_i2c_impl.h" #include "drivers/bus_i2c_impl.h"

2
src/platform/STM32/bus_i2c_stm32f4xx.c
View file

@ -30,7 +30,7 @@
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/time.h" #include "drivers/time.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/bus_i2c.h" #include "drivers/bus_i2c.h"
#include "drivers/bus_i2c_impl.h" #include "drivers/bus_i2c_impl.h"

2
src/platform/STM32/bus_quadspi_hal.c
View file

@ -33,7 +33,7 @@
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/io_impl.h" #include "drivers/io_impl.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "pg/bus_quadspi.h" #include "pg/bus_quadspi.h"

2
src/platform/STM32/bus_spi_ll.c
View file

@ -34,7 +34,7 @@
#include "drivers/bus_spi_impl.h" #include "drivers/bus_spi_impl.h"
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
// Use DMA if possible if this many bytes are to be transferred // Use DMA if possible if this many bytes are to be transferred
#define SPI_DMA_THRESHOLD 8 #define SPI_DMA_THRESHOLD 8

2
src/platform/STM32/bus_spi_stdperiph.c
View file

@ -35,7 +35,7 @@
#include "drivers/bus_spi_impl.h" #include "drivers/bus_spi_impl.h"
#include "drivers/exti.h" #include "drivers/exti.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
// Use DMA if possible if this many bytes are to be transferred // Use DMA if possible if this many bytes are to be transferred
#define SPI_DMA_THRESHOLD 8 #define SPI_DMA_THRESHOLD 8

2
src/platform/STM32/dma_stm32f7xx.c
View file

@ -28,7 +28,7 @@
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/resource.h" #include "drivers/resource.h"
/* /*

2
src/platform/STM32/dma_stm32g4xx.c
View file

@ -28,7 +28,7 @@
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/resource.h" #include "drivers/resource.h"
/* /*

2
src/platform/STM32/dma_stm32h7xx.c
View file

@ -28,7 +28,7 @@
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/resource.h" #include "drivers/resource.h"
/* /*

7
src/platform/STM32/include/platform/platform.h
View file

@ -441,3 +441,10 @@ extern uint8_t _dmaram_end__;
#else #else
#define I2CDEV_COUNT 4 #define I2CDEV_COUNT 4
#endif #endif
// QUAD SPI
#if defined(STM32H7)
#define QUADSPI_TRAIT_AF_PIN 1
#define QUADSPI_TRAIT_HANDLE 1
#define MAX_QUADSPI_PIN_SEL 3
#endif

2
src/platform/STM32/io_stm32.c
View file

@ -22,7 +22,7 @@
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/io_impl.h" #include "drivers/io_impl.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "common/utils.h" #include "common/utils.h"

2
src/platform/STM32/light_ws2811strip_hal.c
View file

@ -31,7 +31,7 @@
#include "drivers/dma_reqmap.h" #include "drivers/dma_reqmap.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/system.h" #include "drivers/system.h"
#include "drivers/timer.h" #include "drivers/timer.h"

2
src/platform/STM32/light_ws2811strip_stdperiph.c
View file

@ -34,7 +34,7 @@
#include "drivers/dma_reqmap.h" #include "drivers/dma_reqmap.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/timer.h" #include "drivers/timer.h"
#include "drivers/light_ws2811strip.h" #include "drivers/light_ws2811strip.h"

2
src/platform/STM32/pwm_output_dshot.c
View file

@ -32,7 +32,7 @@
#include "drivers/dma_reqmap.h" #include "drivers/dma_reqmap.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/time.h" #include "drivers/time.h"
#include "drivers/timer.h" #include "drivers/timer.h"
#include "drivers/system.h" #include "drivers/system.h"

2
src/platform/STM32/pwm_output_dshot_hal.c
View file

@ -40,7 +40,7 @@
#include "drivers/motor.h" #include "drivers/motor.h"
#include "drivers/pwm_output.h" #include "drivers/pwm_output.h"
#include "pwm_output_dshot_shared.h" #include "pwm_output_dshot_shared.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/time.h" #include "drivers/time.h"
#include "drivers/timer.h" #include "drivers/timer.h"
#include "drivers/system.h" #include "drivers/system.h"

2
src/platform/STM32/rcc_stm32.c
View file

@ -19,7 +19,7 @@
*/ */
#include "platform.h" #include "platform.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
void RCC_ClockCmd(rccPeriphTag_t periphTag, FunctionalState NewState) void RCC_ClockCmd(rccPeriphTag_t periphTag, FunctionalState NewState)
{ {

2
src/platform/STM32/sdio_f4xx.c
View file

@ -44,7 +44,7 @@
#include "drivers/io_impl.h" #include "drivers/io_impl.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/time.h" #include "drivers/time.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/light_led.h" #include "drivers/light_led.h"

2
src/platform/STM32/sdio_f7xx.c
View file

@ -41,7 +41,7 @@
#include "drivers/io_impl.h" #include "drivers/io_impl.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/time.h" #include "drivers/time.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/light_led.h" #include "drivers/light_led.h"

2
src/platform/STM32/serial_uart_hal.c
View file

@ -42,7 +42,7 @@
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/inverter.h" #include "drivers/inverter.h"
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/serial.h" #include "drivers/serial.h"
#include "drivers/serial_uart.h" #include "drivers/serial_uart.h"

2
src/platform/STM32/serial_uart_stdperiph.c
View file

@ -42,7 +42,7 @@
#include "common/utils.h" #include "common/utils.h"
#include "drivers/inverter.h" #include "drivers/inverter.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/serial.h" #include "drivers/serial.h"
#include "drivers/serial_uart.h" #include "drivers/serial_uart.h"

2
src/platform/STM32/serial_uart_stm32f4xx.c
View file

@ -35,7 +35,7 @@
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/serial.h" #include "drivers/serial.h"
#include "drivers/serial_uart.h" #include "drivers/serial_uart.h"

2
src/platform/STM32/serial_uart_stm32f7xx.c
View file

@ -33,7 +33,7 @@
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/serial.h" #include "drivers/serial.h"
#include "drivers/serial_uart.h" #include "drivers/serial_uart.h"

2
src/platform/STM32/serial_uart_stm32g4xx.c
View file

@ -31,7 +31,7 @@
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/serial.h" #include "drivers/serial.h"
#include "drivers/serial_uart.h" #include "drivers/serial_uart.h"

2
src/platform/STM32/serial_uart_stm32h7xx.c
View file

@ -33,7 +33,7 @@
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/serial.h" #include "drivers/serial.h"
#include "drivers/serial_uart.h" #include "drivers/serial_uart.h"

2
src/platform/STM32/timer_hal.c
View file

@ -36,7 +36,7 @@
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/timer.h" #include "drivers/timer.h"
#include "drivers/timer_impl.h" #include "drivers/timer_impl.h"

3
src/platform/STM32/timer_stdperiph.c
View file

@ -34,12 +34,13 @@
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/rcc.h"
#include "drivers/system.h" #include "drivers/system.h"
#include "drivers/timer.h" #include "drivers/timer.h"
#include "drivers/timer_impl.h" #include "drivers/timer_impl.h"
#include "platform/rcc.h"
#define TIM_N(n) (1 << (n)) #define TIM_N(n) (1 << (n))
/* /*

2
src/platform/STM32/timer_stm32f4xx.c
View file

@ -29,7 +29,7 @@
#include "timer_def.h" #include "timer_def.h"
#include "stm32f4xx.h" #include "stm32f4xx.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/timer.h" #include "drivers/timer.h"
const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = { const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {

2
src/platform/STM32/timer_stm32f7xx.c
View file

@ -29,7 +29,7 @@
#include "timer_def.h" #include "timer_def.h"
#include "stm32f7xx.h" #include "stm32f7xx.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/timer.h" #include "drivers/timer.h"
const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = { const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {

2
src/platform/STM32/timer_stm32g4xx.c
View file

@ -29,7 +29,7 @@
#include "timer_def.h" #include "timer_def.h"
#include "stm32g4xx.h" #include "stm32g4xx.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/timer.h" #include "drivers/timer.h"
const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = { const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {

2
src/platform/STM32/timer_stm32h5xx.c
View file

@ -30,7 +30,7 @@
#include "timer_def.h" #include "timer_def.h"
#include "stm32h5xx.h" #include "stm32h5xx.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/timer.h" #include "drivers/timer.h"
const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = { const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {

2
src/platform/STM32/timer_stm32h7xx.c
View file

@ -29,7 +29,7 @@
#include "timer_def.h" #include "timer_def.h"
#include "stm32h7xx.h" #include "stm32h7xx.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/timer.h" #include "drivers/timer.h"
const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = { const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {

2
src/platform/STM32/transponder_ir_io_hal.c
View file

@ -30,7 +30,7 @@
#include "drivers/dma_reqmap.h" #include "drivers/dma_reqmap.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/timer.h" #include "drivers/timer.h"
#include "drivers/transponder_ir_arcitimer.h" #include "drivers/transponder_ir_arcitimer.h"
#include "drivers/transponder_ir_erlt.h" #include "drivers/transponder_ir_erlt.h"

2
src/platform/STM32/transponder_ir_io_stdperiph.c
View file

@ -30,7 +30,7 @@
#include "drivers/dma_reqmap.h" #include "drivers/dma_reqmap.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/timer.h" #include "drivers/timer.h"
#include "drivers/transponder_ir_arcitimer.h" #include "drivers/transponder_ir_arcitimer.h"
#include "drivers/transponder_ir_erlt.h" #include "drivers/transponder_ir_erlt.h"

2
src/platform/common/stm32/bus_spi_pinconfig.c
View file

@ -33,7 +33,7 @@
#include "drivers/dma.h" #include "drivers/dma.h"
#include "drivers/exti.h" #include "drivers/exti.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "pg/bus_spi.h" #include "pg/bus_spi.h"

2
src/main/drivers/rcc.h → src/platform/common/stm32/platform/rcc.h
View file

@ -20,7 +20,7 @@
#pragma once #pragma once
#include "rcc_types.h" #include "platform/rcc_types.h"
enum rcc_reg { enum rcc_reg {
RCC_EMPTY = 0, // make sure that default value (0) does not enable anything RCC_EMPTY = 0, // make sure that default value (0) does not enable anything

0
src/main/drivers/rcc_types.h → src/platform/common/stm32/platform/rcc_types.h
View file

2
src/platform/common/stm32/pwm_output_dshot_shared.c
View file

@ -33,7 +33,7 @@
#include "drivers/dma_reqmap.h" #include "drivers/dma_reqmap.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/time.h" #include "drivers/time.h"
#include "drivers/timer.h" #include "drivers/timer.h"
#if defined(STM32F4) #if defined(STM32F4)

2
src/platform/common/stm32/serial_uart_hw.c
View file

@ -33,7 +33,7 @@
#include "build/build_config.h" #include "build/build_config.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"
#include "drivers/rcc.h" #include "platform/rcc.h"
#include "drivers/inverter.h" #include "drivers/inverter.h"
#include "drivers/serial.h" #include "drivers/serial.h"
#include "drivers/serial_impl.h" #include "drivers/serial_impl.h"