zhangbo
7 天以前 dd08a0f8ffd2c5ae1db9ba5aa90f3c41e264749c
keil/include/main/main.c
@@ -24,6 +24,7 @@
#include "PCA9555.h"
#include "WS2812.h"
#include "DBG.h"
#include "SC7A22H.h"
//#define DEBUG_MODE
extern int simple_main(void);
@@ -589,7 +590,7 @@
//      }
    g_com_map[MODBUS_MODE] = 0;
      log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
    g_com_map[VERSION] = (1<<8)|23;
    g_com_map[VERSION] = (1<<8)|24;
          
        
    LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
@@ -626,6 +627,8 @@
extern uint8_t ota_flag;
uint8_t bat_percent_only_one=1;
extern uint8_t jiancebat_percent_flag;
extern uint8_t double_click_flag;
void IdleTask(void)
{
if(read_5v_input_pca())
@@ -687,8 +690,8 @@
                        HIDO_TimerPoll();
                        HIDO_ATLitePoll();
                        TCPClient_Poll();
                        if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
                        {TCPClient_Poll_1();}
//                        if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
//                        {TCPClient_Poll_1();}
                        if(flag_secondtask)
                        {
                            flag_secondtask = 0;
@@ -792,6 +795,19 @@
             }         
         
         }
  if(double_click_flag)
  {
     double_click_flag=0;
     nomove_count=0;
     unsigned char CLICK_status;
     SL_SC7A22H_I2c_Spi_Read(SL_SC7A22H_SPI_IIC_MODE, 0x39, 1, &CLICK_status);
     test_gravity_reading();
  }
}
void boot_deinit(void)
{
@@ -968,10 +984,10 @@
//       NTRIPClient_Init();
//       NTRIPApp_Init();
//    }
    if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
    {
        TCPClient_Init_1();
    }
//    if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
//    {
//        TCPClient_Init_1();
//    }
//    HTTPClient_Init();
    wdt_open(WDT_ID0,&app_wdt_cfg);//30s检测喂狗
    LED_output_init();//配置彩色灯引脚
@@ -989,9 +1005,9 @@
    if(!read_5v_input_pca())
    {
     Set4LEDColor(BLUE,GREEN,WHITE,RED);
     delay_ms(500);
     delay_ms(100);
     Set4LEDColor(RED,WHITE,RED,WHITE);
     delay_ms(500);
     delay_ms(100);
     Set4LEDColor(LEDOFF,LEDOFF,LEDOFF,LEDOFF);       
    }
      
@@ -1022,18 +1038,20 @@
        HIDO_ATLitePoll();
        TCPClient_Poll();
        wdt_ping(WDT_ID0);//喂狗
        if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
        {
            TCPClient_Poll_1();
        }
//        if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
//        {
//            TCPClient_Poll_1();
//        }
        if(flag_secondtask)
        {
            flag_secondtask = 0;
            SecondTask();
        }
            SC7A22H_get_Pedo_task();
          IMUTask();
//       SC7A22H_get_double_click();
//        SL_SC7A22H_RawData_Read();
      IMUTask();
        IdleTask();
            check_step_and_update_state();
      check_step_and_update_state();
//        test_gravity_reading();
    }
}