V1.7 解决4G上传频繁BUG

yincheng.zhong

2024-09-28 34a2e053e208367d0f4cfbfb019f5c583571f8c6

 keil/include/main/main.c

@@ -180,7 +180,7 @@
//}
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;
uint8_t gps_enable_flag,motor_open_air_flag,moter_open_uwb_flag,flag_fenli_alarm = 0,fenli_alarm_count;;
int need_open_gps_count;
void MotorPoll(void)
{
@@ -191,11 +191,27 @@
    } 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);
                }
            } else {
                if(fenli_alarm_count++>20)
                {
                    flag_fenli_alarm = 1;
                    _4GAlarmUpload(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
@@ -206,7 +222,6 @@
                    if(!flag_alam_state)
                    {
                        flag_alam_state = 1;
                        _4GAlarmUpload(1);
                    }
                    gps_uwb_flag=1;//开启gps测距流程
                    need_open_gps_count=0;
@@ -218,7 +233,6 @@
                    if(!flag_alam_state)
                    {
                        flag_alam_state = 1;
                        _4GAlarmUpload(1);
                    }
                    gps_uwb_flag=1;//开启gps测距流程
                    need_open_gps_count=0;
@@ -228,9 +242,8 @@
            if(!flag_alam_state)
            {
                flag_alam_state = 1;
                _4GAlarmUpload(1);
            }
            distance = -1;
            distance = 0x1ffff;
            gps_uwb_flag=1;//开启gps测距流程
            moter_open_uwb_flag=1;//开启震动
            need_open_gps_count=0;
@@ -274,12 +287,15 @@
    HIDO_TimerTick();
    nomove_count++;
}
uint8_t tt=1;
uint8_t flag_sleeptimer,flag_secondtask,secondtask_count;
static void sleep_timer_callback(void *dev, uint32_t time)
{
    IO_control_init();
   if(tt)
    UWBPoll();
    
   //车载poll
      UWB_Tag_Poll();
    
    MotorPoll();

@@ -336,7 +352,7 @@
    parameter_init_anchor();//g_com_map表初始化角色默认为基站
    dev_id=g_com_map[DEV_ID];//这里不太对
    group_id=g_com_map[GROUP_ID];//组ID
    tag_frequency = 1000/g_com_map[COM_INTERVAL];//测距频率这个存的是测距时间
//    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;
@@ -363,7 +379,7 @@
    port = g_com_map[TCP_PORT];
    g_com_map[VERSION] = (1<<8)|7;
    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,"固件版本: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);
}

@@ -482,7 +498,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();
@@ -524,6 +540,7 @@
        {
            flag_secondtask = 0;
            SecondTask();
					
        }
        IdleTask();
        //3种情况后都要发包和休眠
@@ -534,10 +551,6 @@
        //blink_led(&air780_success_state);//成功测距闪烁4G状态灯
        //air780_success_state=0;
        //}
            input_5v_flag=!gpio_pin_get_val(INPUT_5V_Pin);
            air780e_flag2,air780e_flag3,air780e_flag4;
            air780e_flag1=((IfTCPConnected()&&Socket_IsSendQueueEmpty(0))||!flag_TCP_reconnectting&&!IfTCPConnected());
				
#ifndef DEBUG_MODE
//if(flag_sleeptimer)
        if(!gpio_pin_get_val(INPUT_5V_Pin)&&((IfTCPConnected()&&Socket_IsSendQueueEmpty(0))||!flag_TCP_reconnectting&&!IfTCPConnected())) //进入休眠条件（与关系，全满足才进）：1.没有5V输入 2 TCP已连接时发送队列为空||TCP无连接时不在重连状态。