From 9b59e87d8280de129c18421b5d12cf96d0ea904e Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 03 九月 2024 10:28:06 +0800
Subject: [PATCH] V1.6 给客户测试
---
keil/include/main/main.c | 65 +++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 18 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index b1e45dd..51d52b1 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -177,8 +177,8 @@
//board_debug_console_open(TRACE_PORT_UART0);
//uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
//}
-extern gps_uwb_flag;
-uint8_t TCP_reconnect_timer,flag_TCP_reconnectting = 1;
+extern uint8_t gps_uwb_flag;
+uint8_t TCP_reconnect_timer,flag_TCP_reconnectting = 1,flag_alam_state = 0;
uint8_t gps_enable_flag,motor_open_air_flag,moter_open_uwb_flag;
int need_open_gps_count;
void MotorPoll(void)
@@ -190,6 +190,11 @@
} else { //绑定状态下
if(anchordata_num==1) {
if(distance<g_com_map[ALARM_DISTANCE1]) { //小于预警距离
+ if(flag_alam_state)
+ {
+ flag_alam_state = 0;
+ _4GAlarmUpload(2);
+ }
need_open_gps_count=0;
moter_open_uwb_flag=0;//关闭震动
gps_uwb_flag=0;//关闭GPS
@@ -197,6 +202,11 @@
need_open_gps_count++;
moter_open_uwb_flag=1;//开启震动
if(need_open_gps_count>=20) {
+ if(!flag_alam_state)
+ {
+ flag_alam_state = 1;
+ _4GAlarmUpload(1);
+ }
gps_uwb_flag=1;//开启gps测距流程
need_open_gps_count=0;
}
@@ -204,12 +214,22 @@
need_open_gps_count++;
moter_open_uwb_flag=1;//开启震动
if(need_open_gps_count>=20) {
+ if(!flag_alam_state)
+ {
+ flag_alam_state = 1;
+ _4GAlarmUpload(1);
+ }
gps_uwb_flag=1;//开启gps测距流程
need_open_gps_count=0;
}
}
} else if(anchordata_num==0) {
-
+ if(!flag_alam_state)
+ {
+ flag_alam_state = 1;
+ _4GAlarmUpload(1);
+ }
+ distance = -1;
gps_uwb_flag=1;//开启gps测距流程
moter_open_uwb_flag=1;//开启震动
need_open_gps_count=0;
@@ -257,8 +277,10 @@
{
IO_control_init();
UWBPoll();
- if(g_com_map[MOTOR_ENABLE])
+
+
MotorPoll();
+
if(secondtask_count++%2==0)
{
flag_secondtask = 1;
@@ -269,18 +291,23 @@
flag_sleeptimer = 1;
//马达震动逻辑
- if(motor_open_air_flag||moter_open_uwb_flag)
+ if(g_com_map[MOTOR_ENABLE])
{
- if (motor_count++%2==0)
- {
- motor_power_state = 1;
- }else{
- motor_power_state = 0;
- }
- } else {
+ if(motor_open_air_flag||moter_open_uwb_flag)
+ {
+ if (motor_count++%2==0)
+ {
+ motor_power_state = 1;
+ }else{
+ motor_power_state = 0;
+ }
+ } else {
+ motor_power_state=1;
+ }
+ }else{
motor_power_state=1;
}
-
+
//GPS工作逻辑
}
@@ -300,6 +327,7 @@
// AIR780EUartInit();
}
extern uint16_t ip0,ip1,ip2,ip3,port;
+extern uint8_t gps_4g_flag;
void Program_Init(void)
{
Usart1ParseDataCallback = UsartParseDataHandler;//需改为默认为gps处理，UsartParseDataHandler为升级处理当调试时候改为
@@ -316,7 +344,7 @@
send_struct.alarmDistence=prewarning_distance;//更新报警距离
memcpy(&send_struct.gunLableId,&g_com_map[BIND_DEV_ID],2);//更新绑定ID
send_struct.tagId=dev_id;//更新设备ID
-
+
if(g_com_map[BIND_DEV_ID]==0)
{
UWB_work_state = UN_BIND;
@@ -331,7 +359,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)|2;
+ g_com_map[VERSION] = (1<<8)|6;
LOG_INFO("设备ID: %x .\r\n",dev_id);
LOG_INFO("固件版本:UWB-4G手环 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
LOG_INFO("服务器地址: %d.%d.%d.%d:%d.\r\n",ip0,ip1,ip2,ip3,port);
@@ -455,7 +483,7 @@
gps_air780_power_change(0,1);//开启gps，4G
//加速度计初始化必须在IO_control_init之前因为复用SDA引脚
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
- // uart_open(UART_ID1, &test_uart_cfg);
+ uart_open(UART_ID1, &test_uart_cfg);
Program_Init();
// uart1_change_from_gps_to_debug();
//Uart1GpsRecDebugSend();
@@ -463,13 +491,14 @@
// Initialize low power mode
power_init();
+ AIR780E_Reset(); //4G模块重启，耗时1.5秒,这个是无法同步的关键
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_acceleration_detection_init(move_handler);
// LOG_INFO(TRACE_MODULE_APP, "测试进入app");
- AIR780E_Reset(); //4G模块重启，耗时1.5秒,这个是无法同步的关键
+
while (1)
{
if(flag_TCP_reconnectting||IfTCPConnected())
@@ -504,7 +533,7 @@
//}
#ifndef DEBUG_MODE
//if(flag_sleeptimer)
- // if(!gpio_pin_get_val(INPUT_5V_Pin)&&((IfTCPConnected()&&Socket_IsSendQueueEmpty(0))||!flag_TCP_reconnectting&&!IfTCPConnected())&&!flag_4G_recdata) //进入休眠条件（与关系，全满足才进）：1.没有5V输入 2 TCP已连接时发送队列为空||TCP无连接时不在重连状态。
+ // if(!gpio_pin_get_val(INPUT_5V_Pin)&&((IfTCPConnected()&&Socket_IsSendQueueEmpty(0))||!flag_TCP_reconnectting&&!IfTCPConnected())) //进入休眠条件（与关系，全满足才进）：1.没有5V输入 2 TCP已连接时发送队列为空||TCP无连接时不在重连状态。
{
// if(!flag_4guart_needinit)
{
--
Gitblit v1.9.3