版本号为：2.1.0.0，力神10套样件所使用程序

inc/TcpTask.h

@@ -21,11 +21,11 @@ extern UINT32 TcpService;
 #define CHRG_END_DELAY    (300)
 #define RUN_END_DELAY    (100)
 
-// #define QX_TCP_IPADRRES				"47.97.127.222"
-// #define QX_TCP_PORT					8712
-/*---------------测试IP地址-----------------------------------*/
-#define QX_TCP_IPADRRES				"39.103.177.126"
+#define QX_TCP_IPADRRES				"47.97.127.222"
 #define QX_TCP_PORT					8712
+/*---------------测试IP地址-----------------------------------*/
+// #define QX_TCP_IPADRRES				"39.103.177.126"
+// #define QX_TCP_PORT					8712
 // #define QX_TCP_IPADRRES				"120.26.68.165"
 // #define QX_TCP_PORT					14319
 /*---------------测试IP地址END-----------------------------------*/

inc/app.h

@@ -16,6 +16,7 @@ extern "C" {
 #define BMS_MANUFACTURE (2) //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
+#define EOLSTATE (0) //1标识下线检测跳过，使用默认值
 
 #if  BMS_MANUFACTURE==1
     #if BMS_INFO==1
@@ -42,9 +43,9 @@ 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		0x0200000B
+#define	DRVSWVERSION		0x01050000     //驱动层版本号V1.4.0.0  驱动层1.5.0.0，增加了三轴
+//#define	APPSWVERSION		0x01020208     
+#define	APPSWVERSION		0x02010000
 //--------------------------------------------------------------------------------
 
 #define APP_CONFIG_FILE_LATEST_VERSION 0

src/MainTask.c

@@ -33,8 +33,6 @@
 #include "UartTask.h"
 #include "sensor.h"
 
-#define EOLSTATE (1) //1标识下线检测跳过，使用默认值
-
 extern UINT8 	UDSSwitch;
 extern volatile bool NB_Fota_update_flag;
 extern volatile bool BMS_Fota_update_flag;

src/TcpTask.c

@@ -237,6 +237,10 @@ static void TcpDataInfoAssembleSend()
     UINT8 BattSendFreq=6;
     UINT8 GpsSendFreq=1;
     UINT8 WorkState=0;
+
+    UINT16 year;
+    UINT8 month,day,hour,minite,sec;
+    UTC8TimeType UTC8TimeTcp;
     static UINT8 WorkFlag=0;
 	int i = 0;
 	INT8 len = -1;
@@ -290,9 +294,7 @@ static void TcpDataInfoAssembleSend()
         BattToTcpInfo.encryptMethod = TCP_ENCPT_DISABLE; //not encrypt
 	    BattToTcpInfo.dataLength[0] = (DataLen>>8) & 0xFF;
 	    BattToTcpInfo.dataLength[1] = DataLen & 0xFF;
-        UINT16 year;
-        UINT8 month,day,hour,minite,sec;
-        UTC8TimeType UTC8TimeTcp;
+       
         year=(TimeStracture.UTCtimer1&0xffff0000)>>16;
         month=(TimeStracture.UTCtimer1&0xff00)>>8;
         day=TimeStracture.UTCtimer1&0xff;
@@ -300,7 +302,7 @@ static void TcpDataInfoAssembleSend()
         minite=(TimeStracture.UTCtimer2&0xff0000)>>16;
         sec=(TimeStracture.UTCtimer2&0xff00)>>8;
         UTCToBeijing((UTC8TimeType *)&UTC8TimeTcp,year,month,day,hour,minite,sec);
-        #ifdef USING_PRINTF
+        #ifdef USING_PRINTF1
             printf("year:%x\n",year);
             printf("year:%x,month:%d,day:%d,hour:%d,minute:%d,second:%d\n",UTC8TimeTcp.year,UTC8TimeTcp.month,UTC8TimeTcp.day,UTC8TimeTcp.hour,UTC8TimeTcp.minute,UTC8TimeTcp.second);
         #endif

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
     };