Browse Source

测试版本,只亮LED

CHENJIE-PC\QiXiang_CHENJIE 3 years ago
parent
commit
36cbe78557
3 changed files with 9 additions and 10 deletions
  1. 1 6
      src/GpsTask.c
  2. 6 2
      src/MainTask.c
  3. 2 2
      src/app.c

+ 1 - 6
src/GpsTask.c

@@ -90,11 +90,6 @@ static void GpsTask(void* arg)
                     if (strcmp(databuffer[1],"V")==0|strcmp(databuffer[2],"V")==0)
                     {
                         memset(GpsData,0x00,sizeof(GpsData));
-                        NetSocDisplay(LED_SOC_0,LED_TURN_OFF);
-                        NetSocDisplay(LED_SOC_1,LED_TURN_OFF);
-                        NetSocDisplay(LED_SOC_2,LED_TURN_OFF);
-                        NetSocDisplay(LED_SOC_3,LED_TURN_OFF);
-                        FaultDisplay(LED_TURN_ON);
                     }
                     else if (strcmp(databuffer[2],"A")==0)
                     {
@@ -102,7 +97,7 @@ static void GpsTask(void* arg)
                         NetSocDisplay(LED_SOC_1,LED_TURN_ON);
                         NetSocDisplay(LED_SOC_2,LED_TURN_ON);
                         NetSocDisplay(LED_SOC_3,LED_TURN_ON);
-                        FaultDisplay(LED_TURN_OFF);
+                        FaultDisplay(LED_TURN_ON);
                         GpsData[0] = 0x01;//有效,东经,北纬写定
                         GpsData[1] = 03;//卫星数目写入1
                         strdel(databuffer[3],'.');

+ 6 - 2
src/MainTask.c

@@ -162,7 +162,11 @@ static void MainTask(void* arg)
 	/***calibrate the ADC Collect***/
 	AdcSendReq(ADC_REQ_BITMAP_VBAT_CALI,&param,1,ADC_GET_RESULT_TIMOUT);						
 	AdcSendReq(ADC_REQ_BITMAP_INRES_CALI,&param,1,ADC_GET_RESULT_TIMOUT);
-	
+	NetSocDisplay(LED_SOC_0,LED_TURN_ON);
+    NetSocDisplay(LED_SOC_1,LED_TURN_ON);
+    NetSocDisplay(LED_SOC_2,LED_TURN_ON);
+    NetSocDisplay(LED_SOC_3,LED_TURN_ON);
+    FaultDisplay(LED_TURN_ON);
     PROC_MAIN_STATE_SWITCH(PROCESS_STATE_IDLE);
     while(true)
     {
@@ -246,7 +250,7 @@ static void MainTask(void* arg)
                 //     Can_Msg_Enble = false;
                 // }
                 // if(BattChrgEndFlag)
-                if(GsensorEnable)
+                if(1)
                 {
                     //xTimerChangePeriod(work_timer,AppNVMData.chargEndWorkTime*60*1000 / portTICK_RATE_MS,0);
                     xTimerReset(work_timer,0);

+ 2 - 2
src/app.c

@@ -36,9 +36,9 @@ void appInit(void *arg)
     MainTaskInit(arg);
     //AdcTaskInit();
     //UartTaskInit(arg);
-    GpsTaskInit();
+    //GpsTaskInit();
 	//CANTaskInit(arg);
-    TcpTaskInit(arg);
+    //TcpTaskInit(arg);
 }
 //主函数入口
 void main_entry(void)