From b45fe21c1ae4689bb551efea21cee6e46a780380 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期四, 31 十月 2024 17:11:41 +0800
Subject: [PATCH] 修复充电灯指示休眠状态下不亮和闪烁问题，增加充电电量过低4Ggps关闭机制，增加充电到安全阈值后恢复4G，GPS工作逻辑，增加充电灯指示，增加静止休眠唤醒逻辑
---
keil/include/board/board.c | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/keil/include/board/board.c b/keil/include/board/board.c
index f446833..bee46ad 100644
--- a/keil/include/board/board.c
+++ b/keil/include/board/board.c
@@ -64,6 +64,8 @@
static GPIO_IRQ_HANDLER_T accelerate_irq_handler=NULL;
GPIO_IRQ_HANDLER_T _4Gusart_irq_handler=NULL;
extern struct UART_CFG_T test_uart_cfg;
+extern struct ADC_CFG_T usr_adc_cfg;
+extern volatile int32_t m_EUART_DMA_RXPtr;
void board_clock_run(void)
{
// default load cap
@@ -394,7 +396,7 @@
{
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_LEVEL4);
+ 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);
}
@@ -402,8 +404,9 @@
{
accelerate_irq_handler=irq_handler;
gpio_pin_set_dir(ACCLERATE_DETECT_Pin , GPIO_DIR_IN, 0);
- io_pull_set(ACCLERATE_DETECT_Pin, IO_PULL_DOWN, IO_PULL_UP_NONE);
- gpio_enable_irq(ACCLERATE_DETECT_Pin, GPIO_IRQ_TYPE_RISING_EDGE, accelerate_irq_handler);
+ 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 串口输入检测中断，下拉触发
{
@@ -412,7 +415,7 @@
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);
+ 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)
{
@@ -444,7 +447,15 @@
{
gpio_pin_toggle(idx);
}
+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
+}
void board_configure(void)
{
}
@@ -455,20 +466,24 @@
board_led_off(BOARD_LED_1);
#endif
}
-extern void _4gUsart_handler(enum IO_PIN_T pin);
+
void board_restore_from_power_down(void)
{
- gpio_enable_irq(_4G_USART_RX_Pin, GPIO_IRQ_TYPE_FALLING_EDGE, _4Gusart_irq_handler);
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
- if (button_irq_handler)
- {
- gpio_enable_irq(BOARD_SW_1, GPIO_IRQ_TYPE_FALLING_EDGE, button_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);
+// }
#endif
#if !defined(CELL_PHONE_EN)
--
Gitblit v1.9.3