From b4a3dfd45831f0db1e19f74beb685027e8dbc564 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期四, 29 八月 2024 12:04:09 +0800
Subject: [PATCH] 修改部分状态逻辑判断
---
keil/include/board/board.c | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/keil/include/board/board.c b/keil/include/board/board.c
index 343489f..d70c007 100644
--- a/keil/include/board/board.c
+++ b/keil/include/board/board.c
@@ -62,7 +62,8 @@
struct BOARD_PARAM_T board_param = {0};
static GPIO_IRQ_HANDLER_T button_irq_handler = NULL;
static GPIO_IRQ_HANDLER_T accelerate_irq_handler=NULL;
-
+static GPIO_IRQ_HANDLER_T _4Gusart_irq_handler=NULL;
+extern struct UART_CFG_T test_uart_cfg;
void board_clock_run(void)
{
// default load cap
@@ -107,8 +108,8 @@
trace_open(port, TRACE_BAUD_RATE);
user_trace_port = port;
#endif
- LOG_INFO(TRACE_MODULE_APP, "Hello from MKSEMI!\r\n");
- LOG_INFO(TRACE_MODULE_APP, "Build information %s\r\n", mk_build_inf);
+// LOG_INFO(TRACE_MODULE_APP, "Hello from MKSEMI!\r\n");
+// LOG_INFO(TRACE_MODULE_APP, "Build information %s\r\n", mk_build_inf);
}
void board_calibration_params_default(void)
@@ -404,11 +405,19 @@
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);
}
+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);
+}
void board_button_init(GPIO_IRQ_HANDLER_T irq_handler)
{
button_irq_handler = irq_handler;
gpio_pin_set_dir(BOARD_SW_1, GPIO_DIR_IN, 0);
- io_pull_set(BOARD_SW_1, IO_PULL_UP, IO_PULL_UP_LEVEL4);
+ io_pull_set(BOARD_SW_1, IO_PULL_UP, IO_PULL_UP_LEVEL3);
gpio_enable_irq(BOARD_SW_1, GPIO_IRQ_TYPE_FALLING_EDGE, button_irq_handler);
power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)BOARD_SW_1, POWER_WAKEUP_LEVEL_LOW);
@@ -448,6 +457,8 @@
void board_restore_from_power_down(void)
{
+ uart_open(UART_ID1, &test_uart_cfg);
+
#if defined(UCI_INTF_PORT)
uci_tl_resume();
#else
--
Gitblit v1.9.3