From 96f8a44bc278be96d8851dbb1694cfc2995bf370 Mon Sep 17 00:00:00 2001 From: chen <15335560115@163.com> Date: 星期一, 24 二月 2025 16:29:17 +0800 Subject: [PATCH] 定位手环V1.7版本,增加4Gsos震动下发和sos报警上传和sos上传成功震动逻辑 --- keil/include/main/main.c | 96 +++++++++-------------------------------------- 1 files changed, 19 insertions(+), 77 deletions(-) diff --git a/keil/include/main/main.c b/keil/include/main/main.c index 9a5a7c1..0b15249 100644 --- a/keil/include/main/main.c +++ b/keil/include/main/main.c @@ -208,81 +208,21 @@ uint8_t gps_enable_flag,motor_open_air_flag,moter_open_uwb_flag,flag_fenli_alarm = 0,fenli_alarm_count,delaysleep_count,enbale_blink_flag; int need_open_gps_count; uint32_t keystarttime,keystarttime2; +extern int16_t beepontime; +extern uint8_t beep_start_flag; void MotorPoll(void) { - if(UWB_work_state==UN_BIND) { - gps_uwb_flag=0;//关闭GPS - moter_open_uwb_flag=0;//关闭震动 - need_open_gps_count=0;//清0计数gps - } else { //绑定状态下 - if(anchordata_num==1) { - if(distance<g_com_map[ALARM_DISTANCE1]) { //小于预警距离 - fenli_alarm_count = 0; - if(flag_fenli_alarm) - { - flag_fenli_alarm = 0; - fenli_alarm_count = 0; - _4GAlarmUpload(2); - } - } - } - if(distance>g_com_map[ALARM_DISTANCE1]||anchordata_num==0) - { - if(fenli_alarm_count++>20) - { - if(!flag_fenli_alarm) - { - flag_fenli_alarm = 1; - _4GAlarmUpload(1); - } - } - } - if(distance<g_com_map[ALARM_DISTANCE1]) { //小于预警距离 - if(flag_alam_state) - { - flag_alam_state = 0; - - } - - need_open_gps_count=0; - moter_open_uwb_flag=0;//关闭震动 - gps_uwb_flag=0;//关闭GPS - } else if(g_com_map[ALARM_DISTANCE1]<=distance&&distance<=g_com_map[ALARM_DISTANCE2]) { //大于预警距离小于报警距离 - need_open_gps_count++; - moter_open_uwb_flag=1;//开启震动 - if(need_open_gps_count>=20) { - if(!flag_alam_state) - { - flag_alam_state = 1; - } - gps_uwb_flag=1;//开启gps测距流程 - need_open_gps_count=0; - } - } else if(distance>=g_com_map[ALARM_DISTANCE2]) { //大于报警距离 - need_open_gps_count++; - moter_open_uwb_flag=1;//开启震动 - if(need_open_gps_count>=20) { - if(!flag_alam_state) - { - flag_alam_state = 1; - } - gps_uwb_flag=1;//开启gps测距流程 - need_open_gps_count=0; - } - - } - if(anchordata_num==0) { - if(!flag_alam_state) - { - flag_alam_state = 1; - } - distance = 0x1ffff; - gps_uwb_flag=1;//开启gps测距流程 - moter_open_uwb_flag=1;//开启震动 - need_open_gps_count=0; - } - } + if(beep_start_flag) + { + if(beepontime-->0) + { + motor_power_state=0; + }else{ + beep_start_flag=0; + motor_power_state=1; + } } +} void IMUTask(void) { if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&g_com_map[IMU_ENABLE]==1) @@ -322,8 +262,9 @@ MinuteTask(); } if(!power_low_flag) - Gps_change(); - else{ + {Gps_change(); + MotorPoll(); + }else{ gps_power_state=0;//关闭GPS update_led_power_state(); //初始化GPS计数数据 @@ -331,6 +272,7 @@ gps_wait_count2=0; gps_wait_count=0; } + //UWB状态检测 if(!power_low_flag)//低供电下不需要检测重连 { @@ -443,7 +385,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)|1; + g_com_map[VERSION] = (1<<8)|7; LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id); LOG_INFO(TRACE_MODULE_APP,"固件版本:4G-GPS定位手环 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); @@ -520,7 +462,7 @@ int tt2; int test1,test3; uint32_t test4; - +uint32_t time_count; int main(void) { board_clock_run(); @@ -629,7 +571,7 @@ { flag_secondtask = 0; SecondTask(); - + // time_count++; } UserKeyTask(); IMUTask(); -- Gitblit v1.9.3