From 681567d6d1bd2894eccde5b22a948eac7d3a22a5 Mon Sep 17 00:00:00 2001 From: chen <15335560115@163.com> Date: 星期五, 20 九月 2024 18:38:25 +0800 Subject: [PATCH] 对应发货标签V1.6,更改版本号为V1.1,与一期标签分开,更改了tag的uwb测距配置与DW1000通讯,并将测距接包逻辑单次接包改为打开循环接收 --- keil/include/board/board.c | 31 ++++++++----------------------- 1 files changed, 8 insertions(+), 23 deletions(-) diff --git a/keil/include/board/board.c b/keil/include/board/board.c index f7f6738..70938eb 100644 --- a/keil/include/board/board.c +++ b/keil/include/board/board.c @@ -61,8 +61,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; + void board_clock_run(void) { // default load cap @@ -392,26 +391,10 @@ void board_5V_input_init(GPIO_IRQ_HANDLER_T irq_handler) { 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); + gpio_pin_set_dir(INPUT_5V_Pin, GPIO_DIR_IN, 0); + io_pull_set(INPUT_5V_Pin, IO_PULL_DOWN, IO_PULL_UP_LEVEL4); 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); -} -void board_acceleration_detection_init(GPIO_IRQ_HANDLER_T irq_handler) -{ - 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); -} -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 SDA变为普通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_LEVEL0); - gpio_enable_irq(_4G_USART_RX_Pin, GPIO_IRQ_TYPE_FALLING_EDGE, _4Gusart_irq_handler); + power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)INPUT_5V_Pin, POWER_WAKEUP_LEVEL_LOW); } void board_button_init(GPIO_IRQ_HANDLER_T irq_handler) { @@ -447,9 +430,10 @@ void board_configure(void) { } - +extern struct UART_CFG_T test_uart_cfg; void board_prepare_for_power_down(void) { + #if !defined(CELL_PHONE_EN) board_led_off(BOARD_LED_1); #endif @@ -457,6 +441,7 @@ void board_restore_from_power_down(void) { + //uart_open(UART_ID0, &test_uart_cfg); #if defined(UCI_INTF_PORT) uci_tl_resume(); #else @@ -475,6 +460,6 @@ sys_timer_open(); #if TRACE_EN - trace_open(user_trace_port, TRACE_BAUD_RATE); + trace_open(user_trace_port, TRACE_BAUD_RATE);//记得回复 #endif } -- Gitblit v1.9.3