Browse Source

版本号为:2.0.1.2,GY-里程测试

CHENJIE-PC\QiXiang_CHENJIE 3 years ago
parent
commit
7905800a8a
4 changed files with 7 additions and 8 deletions
  1. 4 4
      inc/app.h
  2. 1 1
      src/GpsTask.c
  3. 1 2
      src/MainTask.c
  4. 1 1
      src/bsp_custom.c

+ 4 - 4
inc/app.h

@@ -13,9 +13,9 @@
 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
+#define BMS_INFO  (2)       //1-1表示超力源4830,1-2表示超力源6060,2-1表示美顺6455
 #define EOLSTATE (0) //1标识下线检测跳过,使用默认值
 
 #if  BMS_MANUFACTURE==1
@@ -45,8 +45,8 @@ extern "C" {
 #define	BLSWVERSION		0x01020000    //BootLoader版本号V1.2.0.0
 #define	DRVSWVERSION		0x01050000     //驱动层版本号V1.4.0.0  驱动层1.5.0.0,增加了三轴
 //#define	APPSWVERSION		0x01020209     
-//#define	APPSWVERSION		0x02000101
-#define	APPSWVERSION		0x02010003
+#define	APPSWVERSION		0x02000102
+//#define	APPSWVERSION		0x02010003
 //--------------------------------------------------------------------------------
 
 #define APP_CONFIG_FILE_LATEST_VERSION 0

+ 1 - 1
src/GpsTask.c

@@ -121,7 +121,7 @@ static void GpsTask(void* arg)
                         GpsData[2] = 0xff;
                         GpsData[3] = 0xfe;
                     }
-                    if(speedtemp>=1)
+                    if(speedtemp>=30 && speedtemp<=1500)
                     {
                         AppDataInfo.appDataModify = true;
                         AppDataInfo.AccMileage = speedtemp/36 + AppDataInfo.AccMileage;

+ 1 - 2
src/MainTask.c

@@ -275,8 +275,7 @@ static void MainTask(void* arg)
                     printf("which slpstate can go now :%d \n",slpstate);
                 #endif
                 #ifdef DEBUGLOG
-                    Debug_printf("AccM-%d  \n",AppDataInfo.AccMileage);
-                    Debug_printf("slp-%d  \n",slpstate);
+                    Debug_printf("slp-%d,AccM-%d  \n",slpstate,AppDataInfo.AccMileage);
                 #endif
                 slpManDeepSlpTimerStart(deepslpTimerID, AppNVMData.sleepTime*1000*60);
                 UINT8 sleeptime_count=0;

+ 1 - 1
src/bsp_custom.c

@@ -126,7 +126,7 @@ static void PMU_WakeupPadInit(void)
 {
     const padWakeupSettings_t cfg =
     {
-        false, true,             // group0 posedge, negedge
+        true, false,             // group0 posedge, negedge
         true, true,             // group1 posedge, negedge
         true, true,             // group2 posedge, negedge
     };