1.7 改变gps上传解析逻辑，按键跟关机改为中断触发

WXK

2025-04-02 16ccf41b599457daa3e870be7875d23cda6183f2

 keil/include/main/main.c

@@ -174,6 +174,7 @@
uint8_t flag_4G_recdata;
uint8_t ledonflag;
uint32_t ledontime;
extern uint8_t flag_first_TCPconnect;
void IMUTask(void)
{
   if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&g_com_map[IMU_ENABLE]==1)
@@ -185,10 +186,12 @@
{
if(!read_userkey_input_pca())
     {
        if(HIDO_TimerGetTick() - keystarttime3>2)
         delay_ms(1000);
        if(!read_userkey_input_pca())
        {
            userkey_state = 1;
            keystarttime3 =  HIDO_TimerGetTick();
            flag_first_TCPconnect = 1;
                  //UDPClient_UploadGPS();
        }
//        if(HIDO_TimerGetTick() - keystarttime2>10)
@@ -205,7 +208,8 @@
{
     if(read_powerkey_input_pca())
     {
        if(HIDO_TimerGetTick() - keystarttime>2)
        delay_ms(1000);
        if(read_powerkey_input_pca())
        {
              rtkled=WHITE;
              uwbled=WHITE;
@@ -233,12 +237,13 @@
}
void MinuteTask(void)
{      
      PCA9555_Set_One_Value_Output(ADC_MINIUS,0);//拉低
   PCA9555_Set_One_Value_Output(ADC_MINIUS,0);//拉低
    delay_ms(100);
    adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
}
void SecondTask(void)
{static uint8_t second_count;
    if(second_count++>60)
    if(second_count++>120)
    {
        second_count = 0;
        MinuteTask();
@@ -276,8 +281,6 @@
uint8_t uwb_enable_flag=0;
uint8_t input5v_time;
extern uint8_t taglist_num;
extern uint8_t ceshidata[500];
extern uint8_t ceshichangdu;
uint8_t gps_ntripsend;
static void sleep_timer_callback(void *dev, uint32_t time)
{
@@ -308,10 +311,7 @@
    }else{
        flag_secondtask = 0;
    }
    if(gps_ntripsend==1)
    {
 gps_ntripsend=2;   
    }
    
 if(delaysleep_count>0)
     delaysleep_count--;
}
@@ -337,6 +337,11 @@
   {
        PowerTask();
        test31++;
   }
    if(!(SOS_ENBALE_POSITION&gpio_state))
   {
        UserKeyTask();
        test21++;
   }
}

@@ -370,31 +375,31 @@
//    g_com_map[IP_3]=6;
//    g_com_map[PORT]=6666;
    
    g_com_map[IP_0]=117;
    g_com_map[IP_1]=72;
    g_com_map[IP_2]=111;
    g_com_map[IP_3]=237;
    g_com_map[PORT]=7000;
    
    g_com_map[TCP_IP_0]=111;
    g_com_map[TCP_IP_1]=198;
    g_com_map[TCP_IP_2]=60;
    g_com_map[TCP_IP_3]=6;
    g_com_map[TCP_PORT]=1234;
//    g_com_map[IP_0]=117;
//    g_com_map[IP_1]=72;
//    g_com_map[IP_2]=111;
//    g_com_map[IP_3]=237;
//    g_com_map[PORT]=7000;
//    
//    g_com_map[TCP_IP_0]=111;
//    g_com_map[TCP_IP_1]=198;
//    g_com_map[TCP_IP_2]=60;
//    g_com_map[TCP_IP_3]=6;
//    g_com_map[TCP_PORT]=1234;
    /*
    RTCMMODE_NONE,
    RTCMMODE_TCP,
    RTCMMODE_NTRIP,
    */
    g_com_map[RTCMMODE_INDEX] = RTCMMODE_NTRIP;
//    g_com_map[RTCMMODE_INDEX] = RTCMMODE_NTRIP;
    
    
    snprintf((char *)&g_com_map[NTRIP_HOST_INDEX], 32, "140.143.212.42");
    g_com_map[NTRIP_PORT_INDEX] = HIDO_UtilStrToInt("8005");
//    snprintf((char *)&g_com_map[NTRIP_PORT_INDEX], 32, "8005");
    snprintf((char *)&g_com_map[NTRIP_USERNANME_INDEX], 32, "test005");
    snprintf((char *)&g_com_map[NTRIP_PASSWORD_INDEX], 32, "Hxzk0228");
    snprintf((char *)&g_com_map[NTRIP_SOURCENAME_INDEX], 32, "RTCM32_GNSS2");
//    snprintf((char *)&g_com_map[NTRIP_HOST_INDEX], 32, "140.143.212.42");
//    g_com_map[NTRIP_PORT_INDEX] = HIDO_UtilStrToInt("8005");
////    snprintf((char *)&g_com_map[NTRIP_PORT_INDEX], 32, "8005");
//    snprintf((char *)&g_com_map[NTRIP_USERNANME_INDEX], 32, "test005");
//    snprintf((char *)&g_com_map[NTRIP_PASSWORD_INDEX], 32, "Hxzk0228");
//    snprintf((char *)&g_com_map[NTRIP_SOURCENAME_INDEX], 32, "RTCM32_GNSS2");


    if(g_com_map[BIND_DEV_ID]==0)
@@ -412,11 +417,11 @@
      }
    g_com_map[MODBUS_MODE] = 0;
      log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
    g_com_map[VERSION] = (1<<8)|3;
        
    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,"固件版本: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",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)
    {
@@ -434,13 +439,14 @@
    { 
        LOG_INFO(TRACE_MODULE_APP,"单点定位模式模式. \r\n");
    }
    delay_ms(500);
}
uint32_t adctick = 0;
uint8_t only_one_flag;
uint16_t chongman_time;
uint8_t bat_percent_old=100;
uint8_t input5vflag;
uint8_t kai_4g_flag;
extern uint8_t ota_flag;
void IdleTask(void)
{
if(read_5v_input_pca())
@@ -463,9 +469,10 @@
            while(1)
            {
                nomove_count = 0;
                if(HIDO_TimerGetTick()-adctick>6000)  //10分钟采样一次 电量
//                adctick = HIDO_TimerGetTick();
                if(HIDO_TimerGetTick()-adctick>60)  //10分钟采样一次 电量
                {
                    chongman_time=chongman_time+6;
                    chongman_time=chongman_time+60;
                    adctick = HIDO_TimerGetTick();
                    PCA9555_Set_One_Value_Output(ADC_MINIUS,0);//拉低
                    adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
@@ -475,7 +482,7 @@
                only_one_flag=1;
                chongman_time=0;
                }
                if(bat_percent>=99&&chongman_time>=1800)
                if(bat_percent>=99&&chongman_time>=600)
                {
                    powerled = GREEN;
                }else{
@@ -483,20 +490,27 @@
                }
                if(DBG_GetMode() == DBG_MODE_SHELL)
                {
                    if(kai_4g_flag==0)
                    {
                    kai_4g_flag=1;    
//                    PCA9555_Set_One_Value_Output(AIR780E_ENBALE,1);
                    //Shell_Init();
                    }
                    if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
                    {TCPClient_Poll_1();}
                //HIDO_InputPoll();
                DBG_Poll();
                Internet_Poll();
                HIDO_TimerPoll();
                HIDO_ATLitePoll();
                TCPClient_Poll();
                        if(ota_flag==1)
                        {
//                            OTA_Poll();
//                            HTTPClient_Poll();  
                        }
                        else
                        {
                        uwb_app_poll();
                        }
                        Internet_Poll();
                        HIDO_TimerPoll();
                        HIDO_ATLitePoll();
                        TCPClient_Poll();
                        if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
                        {TCPClient_Poll_1();}
                        if(flag_secondtask)
                        {
                            flag_secondtask = 0;
                            SecondTask();
                        }
                        UserKeyTask();
                }
                UART_CheckReceive();
                if(flag_secondtask)
@@ -507,6 +521,12 @@
                if(DBG_GetMode() == DBG_MODE_SHELL)
                {
                Set4LEDColor(uwbled,rtkled,led4g,powerled);
                    if(g_com_map[CNT_RESTART]==1)
                    {
                        g_com_map[CNT_RESTART]=0;
                        save_com_map_to_flash();
                        NVIC_SystemReset();
                    }
                }
                else
                {
@@ -577,8 +597,6 @@
int test1,test3;
uint32_t test4;
extern uint8_t receive_flag;
extern uint8_t YUANGPS_ParseGGA_data[256];
extern uint8_t YUANGPS_ParseGGA_changdu;
int main(void)
{
    board_clock_run();
@@ -602,22 +620,23 @@
    }
    calib_chip();
    wdt_close(WDT_ID0);
    Program_Init();
    Uart_Register(UART_ID_4G, UART_ID0);
    Uart_Register(UART_ID_DBG_GPS, UART_ID1);
    DBG_Init();
    
    Program_Init();
    Internet_Init();
    TCPClient_Init();
    if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_NTRIP)
    {
       NTRIPClient_Init();
       NTRIPApp_Init();
    }
//    if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_NTRIP)
//    {
//       NTRIPClient_Init();
//       NTRIPApp_Init();
//    }
    if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
    {
        TCPClient_Init_1();
    }
//    HTTPClient_Init();
    gpio_open();
    LED_output_init();//配置彩色灯引脚
    IIC2_Init();
@@ -644,36 +663,29 @@
     delay_ms(500);      
     Set4LEDColor(LEDOFF,LEDOFF,LEDOFF,LEDOFF);       
    }
                g_com_map[MODBUS_MODE] = 0;
                state5v=0;
                state5V_prase_flag=state5v;
                gps_prase_flag=1;//恢复gps解析
                uart1_change_from_debug_to_gps();//测试
                PCA9555_Set_One_Value_Output(MCU_A,0);//输出低电平切换为GPS
    g_com_map[MODBUS_MODE] = 0;
    state5v=0;
    state5V_prase_flag=state5v;
    gps_prase_flag=1;//恢复gps解析
    uart1_change_from_debug_to_gps();//测试
    PCA9555_Set_One_Value_Output(MCU_A,0);//输出低电平切换为GPS
    while (1)
    { 
      uwb_app_poll();
        uwb_app_poll();
        Internet_Poll();
        HIDO_TimerPoll();
        HIDO_ATLitePoll();
        TCPClient_Poll();
        if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
        {TCPClient_Poll_1();}
//        if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_NTRIP&&gps_ntripsend==2)
//        {
//            gps_ntripsend=0;
//            NTRIPApp_ReportGGA(YUANGPS_ParseGGA_data, YUANGPS_ParseGGA_changdu);
//            memset(YUANGPS_ParseGGA_data,0,YUANGPS_ParseGGA_changdu);
//            YUANGPS_ParseGGA_changdu=0;
//        }    
        {
            TCPClient_Poll_1();
        }
        if(flag_secondtask)
        {
            flag_secondtask = 0;
            SecondTask();
        }
      PowerTask();
      IMUTask();
      UserKeyTask();
        IdleTask();
    }
}