From f44a16e4dfb664beb54f523eedabf19322caab7c Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期二, 29 十月 2024 15:56:05 +0800
Subject: [PATCH] 车载手环V1.11版本，解决adc采集总是100%问题，修改gps串口判断部分逻辑，低功耗稳定版本
---
keil/include/main/main.c | 57 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index d4451ad..b67bf86 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -328,23 +328,23 @@
charge_state_change();//充电状态判断
-// //马达震动逻辑
-// if(g_com_map[MOTOR_ENABLE])
-// {
-// if(motor_open_air_flag||moter_open_uwb_flag)
-// {
-// if (motor_count++%3!=0)
-// {
-// motor_power_state = 1;
-// }else {//修改
-// motor_power_state = 0;
-// }
-// } else {
-// motor_power_state=1;
-// }
-// }else{
-// motor_power_state=1;
-// }
+ //马达震动逻辑
+ if(g_com_map[MOTOR_ENABLE])
+ {
+ if(motor_open_air_flag||moter_open_uwb_flag)
+ {
+ if (motor_count++%3!=0)
+ {
+ motor_power_state = 1;
+ }else {//修改
+ motor_power_state = 0;
+ }
+ } else {
+ motor_power_state=1;
+ }
+ }else{
+ motor_power_state=1;
+ }
if(enbale_blink_flag)
{
@@ -406,7 +406,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)|10;
+ g_com_map[VERSION] = (1<<8)|11;
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);
@@ -525,15 +525,15 @@
board_output_init();
//board_led_init();
//防止充电电流过低导致设备无法启动
- battery_monitor_open();
- Voltage_input=battery_monitor_get();
- battery_monitor_close();
- if(Voltage_input<=3270)
- {
- enable_system_function_flag=0;//供电不足不能启动4G和GPS
- }else{
- enable_system_function_flag=1;
- }
+// battery_monitor_open();
+// Voltage_input=battery_monitor_get();
+// battery_monitor_close();
+// if(Voltage_input<=3270)
+// {
+// enable_system_function_flag=0;//供电不足不能启动4G和GPS
+// }else{
+// enable_system_function_flag=1;
+// }
//检测通过后改为正常adc采集模式
adc_open(&usr_adc_cfg);
@@ -547,7 +547,6 @@
#endif
gps_air780_power_change(0,1);//开启gps，4G
//加速度计初始化必须在IO_control_init之前因为复用SDA引脚
- tt1=gpio_pin_get_val(ADC_GND_ENABLE);
gpio_pin_clr(ADC_GND_ENABLE);//先�
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
Program_Init();
@@ -626,7 +625,7 @@
index2=AIR780E_IsIPIdle();
index3=Socket_IsSendQueueEmpty(0);
if(delaysleep_count==0)
- if(!gps_power_state&&!gpio_pin_get_val(INPUT_5V_Pin)&&(IfTCPConnected()&&AIR780E_IsIPIdle()&&Socket_IsSendQueueEmpty(0)))
+ if(!gps_power_state&&!gpio_pin_get_val(INPUT_5V_Pin)&&((IfTCPConnected()&&AIR780E_IsIPIdle()&&Socket_IsSendQueueEmpty(0))||((!flag_TCP_reconnectting)&&!IfTCPConnected())))
{
// test1=gpio_pin_get_val(_4G_USART_RX_Pin);
uint32_t lock;
--
Gitblit v1.9.3