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

Merge pull request #9430 from jflyper/bfdev-g4-exti

Browse source 
[G4] EXTI support
This commit is contained in:
Michael Keller 2020-02-01 20:29:49 +13:00 • committed by GitHub
commit 09e8234117
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main/drivers/exti.c
View file

@ -36,13 +36,13 @@ typedef struct {
extiChannelRec_t extiChannelRecs[16]; extiChannelRec_t extiChannelRecs[16];
// IRQ gouping, same on F103, F303, F40x, F7xx and H7xx. // IRQ gouping, same on F103, F303, F40x, F7xx, H7xx and G4xx.
#define EXTI_IRQ_GROUPS 7 #define EXTI_IRQ_GROUPS 7
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
static const uint8_t extiGroups[16] = { 0, 1, 2, 3, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6 }; static const uint8_t extiGroups[16] = { 0, 1, 2, 3, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6 };
static uint8_t extiGroupPriority[EXTI_IRQ_GROUPS]; static uint8_t extiGroupPriority[EXTI_IRQ_GROUPS];
#if defined(STM32F1) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7) #if defined(STM32F1) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7) || defined(STM32G4)
static const uint8_t extiGroupIRQn[EXTI_IRQ_GROUPS] = { static const uint8_t extiGroupIRQn[EXTI_IRQ_GROUPS] = {
EXTI0_IRQn, EXTI0_IRQn,
EXTI1_IRQn, EXTI1_IRQn,
@ -67,7 +67,7 @@ static const uint8_t extiGroupIRQn[EXTI_IRQ_GROUPS] = {
#endif #endif
static uint32_t triggerLookupTable[] = { static uint32_t triggerLookupTable[] = {
#if defined(STM32F7) || defined(STM32H7) #if defined(STM32F7) || defined(STM32H7) || defined(STM32G4)
[BETAFLIGHT_EXTI_TRIGGER_RISING] = GPIO_MODE_IT_RISING, [BETAFLIGHT_EXTI_TRIGGER_RISING] = GPIO_MODE_IT_RISING,
[BETAFLIGHT_EXTI_TRIGGER_FALLING] = GPIO_MODE_IT_FALLING, [BETAFLIGHT_EXTI_TRIGGER_FALLING] = GPIO_MODE_IT_FALLING,
[BETAFLIGHT_EXTI_TRIGGER_BOTH] = GPIO_MODE_IT_RISING_FALLING [BETAFLIGHT_EXTI_TRIGGER_BOTH] = GPIO_MODE_IT_RISING_FALLING
@ -85,6 +85,9 @@ static uint32_t triggerLookupTable[] = {
#if defined(STM32H7) #if defined(STM32H7)
#define EXTI_REG_IMR (EXTI_D1->IMR1) #define EXTI_REG_IMR (EXTI_D1->IMR1)
#define EXTI_REG_PR (EXTI_D1->PR1) #define EXTI_REG_PR (EXTI_D1->PR1)
#elif defined(STM32G4)
#define EXTI_REG_IMR (EXTI->IMR1)
#define EXTI_REG_PR (EXTI->PR1)
#else #else
#define EXTI_REG_IMR (EXTI->IMR) #define EXTI_REG_IMR (EXTI->IMR)
#define EXTI_REG_PR (EXTI->PR) #define EXTI_REG_PR (EXTI->PR)
@ -128,7 +131,7 @@ void EXTIConfig(IO_t io, extiCallbackRec_t *cb, int irqPriority, ioConfig_t conf
extiChannelRec_t *rec = &extiChannelRecs[chIdx]; extiChannelRec_t *rec = &extiChannelRecs[chIdx];
rec->handler = cb; rec->handler = cb;
#if defined(STM32F7) || defined(STM32H7) #if defined(STM32F7) || defined(STM32H7) || defined(STM32G4)
GPIO_InitTypeDef init = { GPIO_InitTypeDef init = {
.Pin = IO_Pin(io), .Pin = IO_Pin(io),
.Mode = GPIO_MODE_INPUT | IO_CONFIG_GET_MODE(config) | triggerLookupTable[trigger], .Mode = GPIO_MODE_INPUT | IO_CONFIG_GET_MODE(config) | triggerLookupTable[trigger],
@ -197,7 +200,7 @@ void EXTIRelease(IO_t io)
void EXTIEnable(IO_t io, bool enable) void EXTIEnable(IO_t io, bool enable)
{ {
#if defined(STM32F1) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7) #if defined(STM32F1) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7) || defined(STM32G4)
uint32_t extiLine = IO_EXTI_Line(io); uint32_t extiLine = IO_EXTI_Line(io);
if (!extiLine) { if (!extiLine) {
@ -254,7 +257,7 @@ void EXTI_IRQHandler(void)
_EXTI_IRQ_HANDLER(EXTI0_IRQHandler); _EXTI_IRQ_HANDLER(EXTI0_IRQHandler);
_EXTI_IRQ_HANDLER(EXTI1_IRQHandler); _EXTI_IRQ_HANDLER(EXTI1_IRQHandler);
#if defined(STM32F1) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7) #if defined(STM32F1) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7) || defined(STM32G4)
_EXTI_IRQ_HANDLER(EXTI2_IRQHandler); _EXTI_IRQ_HANDLER(EXTI2_IRQHandler);
#elif defined(STM32F3) #elif defined(STM32F3)
_EXTI_IRQ_HANDLER(EXTI2_TS_IRQHandler); _EXTI_IRQ_HANDLER(EXTI2_TS_IRQHandler);

2
src/main/drivers/io.h
View file

@ -98,7 +98,7 @@
# warning "Unknown TARGET" # warning "Unknown TARGET"
#endif #endif
#if defined(STM32F7) || defined(STM32H7) #if defined(STM32F7) || defined(STM32H7) || defined(STM32G4)
// Expose these for EXTIConfig // Expose these for EXTIConfig
#define IO_CONFIG_GET_MODE(cfg) (((cfg) >> 0) & 0x03) #define IO_CONFIG_GET_MODE(cfg) (((cfg) >> 0) & 0x03)
#define IO_CONFIG_GET_SPEED(cfg) (((cfg) >> 2) & 0x03) #define IO_CONFIG_GET_SPEED(cfg) (((cfg) >> 2) & 0x03)