From fadf2a684268a36b7d3069f0e4e932147416c481 Mon Sep 17 00:00:00 2001 From: chen <15335560115@163.com> Date: 星期一, 21 四月 2025 18:23:57 +0800 Subject: [PATCH] 手环V1.16版本,修改gps闪灯状态e后为1时不用状态机控制,修改5s后关闭4g和gps逻辑,初步测试成功,但OTA中途会重连导致升级不了 --- keil/include/board/board.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 46 insertions(+), 9 deletions(-) diff --git a/keil/include/board/board.c b/keil/include/board/board.c index 6b581b1..ec44fa2 100644 --- a/keil/include/board/board.c +++ b/keil/include/board/board.c @@ -62,7 +62,12 @@ 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; + GPIO_IRQ_HANDLER_T _SOSusart_rising_irq_handler=NULL; + GPIO_IRQ_HANDLER_T _SOSusart_falling_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 @@ -107,8 +112,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) @@ -393,7 +398,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,7 +407,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 串口输入检测中断,下拉触发 { @@ -411,6 +417,21 @@ 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_SOS_fall_detection_init(GPIO_IRQ_HANDLER_T irq_handler) //sos输入中断 +{ + _SOSusart_falling_irq_handler=irq_handler; + io_pin_mux_set(SCL_PIN,IO_FUNC0);//把原先io 变为普通GPIO + gpio_pin_set_dir(SCL_PIN , GPIO_DIR_IN, 0); + gpio_enable_irq(SCL_PIN, GPIO_IRQ_TYPE_FALLING_EDGE, _SOSusart_falling_irq_handler); + //gpio_enable_irq(SCL_PIN, GPIO_IRQ_TYPE_RISING_EDGE, _SOSusart_irq_handler); + power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)SCL_PIN, POWER_WAKEUP_LEVEL_LOW); +} +void board_SOS_rise_detection_init(GPIO_IRQ_HANDLER_T irq_handler) +{ + _SOSusart_rising_irq_handler=irq_handler; + gpio_enable_irq(SCL_PIN, GPIO_IRQ_TYPE_RISING_EDGE, _SOSusart_rising_irq_handler); } void board_button_init(GPIO_IRQ_HANDLER_T irq_handler) { @@ -442,7 +463,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) { } @@ -456,14 +485,22 @@ void board_restore_from_power_down(void) { + 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(SCL_PIN, GPIO_IRQ_TYPE_FALLING_EDGE, _SOSusart_falling_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