Browse Source

版本号:1.3.0.0, 对北京6060-001进行适应性修改。

CHENJIE-PC\QiXiang_CHENJIE 4 years ago
parent
commit
74d8a3710e
3 changed files with 9 additions and 9 deletions
  1. 3 3
      inc/app.h
  2. 2 2
      src/MainTask.c
  3. 4 4
      src/bsp_custom.c

+ 3 - 3
inc/app.h

@@ -24,7 +24,7 @@ extern "C" {
         #define BATT_OTHER_TEMP_NUM  (2)
     #elif BMS_INFO==2
         #define BATT_CELL_VOL_NUM  (17)
-        #define BATT_TEMP_NUM  (4)
+        #define BATT_TEMP_NUM  (5)
         #define BATT_OTHER_TEMP_NUM  (2)
     #endif
 #elif  BMS_MANUFACTURE==2
@@ -43,8 +43,8 @@ extern "C" {
 #define HWVERSION		    0x0102    //硬件主版本,现为V1.2板
 #define	BLSWVERSION		0x01020000    //BootLoader版本号V1.2.0.0
 #define	DRVSWVERSION		0x01040000     //驱动层版本号V1.4.0.0
-//#define	APPSWVERSION		0x01020208     
-#define	APPSWVERSION		0x02000007
+#define	APPSWVERSION		0x01030000     
+//#define	APPSWVERSION		0x02000007
 //--------------------------------------------------------------------------------
 
 #define APP_CONFIG_FILE_LATEST_VERSION 0

+ 2 - 2
src/MainTask.c

@@ -35,7 +35,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;//睡眠标志位
@@ -624,7 +624,7 @@ static void setDefaultAppDataValue(void)
     AppNVMData.BLSwVersion = BLSWVERSION;
     AppNVMData.DrvSwVersion = DRVSWVERSION;
     AppNVMData.AppSwVersion = APPSWVERSION;
-    AppNVMData.EOLState = 0; //未进行下线配置,北京电池测试默认进行下线测试
+    AppNVMData.EOLState = 1; //未进行下线配置,北京电池测试默认进行下线测试
     return;
 }
 

+ 4 - 4
src/bsp_custom.c

@@ -120,7 +120,7 @@ static void PMU_WakeupPadInit(void)
 {
     const padWakeupSettings_t cfg =
     {
-        true, false,             // group0 posedge, negedge
+        false, true,             // group0 posedge, negedge
         true, true,             // group1 posedge, negedge
         true, true,             // group2 posedge, negedge
     };
@@ -164,11 +164,11 @@ void BSP_CustomInit(void)
 	slpManGetPMUSettings();				
 
 	PMU_WakeupPadInit();
-	NVIC_DisableIRQ(PadWakeup0_IRQn);//can
+	NVIC_EnableIRQ(PadWakeup0_IRQn);//can
 	NVIC_EnableIRQ(PadWakeup1_IRQn);//rx
 	NVIC_EnableIRQ(PadWakeup2_IRQn);//lock
-	NVIC_EnableIRQ(PadWakeup3_IRQn);//gsensor
-	NVIC_EnableIRQ(PadWakeup4_IRQn);//gsensor
+	NVIC_DisableIRQ(PadWakeup3_IRQn);//gsensor
+	NVIC_DisableIRQ(PadWakeup4_IRQn);//gsensor
 	NVIC_DisableIRQ(PadWakeup5_IRQn);//wakeup2
 	CheckLockOutState();
 	slpManStartWaitATTimer();