Selaa lähdekoodia

版本号为;1.2.2.6,更换了数据模块后,测试正常,无重启,无异常睡眠

CHENJIE-PC\QiXiang_CHENJIE 3 vuotta sitten
vanhempi
commit
fa235c9dba
4 muutettua tiedostoa jossa 15 lisäystä ja 10 poistoa
  1. 2 2
      inc/app.h
  2. 2 1
      src/CANTask.c
  3. 9 6
      src/MainTask.c
  4. 2 1
      src/UartTask.c

+ 2 - 2
inc/app.h

@@ -15,7 +15,7 @@ extern "C" {
 //全局定义声明区
 #define BMS_MANUFACTURE (1) //BMS制造商表示1-超力源,2-美顺
 #define DATA_MODULE_TYPE (1) //1表示NB模块,2表示4G cat1
-#define BMS_INFO  (2)       //1-1表示超力源4830,1-2表示超力源6060,2-1表示美顺6455
+#define BMS_INFO  (1)       //1-1表示超力源4830,1-2表示超力源6060,2-1表示美顺6455
 
 #if  BMS_MANUFACTURE==1
     #if BMS_INFO==1
@@ -43,7 +43,7 @@ extern "C" {
 #define HWVERSION		    0x0102    //硬件主版本,现为V1.2板
 #define	BLSWVERSION		0x01020000    //BootLoader版本号V1.2.0.0
 #define	DRVSWVERSION		0x01040000     //驱动层版本号V1.4.0.0
-#define	APPSWVERSION		0x01020205     
+#define	APPSWVERSION		0x01020206     
 //#define	APPSWVERSION		0x02000005
 //--------------------------------------------------------------------------------
 

+ 2 - 1
src/CANTask.c

@@ -129,7 +129,8 @@ static void Can_Receive()
 	            while(true)
 	            {
 	                osDelay(60000/portTICK_PERIOD_MS);
-	            }	            
+	            }
+				osThreadExit();	            
 	            break;
 	       }
 	   }

+ 9 - 6
src/MainTask.c

@@ -98,7 +98,7 @@ static void MainTask(void* arg)
     #endif
 	appGetNVMSavedData();
     LoadAppDataInfo();
-    #ifdef USING_PRINTF
+    #ifdef USING_PRINTF1
     UINT8 *pReadAppConfig;
     UINT32 readCount;
     //AppConfigHeader    AppConfigHr;
@@ -146,11 +146,11 @@ static void MainTask(void* arg)
 	AdcSendReq(ADC_REQ_BITMAP_INRES_CALI,&param,1,ADC_GET_RESULT_TIMOUT);
 
 	
-	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_OFF);
+	// 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_OFF);
     PROC_MAIN_STATE_SWITCH(PROCESS_STATE_IDLE);
     while(true)
     {
@@ -241,6 +241,9 @@ static void MainTask(void* arg)
                     sleeptime_count++;
                     if(sleeptime_count>10)
                     {
+                        #ifdef USING_PRINTF
+                            printf("sleeptime_count :%d \n",sleeptime_count);
+                        #endif
                         EC_SystemReset();
                     }
                 }

+ 2 - 1
src/UartTask.c

@@ -128,7 +128,7 @@ static void UartTask(void* arg)
                 else if(Timer_count%10==0)
                 {
                     #ifdef USING_PRINTF
-                        printf("[%d]Uart Timer 5s:%d\n",__LINE__,Timer_count);
+                        printf("[%d]Uart Timer 5s:%d,Header:%x\n",__LINE__,Timer_count,UartReadMsg.Header[2]);
                     #endif
                     if(osMessageQueueGet(UartWriteCmdHandle,&UartWriteData,0,0)==osOK)
                     {
@@ -236,6 +236,7 @@ static void UartTask(void* arg)
                 {
                     osDelay(60000/portTICK_PERIOD_MS);
                 }
+				osThreadExit();
                 break;
             }
         }