版本号为1.3.0.1，修改：1.锁定Bug修改，2.修改为4830版本

inc/app.h

@@ -13,7 +13,7 @@
 extern "C" {
 #endif
 //全局定义声明区
-#define BMS_MANUFACTURE (2) //BMS制造商表示1-超力源，2-美顺
+#define BMS_MANUFACTURE (1) //BMS制造商表示1-超力源，2-美顺
 #define DATA_MODULE_TYPE (1) //1表示NB模块，2表示4G cat1
 #define BMS_INFO  (1)       //1-1表示超力源4830，1-2表示超力源6060，2-1表示美顺6455
 
@@ -44,7 +44,7 @@ extern "C" {
 #define	BLSWVERSION		0x01020000    //BootLoader版本号V1.2.0.0
 #define	DRVSWVERSION		0x01040000     //驱动层版本号V1.4.0.0
 //#define	APPSWVERSION		0x01020208     
-#define	APPSWVERSION		0x02000007
+#define	APPSWVERSION		0x01030001
 //--------------------------------------------------------------------------------
 
 #define APP_CONFIG_FILE_LATEST_VERSION 0

src/MainTask.c

@@ -38,7 +38,7 @@
 extern UINT8 	UDSSwitch;
 extern volatile bool NB_Fota_update_flag;
 extern volatile bool BMS_Fota_update_flag;
-CHAR defaultBattSN[BATT_SN_LEN] = "GYTEST00000000003";//未进行下线检测的默认SN
+CHAR defaultBattSN[BATT_SN_LEN] = "GY483000000000003";//未进行下线检测的默认SN
 //全局变量
 UINT32 Timer_count;//每100ms加1
 volatile BOOL Sleep_flag = false;//睡眠标志位
@@ -159,11 +159,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)
     {

src/UartTask.c

@@ -160,13 +160,13 @@ static void UartTask(void* arg)
 						battSOCDisplay();
 						battErrorStateDisplay();
 					}
-					else
-					{
-						#ifdef USING_PRINTF
-							printf("battWarningStateDisplay\n");
-						#endif
-						battWarningStateDisplay();
-					}
+					// else
+					// {
+					// 	#ifdef USING_PRINTF
+					// 		printf("battWarningStateDisplay\n");
+					// 	#endif
+					// 	battWarningStateDisplay();
+					// }
 				}
 				currentTimerCount = Timer_count;
 				if(BMS_Fota_update_flag)
@@ -179,6 +179,7 @@ static void UartTask(void* arg)
 					UartWriteData.Data[0] = 0x00;
 					UartWriteData.Data[1] = 0x00;
 					osMessageQueuePut(UartWriteCmdHandle,&UartWriteData,0,1000);
+					PROC_UART_STATE_SWITCH(PROCESS_UART_STATE_READ);
 				}
 				else if (AppNVMData.isBattLocked==FALSE && ((UartReadMsg.data[(0x09+BATT_CELL_VOL_NUM+BATT_TEMP_NUM+2)*2+1])>>1)&0x03==0x00)
 				{
@@ -186,6 +187,7 @@ static void UartTask(void* arg)
 					UartWriteData.Data[0] = 0x00;
 					UartWriteData.Data[1] = 0x03;
 					osMessageQueuePut(UartWriteCmdHandle,&UartWriteData,0,1000);
+					PROC_UART_STATE_SWITCH(PROCESS_UART_STATE_READ);
 				}
                 break;
             }
@@ -503,7 +505,7 @@ UINT8 Uart_DataRecv_func(UINT8* Uart_Read_Msg,UINT8* Uart_Recv_Buffer)
     *(Uart_Read_Msg+6) = CRC_chk_buffer;
     *(Uart_Read_Msg+7)  = CRC_chk_buffer>>8;
     USARTdrv->Send(Uart_Read_Msg,8);
-    #ifdef USING_PRINTF1
+    #ifdef USING_PRINTF
         printf("Uart_Send_buffer:  ");
         for(int i=0;i<8;i++)
         {
@@ -529,7 +531,7 @@ UINT8 Uart_DataRecv_func(UINT8* Uart_Read_Msg,UINT8* Uart_Recv_Buffer)
             }
         } 
     }
-     #ifdef USING_PRINTF1
+     #ifdef USING_PRINTF
          printf("Uart_Rece_buffer1: ");
          for(int i=0;i<Data_Len;i++)
          {