keil/include/main/main.c
@@ -176,7 +176,7 @@
uint32_t ledontime;
void IMUTask(void)
{
   if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&g_com_map[IMU_ENABLE]==1)
   if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&g_com_map[IMU_ENABLE]==2)
   {//power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)ACCLERATE_DETECT_Pin, POWER_WAKEUP_LEVEL_HIGH);
      mcu_deep_sleep();
   }
@@ -285,10 +285,14 @@
extern uint16_t g_spsum_GSV,g_snum_GSV;
extern uint16_t g_spsum_GSV_sum;
extern uint16_t g_snum_GSV_sum;
extern uint8_t ceju_leave_flag;
extern uint8_t fixed_solution_count_minute;
uint8_t open_gps_time=0;
static void sleep_timer_callback(void *dev, uint32_t time)
{
if(secondtask_count++%2==0)
    {
    {
        open_gps_time++;
        input5v_time=1;
        flag_secondtask = 1;
        if(!read_5v_input_pca())
@@ -309,32 +313,64 @@
        {
        CloseUWB();
        Uwb_init();
        OpenUWB();
//        OpenUWB();
        }
            in_the_room_flag=1;
      if(in_the_room_flag==1)
      {
//            in_the_room_flag=1;
      if(30<open_gps_time<90)
         {
         Receive_g_spsum_Data(g_spsum_GSV);
         Receive_g_snum_Data(g_snum_GSV);
         if(g_spsum_GSV_sum<50&&g_snum_GSV_sum<3)
         {
         lounei_flag=1;
         }
         if(50<g_spsum_GSV_sum&&2<g_snum_GSV_sum)
         if(ceju_leave_flag==1)
         {
         Receive_g_spsum_Data(g_spsum_GSV);
         Receive_g_snum_Data(g_snum_GSV);
         if(open_gps_time>90)
         {
          open_gps_time=90;
//         if((g_spsum_GSV_sum<200&&g_snum_GSV_sum<3)&&(fixed_solution_count_minute<30||fixed_solution_count_minute==0))
         if((g_spsum_GSV_sum<300||g_snum_GSV_sum<20)&&(fixed_solution_count_minute<30))
         {
         lounei_flag=1;
//         Switch_low_power_mode(lounei_flag);
         }
         if((400<g_spsum_GSV_sum&&10<g_snum_GSV_sum)&&(fixed_solution_count_minute>30))
//         if((200<g_spsum_GSV_sum&&3<g_snum_GSV_sum)&&(ceju_leave_flag==1))
         {
         lounei_flag=0;
//         Switch_low_power_mode(lounei_flag);
         }
         Switch_low_power_mode(lounei_flag);
         }
         
      if(heart_upload_time==0||heart_upload_time==61)
      {
         TCPHeartBeatUpload();
         heart_upload_time=1;
      }
         heart_upload_time++;
      }
         if(heart_upload_time==60)
         {
         ceju_leave_flag=0;
         fixed_solution_count_minute=0;
         if(lounei_flag==1)
         {
            PCA9555_Set_One_Value_Output(GPS_POWER,0);
         }
         }
         if(heart_upload_time==0||heart_upload_time==60)
         {
            TCPHeartBeatUpload();
            heart_upload_time=0;
         }
         heart_upload_time++;
         }
    }else{
        flag_secondtask = 0;
@@ -385,7 +421,7 @@
    Usart1ParseDataCallback = UsartParseDataHandler;//需改为默认为gps处理,UsartParseDataHandler为升级处理当调试时候改为
    parameter_init_anchor();//g_com_map表初始化角色默认为基站
    dev_id=g_com_map[DEV_ID];//这里不太对
//    g_com_map[GROUP_ID]=9;
    g_com_map[GROUP_ID]=9;
    group_id=g_com_map[GROUP_ID];//组ID
    memcpy(&disoffset,&g_com_map[DIST_OFFSET],2);
    warning_distance=g_com_map[ALARM_DISTANCE1];
@@ -447,7 +483,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,"固件版本:MK-大工卡 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",g_com_map[IP_0],g_com_map[IP_1],g_com_map[IP_2],g_com_map[IP_3],g_com_map[PORT]);
    if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
    {
@@ -563,7 +599,7 @@
                state5V_prase_flag=state5v;
                gps_prase_flag=1;//恢复gps解析
                uart1_change_from_debug_to_gps();//测试
                PCA9555_Set_One_Value_Output(MCU_A,0);//输出低电平切换为GPS
                PCA9555_Set_One_Value_Output(MCU_A,1);//输出低电平切换为GPS
            }
        }
      UART_CheckReceive();
@@ -615,7 +651,7 @@
    board_clock_run();
    boot_deinit();
    board_pins_config();
   board_debug_console_open_baud(TRACE_PORT_UART1,BAUD_115200);
      board_debug_console_open_baud(TRACE_PORT_UART1,BAUD_115200);
    // Reset reason
    reset_cause_get();
    reset_cause_clear();