From bb14f348f2eb7527ac33e4f12e17bd726c42859a Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期五, 28 二月 2025 18:16:46 +0800
Subject: [PATCH] 增加按键宏定义但按键第二行到第四行按下无响应
---
keil/include/board/board.c | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/keil/include/board/board.c b/keil/include/board/board.c
index ef61219..8439d67 100644
--- a/keil/include/board/board.c
+++ b/keil/include/board/board.c
@@ -394,11 +394,11 @@
}
void board_5V_input_init(GPIO_IRQ_HANDLER_T irq_handler)
{
- button_irq_handler = irq_handler;
- gpio_pin_set_dir(INPUT_5V_Pin , GPIO_DIR_IN, 0);
- io_pull_set(INPUT_5V_Pin , IO_PULL_DOWN, IO_PULL_UP_NONE);
- gpio_enable_irq(INPUT_5V_Pin, GPIO_IRQ_TYPE_RISING_EDGE, button_irq_handler);
- //power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)INPUT_5V_Pin, POWER_WAKEUP_LEVEL_LOW);
+// button_irq_handler = irq_handler;
+// gpio_pin_set_dir(INPUT_5V_Pin , GPIO_DIR_IN, 0);
+// io_pull_set(INPUT_5V_Pin , IO_PULL_DOWN, IO_PULL_UP_NONE);
+// gpio_enable_irq(INPUT_5V_Pin, GPIO_IRQ_TYPE_RISING_EDGE, button_irq_handler);
+// //power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)INPUT_5V_Pin, POWER_WAKEUP_LEVEL_LOW);
}
void board_acceleration_detection_init(GPIO_IRQ_HANDLER_T irq_handler)
{
@@ -406,16 +406,16 @@
gpio_pin_set_dir(ACCLERATE_DETECT_Pin , GPIO_DIR_IN, 0);
io_pull_set(ACCLERATE_DETECT_Pin, IO_PULL_DOWN, IO_PULL_UP_LEVEL4);
gpio_enable_irq(ACCLERATE_DETECT_Pin, GPIO_IRQ_TYPE_RISING_EDGE, accelerate_irq_handler);
- power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)ACCLERATE_DETECT_Pin, POWER_WAKEUP_LEVEL_HIGH);
+
}
void board_4GUsart_detection_init(GPIO_IRQ_HANDLER_T irq_handler) //4G 串口输入检测中断，下拉触发
{
- _4Gusart_irq_handler=irq_handler;
- io_pin_mux_set(_4G_USART_RX_Pin,IO_FUNC0);//把原先io 变为普通GPIO
- gpio_pin_set_dir(_4G_USART_RX_Pin , GPIO_DIR_IN, 0);
- io_pull_set(_4G_USART_RX_Pin, IO_PULL_UP, IO_PULL_UP_LEVEL2);
- gpio_enable_irq(_4G_USART_RX_Pin, GPIO_IRQ_TYPE_FALLING_EDGE, _4Gusart_irq_handler);
- power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)_4G_USART_RX_Pin, POWER_WAKEUP_LEVEL_LOW);
+// _4Gusart_irq_handler=irq_handler;
+// io_pin_mux_set(_4G_USART_RX_Pin,IO_FUNC0);//把原先io 变为普通GPIO
+// gpio_pin_set_dir(_4G_USART_RX_Pin , GPIO_DIR_IN, 0);
+// io_pull_set(_4G_USART_RX_Pin, IO_PULL_UP, IO_PULL_UP_LEVEL2);
+// gpio_enable_irq(_4G_USART_RX_Pin, GPIO_IRQ_TYPE_FALLING_EDGE, _4Gusart_irq_handler);
+// power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)_4G_USART_RX_Pin, POWER_WAKEUP_LEVEL_LOW);
}
void board_button_init(GPIO_IRQ_HANDLER_T irq_handler)
{
@@ -449,11 +449,11 @@
}
void board_output_init(void)
{
- //adc采集gnd默认拉高
- io_pin_mux_set(ADC_GND_ENABLE, IO_FUNC0);
- gpio_pin_set_dir(ADC_GND_ENABLE , GPIO_DIR_OUT, 1);
-// io_open_drain_set(ADC_GND_ENABLE, 1);
- io_pull_set(ADC_GND_ENABLE,IO_HIGH_Z,IO_PULL_UP_NONE);//3
+// //adc采集gnd默认拉高
+// io_pin_mux_set(ADC_GND_ENABLE, IO_FUNC0);
+// gpio_pin_set_dir(ADC_GND_ENABLE , GPIO_DIR_OUT, 1);
+//// io_open_drain_set(ADC_GND_ENABLE, 1);
+// io_pull_set(ADC_GND_ENABLE,IO_HIGH_Z,IO_PULL_UP_NONE);//3
}
void board_configure(void)
@@ -472,13 +472,14 @@
uart_open(UART_ID1, &test_uart_cfg);
AIR780EUartInit();
adc_open(&usr_adc_cfg);
+
m_EUART_DMA_RXPtr = 0;//清空上次缓存器避免重复发
#if defined(UCI_INTF_PORT)
uci_tl_resume();
#else
// button - restore interrupt type
- gpio_enable_irq(_4G_USART_RX_Pin, GPIO_IRQ_TYPE_FALLING_EDGE, _4Gusart_irq_handler);
- gpio_enable_irq(ACCLERATE_DETECT_Pin, GPIO_IRQ_TYPE_RISING_EDGE, accelerate_irq_handler);
+// gpio_enable_irq(_4G_USART_RX_Pin, GPIO_IRQ_TYPE_FALLING_EDGE, _4Gusart_irq_handler);
+// gpio_enable_irq(ACCLERATE_DETECT_Pin, GPIO_IRQ_TYPE_RISING_EDGE, accelerate_irq_handler);
// if (button_irq_handler)
// {
// gpio_enable_irq(BOARD_SW_1, GPIO_IRQ_TYPE_FALLING_EDGE, button_irq_handler);
--
Gitblit v1.9.3