chore: Move gt911 touch to generic EXTI driver (#3797)

* Move gt911 touch to generic EXTI driver

* Further cleaning

* chore: further cleaning
This commit is contained in:
3djc
2023-07-14 18:04:54 +10:00
committed by GitHub
parent 6a8141f859
commit 1791bbd354
3 changed files with 27 additions and 41 deletions
+10 -33
View File
@@ -23,6 +23,7 @@
#include "stm32_hal.h"
#include "stm32_i2c_driver.h"
#include "stm32_gpio_driver.h"
#include "stm32_exti_driver.h"
#include "hal.h"
#include "tp_gt911.h"
@@ -440,18 +441,14 @@ static short tapCount = 0;
static TouchState internalTouchState = {};
static void _gt911_exti_isr(void)
{
touchEventOccured = true;
}
static void TOUCH_AF_ExtiStop(void)
{
LL_EXTI_InitTypeDef extiInit;
LL_EXTI_StructInit(&extiInit);
extiInit.Line_0_31 = TOUCH_INT_EXTI_Line;
extiInit.Mode = LL_EXTI_MODE_IT;
extiInit.Trigger = LL_EXTI_TRIGGER_RISING;
extiInit.LineCommand = DISABLE;
LL_EXTI_Init(&extiInit);
NVIC_DisableIRQ(TOUCH_INT_EXTI_IRQn);
stm32_exti_disable(TOUCH_INT_EXTI_Line);
}
static void TOUCH_AF_ExtiConfig(void)
@@ -459,17 +456,9 @@ static void TOUCH_AF_ExtiConfig(void)
__HAL_RCC_SYSCFG_CLK_ENABLE();
LL_SYSCFG_SetEXTISource(TOUCH_INT_EXTI_Port, TOUCH_INT_EXTI_SysCfgLine);
LL_EXTI_InitTypeDef extiInit;
LL_EXTI_StructInit(&extiInit);
extiInit.Line_0_31 = TOUCH_INT_EXTI_Line;
extiInit.Mode = LL_EXTI_MODE_IT;
extiInit.Trigger = LL_EXTI_TRIGGER_RISING;
extiInit.LineCommand = ENABLE;
LL_EXTI_Init(&extiInit);
NVIC_SetPriority(TOUCH_INT_EXTI_IRQn, 9);
NVIC_EnableIRQ(TOUCH_INT_EXTI_IRQn);
stm32_exti_enable(TOUCH_INT_EXTI_Line,
LL_EXTI_TRIGGER_RISING,
_gt911_exti_isr);
}
static void TOUCH_AF_GPIOConfig(void)
@@ -799,18 +788,6 @@ struct TouchState touchPanelRead()
return internalTouchState;
}
#if !defined(TOUCH_INT_EXTI_IRQHandler)
#error "TOUCH_INT_EXTI_IRQHandler is not defined"
#endif
extern "C" void TOUCH_INT_EXTI_IRQHandler(void)
{
if (LL_EXTI_IsEnabledIT_0_31(TOUCH_INT_EXTI_Line) &&
LL_EXTI_IsActiveFlag_0_31(TOUCH_INT_EXTI_Line)) {
touchEventOccured = true;
LL_EXTI_ClearFlag_0_31(TOUCH_INT_EXTI_Line);
}
}
bool touchPanelEventOccured()
{
return touchEventOccured;