zhangbo
5 天以前 deaaa18131675b17ef4fa49befa80cfb09778898
keil/include/main/main.c
@@ -48,6 +48,7 @@
#define INACTIVE_TIMEOUT 30
uint8_t input5v_flag=0;
extern uint8_t mUsartReceivePack[100];
extern uint8_t mUsart2ReceivePack[150];
extern uint8_t state5V_prase_flag,gps_prase_flag;
@@ -629,6 +630,10 @@
{
if(read_5v_input_pca())
      {
      if(input5v_flag==0)
    {
     NVIC_SystemReset();
    }
            if(state5v==0)
            {
                state5v=1;
@@ -922,14 +927,15 @@
    boot_deinit();
    board_pins_config();
    gpio_open();
   IIC2_Init();
   Accelerometer_Init();
     IIC2_Init();
     Accelerometer_Init();
//     delay_ms(100);
    BarInit();
//     delay_ms(100);
//   gaodu=GetPressAndHeight();
    PCA9555_init();   
   board_debug_console_open_baud(TRACE_PORT_UART1,BAUD_115200);
     board_debug_console_open_baud(TRACE_PORT_UART1,BAUD_921600);
     pca_input_detection_init(pca_handler);//pca检测输入
//   while(1);
    // Reset reason
    reset_cause_get();
@@ -987,6 +993,7 @@
     delay_ms(500);      
     Set4LEDColor(LEDOFF,LEDOFF,LEDOFF,LEDOFF);       
    }
    g_com_map[MODBUS_MODE] = 0;
    state5v=0;
    state5V_prase_flag=state5v;
@@ -1001,8 +1008,10 @@
    sleep_timer_start(__MS_TO_32K_CNT(SLEEP_TIMER_NUM));//测试
    PCA9555_Set_One_Value_Output(ADC_MINIUS,0);//拉低
    adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
    pca_input_detection_init(pca_handler);//pca检测输入
    gaodu=GetPressAndHeight()*100;
      if(read_init_5v_input_pca())
      {input5v_flag=1;}
    while (1)
    {