Browse Source

2.3.0.33 取消soc大于90不睡眠,增加充电器连接不睡眠

CHENJIE-PC\QiXiang_CHENJIE 3 years ago
parent
commit
5fa6598873
4 changed files with 5 additions and 5 deletions
  1. 1 1
      inc/app.h
  2. 1 1
      src/MainTask.c
  3. 1 1
      src/Signal.c
  4. 2 2
      src/TcpTask.c

+ 1 - 1
inc/app.h

@@ -51,7 +51,7 @@ 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		0x02030020
+#define	APPSWVERSION		0x02030021
 //#define	APPSWVERSION		0x0201000E
 //--------------------------------------------------------------------------------
 

+ 1 - 1
src/MainTask.c

@@ -269,7 +269,7 @@ static void MainTask(void* arg)
                 #ifdef USING_PRINTF1
                     printf("TcpService:%d,UDSSwitch:%d,BMS_Fota_update_flag:%d,battWorkState:%d,Can_Msg_Enble:%d\r\n",TcpService,UDSSwitch,BMS_Fota_update_flag,battWorkState,Can_Msg_Enble);
                 #endif	
-                if(TcpService!=0x00||UDSSwitch==1||BMS_Fota_update_flag||battWorkState!=0||CanMsgFlag==0x01||battSOC>=90)
+                if(TcpService!=0x00||UDSSwitch==1||BMS_Fota_update_flag||battWorkState!=0||CanMsgFlag==0x01||chargerConnectState==0x01)
                 {
                     xTimerReset(work_timer,0);
                 }

+ 1 - 1
src/Signal.c

@@ -50,7 +50,7 @@ UINT8	battWorkState = 0xFF;
 UINT8	bmsSwVersion = 0xFF;
 UINT8	bmsHwVersion = 0xFF;
 UINT8	battMOSSwitchState = 0xFF;
-UINT8	battHeatEnableState = 0xFF;
+UINT8	battHeatEnableState = 0x00;
 UINT8   RelayControlState = 0x00;
 UINT8	BuzzerControl = 0x00;
 UINT8   CanMsgFlag = 0x00;

+ 2 - 2
src/TcpTask.c

@@ -585,8 +585,8 @@ static void TcpDataInfoAssembleSend()
         UINT8 *SendBuffer = NULL;
         UINT8 BufferLen = 0;
         UINT8 rbuf[100];
-        sprintf((char *)rbuf,"%d,%x,%x,%d,%d,%d,%d,---%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x",
-        Data_Current,BattRemainCap,battProtectState,SOC2,SOC1,battSOC,AppDataInfo.RelayControl,
+        sprintf((char *)rbuf,"%d,%x,%x,%d,%d,%d,%d,%d,,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x",
+        Data_Current,BattRemainCap,battProtectState,SOC2,SOC1,battSOC,AppDataInfo.RelayControl,chargerConnectState,
         Data_33,Data_34,Data_35,Data_37,Data_38,Data_39,Data_3A,Data_3B,Data_3C,Data_3D,Data_3E,Data_3F,Data_40,Data_41,Data_42,Data_43);//累计里程,剩余容量,保护状态,BMS-SOC,acc_soc,disp-soc,relay,
         BufferLen  = strlen(rbuf);
         SendBuffer = malloc(BufferLen+sizeof(DebugMsgInfo));