From 9ff35110c0d55f0c5f3dbb3453301283a1e8de42 Mon Sep 17 00:00:00 2001 From: chen <15335560115@163.com> Date: 星期一, 04 十一月 2024 09:51:40 +0800 Subject: [PATCH] 增加串口打印LOG提示电量,并修复亏电情况下不进入低功耗问题 --- keil/include/board/board.c | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/keil/include/board/board.c b/keil/include/board/board.c index ea5caed..80327cf 100644 --- a/keil/include/board/board.c +++ b/keil/include/board/board.c @@ -62,8 +62,9 @@ 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; +extern struct ADC_CFG_T usr_adc_cfg; void board_clock_run(void) { // default load cap @@ -394,7 +395,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); } @@ -403,7 +404,8 @@ 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); - gpio_enable_irq(ACCLERATE_DETECT_Pin, GPIO_IRQ_TYPE_RISING_EDGE, accelerate_irq_handler); + 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 串口输入检测中断,下拉触发 { @@ -429,7 +431,15 @@ gpio_pin_set_dir(BOARD_LED_1, GPIO_DIR_OUT, 0); gpio_pin_set_dir(BOARD_LED_2, GPIO_DIR_OUT, 0); } +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_led_on(enum IO_PIN_T idx) { gpio_pin_set(idx); @@ -460,15 +470,17 @@ { uart_open(UART_ID1, &test_uart_cfg); AIR780EUartInit(); + adc_open(&usr_adc_cfg); #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); - if (button_irq_handler) - { - gpio_enable_irq(BOARD_SW_1, GPIO_IRQ_TYPE_FALLING_EDGE, button_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