From c0a472466cd8e8e1fa66354b8d8e3fabce758765 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期三, 28 八月 2024 15:30:24 +0800
Subject: [PATCH] Merge branch '安邦测距手环' of http://47.108.70.204:60062/r/ChinaUWBProject into 安邦测距手环
---
keil/include/main/main.c | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 51ac04e..c62a079 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -301,8 +301,7 @@
tag_frequency = 1000/g_com_map[COM_INTERVAL];//测距频率这个存的是测距时间
memcpy(&disoffset,&g_com_map[DIST_OFFSET],2);
g_com_map[ALARM_DISTANCE1] = 40;
- g_com_map[ALARM_DISTANCE2
- ] = 40;
+ g_com_map[ALARM_DISTANCE2] = 40;
warning_distance=g_com_map[ALARM_DISTANCE1];
prewarning_distance=g_com_map[ALARM_DISTANCE2];
send_struct.warnDistence=warning_distance;
@@ -358,8 +357,8 @@
uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma
//UartDeinit();
}
- UART_CheckReceive();
}
+ UART_CheckReceive();
}
int bind_check(void)
{
@@ -382,11 +381,23 @@
first_search_flag=1;
}
}
-
+void boot_deinit(void)
+{
+ //将boot中串口返回普通gpio
+// UART0 TX/RX
+ io_pin_mux_set(IO_PIN_5, IO_FUNC0);
+ io_pin_mux_set(IO_PIN_6, IO_FUNC0);
+ // UART1 RX/TX
+ io_pin_mux_set(IO_PIN_10, IO_FUNC0);
+ io_pin_mux_set(IO_PIN_9, IO_FUNC0);
+ uart_close(UART_ID1);//解绑原来串口1
+ uart_close(UART_ID0);//解绑原来串口0
+}
uint8_t flag_4guart_needinit=0;
int main(void)
{
board_clock_run();
+ boot_deinit();
board_pins_config();
board_debug_console_open(TRACE_PORT_UART0);
// Reset reason
@@ -446,9 +457,9 @@
sleep_timer_open(true, SLEEP_TIMER_MODE_RELOAD, sleep_timer_callback);
//sleep_timer_start(__MS_TO_32K_CNT(g_com_map[COM_INTERVAL]));//测试
sleep_timer_start(__MS_TO_32K_CNT(SLEEP_TIMER_NUM));//测试
-// board_5V_input_init(voltage_input_handler);
+ board_5V_input_init(voltage_input_handler);
board_acceleration_detection_init(move_handler);
-
+// LOG_INFO(TRACE_MODULE_APP, "测试进入app");
AIR780E_Reset(); //4G模块重启，耗时1.5秒,这个是无法同步的关键
while (1)
{
--
Gitblit v1.9.3