From 750eb154008e9ad9a2c8135933fde80bb7612a61 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期五, 20 九月 2024 17:28:31 +0800
Subject: [PATCH] 对应手环版本V1.13，手环GPS串口切换时TX变为普通GPIO不使能TXGPS功能，GPS在main中默认开启上电在GPS串口初始化之前
---
keil/include/main/main.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 1d2be7e..1ad076f 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -362,7 +362,7 @@
ip2 = (g_com_map[TCP_IP_2]>>12&0xf)*1000+(g_com_map[TCP_IP_2]>>8&0xf)*100+(g_com_map[TCP_IP_2]>>4&0xf)*10+(g_com_map[TCP_IP_2]&0xf);
ip3 = (g_com_map[TCP_IP_3]>>12&0xf)*1000+(g_com_map[TCP_IP_3]>>8&0xf)*100+(g_com_map[TCP_IP_3]>>4&0xf)*10+(g_com_map[TCP_IP_3]&0xf);
port = g_com_map[TCP_PORT];
- g_com_map[VERSION] = (1<<8)|11;
+ g_com_map[VERSION] = (1<<8)|13;
LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
LOG_INFO(TRACE_MODULE_APP,"固件版本:UWB-4G手环 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
LOG_INFO(TRACE_MODULE_APP,"服务器地址: %d.%d.%d.%d:%d.\r\n",ip0,ip1,ip2,ip3,port);
@@ -483,7 +483,7 @@
io_pin_mux_set(SCL_PIN, IO_FUNC0);//测试测距波形
gpio_pin_set_dir(SCL_PIN , GPIO_DIR_OUT, 0);
io_pull_set(SCL_PIN , IO_PULL_DOWN, IO_PULL_UP_LEVEL4);
- gps_air780_power_change(0,1);//开启gps，4G
+ gps_air780_power_change(1,1);//开启gps，4G
//加速度计初始化必须在IO_control_init之前因为复用SDA引脚
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
Program_Init();
--
Gitblit v1.9.3