From 82250eaf568648839e4c8fe3f91445347f19c56d Mon Sep 17 00:00:00 2001 From: yincheng.zhong <634916154@qq.com> Date: 星期一, 23 九月 2024 17:53:46 +0800 Subject: [PATCH] 1H上传测试成功,平均功耗0.7ma,GPS工作时,不能进休眠 --- keil/include/board/board.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/keil/include/board/board.c b/keil/include/board/board.c index 14c5b02..41f1324 100644 --- a/keil/include/board/board.c +++ b/keil/include/board/board.c @@ -62,7 +62,7 @@ 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; + GPIO_IRQ_HANDLER_T _4Gusart_irq_handler=NULL; extern struct UART_CFG_T test_uart_cfg; void board_clock_run(void) { @@ -108,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) @@ -402,7 +402,7 @@ { 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_LEVEL4); + 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); } void board_4GUsart_detection_init(GPIO_IRQ_HANDLER_T irq_handler) //4G 串口输入检测中断,下拉触发 @@ -412,6 +412,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); } void board_button_init(GPIO_IRQ_HANDLER_T irq_handler) { @@ -454,19 +455,23 @@ board_led_off(BOARD_LED_1); #endif } - +extern volatile int32_t m_EUART_DMA_RXPtr; +extern void _4gUsart_handler(enum IO_PIN_T pin); void board_restore_from_power_down(void) { - uart_open(UART_ID1, &test_uart_cfg); - + + //uart_open(UART_ID1, &test_uart_cfg); + AIR780EUartInit(); + 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); +// 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