【V3.0.0.13】 增加了唤醒源观测和BCU初始值修改

inc/AppConfig.h

@@ -11,9 +11,9 @@
 #define BMS_MANUFACTURE             (2)                 //BMS制造商表示1-超力源，2-美顺
 #define BMS_INFO                    (3)                 //1-1表示超力源4830，1-2表示超力源6060，2-1表示美顺4830,2-2表示美顺6060 2-3表示美顺7250
 #define DATA_MODULE_TYPE            (1)                 //1表示NB模块，2表示4G cat1
-#define EOLSTATE                    (1)                 //1表示下线检测跳过，使用默认值，0表示使用下线检测
+#define EOLSTATE                    (0)                 //1表示下线检测跳过，使用默认值，0表示使用下线检测
 #define DEFAULT_SN                  "RRRRRR0000000003" //默认上传的SN编码
-#define	APPSWVERSION		        0x0300000C          //数据模块软件版本号
+#define	APPSWVERSION		        0x0300000D          //数据模块软件版本号
 
 #define TCP_ADD                     "iotp.fast-fun.cn"  //数据上传的地址
 #define TCP_PORT					8712                //数据上传的端口

src/AppFunc.c

@@ -1342,8 +1342,8 @@ static void setDefaultBcuDataInfo(void)
     BcuDataInfo.appDataModify = false;  
 	memset(BcuDataInfo.blcv_Q_totalCpE, 0x00, 28*sizeof(UINT32));          
 	memset(BcuDataInfo.blcv_Q_reqCpE, 0x00, 28*sizeof(UINT16));
-    BcuDataInfo.socd_pct_bcuSocE = 0;            
-    BcuDataInfo.socd_pct_battSocE = 0;           
+    BcuDataInfo.socd_pct_bcuSocE = 1200;            
+    BcuDataInfo.socd_pct_battSocE = 1200;           
     BcuDataInfo.sohd_tm_chrgStartStatE = 0;      
     BcuDataInfo.sohd_flg_chrgEndE = 0; 
 	BcuDataInfo.sohv_Q_cellCapArrE[28];

src/AppTaskMain.c

@@ -167,10 +167,13 @@ static void MainTask(void* arg)
                 #endif
                 if((SleepTimerEnd)||(TCPWorkState==1)||(PadInterrupt_clrCounter>=3))//从监听转换为工作的条件
                 {
-                    #ifdef USING_PRINTF
+                    #ifdef USING_PRINTF1
                         printf("[%d]-%x",__LINE__,battWorkState);
                         printf("[%d]%x - %x - %x - %x - %x-%d\n",__LINE__,WorkTimerEnd,BMS_Fota_update_flag,TCPWorkState,BattWorkStateDelay,Temp,PadInterrupt_clrCounter);
                     #endif
+                    #ifdef DEBUGLOG
+                        Debug_printf("WORK:%d,%d\n",PadInterrupt_clrCounter,PadInterrupt);
+                    #endif
                     PROC_MAIN_STATE_SWITCH(PROCESS_STATE_IDLE);
                     xTimerStop(sleep_timer,0);
                     SleepTimerEnd = FALSE;

src/AppTaskTcp.c

@@ -239,7 +239,6 @@ static void TcpDataInfoAssembleSend()
     UINT16 year;
     UINT8 month,day,hour,minute,sec;
     UTC8TimeType UTC8TimeTcp;
-	UINT8 i = 0;
 	INT16 len = -1;
     UINT8 *SendBuffer = NULL;
     //电池工作模式的延迟转换由Maintask负责，发送频率调节由tcp负责
@@ -348,7 +347,7 @@ static void TcpDataInfoAssembleSend()
         *(SendBuffer + 52 ) = (battBalanceoInfo>>8)&0xFF;
         *(SendBuffer + 53 ) = battBalanceoInfo&0xFF;          //均衡状态-51-54
         *(SendBuffer + 54 ) = AppDataInfo.BattCellCount;             //电压个数-55
-        for(i=0;i<AppDataInfo.BattCellCount;i++)                     //单体电压 
+        for(UINT8 i=0;i<AppDataInfo.BattCellCount;i++)                     //单体电压 
 		{
 			*(SendBuffer + 54 + i*2 + 1)  = (battCellU[i]>>8) & 0xFF;
 			*(SendBuffer + 54 + i*2 + 2) = battCellU[i] & 0xFF;
@@ -424,7 +423,7 @@ static void TcpDataInfoAssembleSend()
         GpsToTcpInfo.gpsInfo.msgCollectionTimeUTC[3] = UTC8TimeTcp.hour & 0xFF; 						    //hour
         GpsToTcpInfo.gpsInfo.msgCollectionTimeUTC[4] = UTC8TimeTcp.minute & 0xFF;						    //mins
         GpsToTcpInfo.gpsInfo.msgCollectionTimeUTC[5] = UTC8TimeTcp.second & 0xFF;
-        osStatus_t ret = osMessageQueueGet(GpsRecvHandle,(UINT8 *)&GpsRecvData,0,100);
+        osStatus_t ret = osMessageQueueGet(GpsRecvHandle,(UINT8 *)&GpsRecvData,0,1000);
         if(ret == 0)
         {
             memcpy((UINT8 *)&GpsToTcpInfo.gpsInfo.GpsInfoData, (UINT8 *)&GpsRecvData,sizeof(GPSInfo));
@@ -611,7 +610,7 @@ static void TcpDataInfoAssembleSend()
             send_counter++;
             return;
         }
-        else if(BufferLen>200)
+        else if(BufferLen>200U&&BufferLen!=0xFFFFU)
         {
             Debug_Del_Logfile();
             #ifdef DEBUGLOG

src/bsp_custom.c

@@ -271,8 +271,8 @@ void Pad1_WakeupIntHandler(void)
     }
     else
     {
-        #ifdef USING_PRINTF1
-        printf("-[%d]\n",__LINE__);
+        #ifdef USING_PRINTF
+        printf("Pad1-[%d]\n",__LINE__);
         #endif
         setbit(PadInterrupt,1);
     }