Просмотр исходного кода

北京测试:修改了默认下线检测通过,默认编号为北京6060-001,版本号为:1.2.1.12,如更改为北京正式版,需变更:1.服务器地址,2.BAT6060型号,3.做好版本记录便于刷写更新

CHENJIE-PC\QiXiang_CHENJIE 3 лет назад
Родитель
Сommit
23a8ae8545
2 измененных файлов с 5 добавлено и 5 удалено
  1. 2 2
      inc/app.h
  2. 3 3
      src/MainTask.c

+ 2 - 2
inc/app.h

@@ -16,7 +16,7 @@ extern "C" {
 #define BMS_MANUFACTURE (1) //BMS制造商表示1-超力源,2-美顺
 #define DATA_MODULE_TYPE (1) //1表示NB模块,2表示4G cat1
 #define BAT4830
-//#define BAT6060
+//#define BAT6060  电池型号变化需要更改
 #ifdef  BAT4830
     #define BATT_CELL_VOL_NUM  (14)
     #define BATT_TEMP_NUM  (3)
@@ -34,7 +34,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		0x0102010B      
+#define	APPSWVERSION		0x0102010C     
 
 //--------------------------------------------------------------------------------
 

+ 3 - 3
src/MainTask.c

@@ -34,7 +34,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] = "GY606000000000001";//未进行下线检测的默认SN
 //全局变量
 UINT32 Timer_count;//每100ms加1
 volatile bool Sleep_flag = false;//睡眠标志位
@@ -590,13 +590,13 @@ static void setDefaultAppDataValue(void)
 	}
 	AppNVMData.isBattLocked = false;
 	AppNVMData.chargEndWorkTime = 30;  //30 min
-	AppNVMData.wakeupWorkTime = 5;	//2min
+	AppNVMData.wakeupWorkTime = 2;	//2min
 	AppNVMData.sleepTime = 5;			//5min
     AppNVMData.HwVersion = HWVERSION;
     AppNVMData.BLSwVersion = BLSWVERSION;
     AppNVMData.DrvSwVersion = DRVSWVERSION;
     AppNVMData.AppSwVersion = APPSWVERSION;
-    AppNVMData.EOLState = 0; //未进行下线配置
+    AppNVMData.EOLState = 1; //未进行下线配置,北京电池测试默认进行下线测试
     return;
 }