|
@@ -192,7 +192,7 @@ static void UartTask(void* arg)
|
|
|
}
|
|
|
}
|
|
|
//限制充电测试
|
|
|
- if((battSOC>=95)&&(BattWorkStateDelay ==0x02)&&(((UartReadMsg.data[(0x1B+BATT_CELL_VOL_NUM+BATT_TEMP_NUM+BATT_OTHER_TEMP_NUM)*2+1])&0x02)!=0x00)&&(UartBattInfoRecvFlag==TRUE))//try to lock lock the charge
|
|
|
+ if((maxCellVol>4170&&maxCellVol<6000)&&(BattWorkStateDelay ==0x02)&&(((UartReadMsg.data[(0x1B+BATT_CELL_VOL_NUM+BATT_TEMP_NUM+BATT_OTHER_TEMP_NUM)*2+1])&0x02)!=0x00)&&(UartBattInfoRecvFlag==TRUE))//try to lock lock the charge
|
|
|
{
|
|
|
#ifdef USING_PRINTF
|
|
|
printf("[%d]try to lock charge \n",__LINE__);
|
|
@@ -202,7 +202,7 @@ static void UartTask(void* arg)
|
|
|
UartWriteData.Data[1] = 0x00|((UartReadMsg.data[(0x1B+BATT_CELL_VOL_NUM+BATT_TEMP_NUM+BATT_OTHER_TEMP_NUM)*2+1])&0x01);
|
|
|
osMessageQueuePut(UartWriteCmdHandle,&UartWriteData,0,0);
|
|
|
}
|
|
|
- else if((battSOC<=90)&&(((UartReadMsg.data[(0x1B+BATT_CELL_VOL_NUM+BATT_TEMP_NUM+BATT_OTHER_TEMP_NUM)*2+1])&0x02)!=0x02)&&(UartBattInfoRecvFlag==TRUE))//try to unlock lock the charge
|
|
|
+ else if((maxCellVol<4100&&maxCellVol>0)&&(((UartReadMsg.data[(0x1B+BATT_CELL_VOL_NUM+BATT_TEMP_NUM+BATT_OTHER_TEMP_NUM)*2+1])&0x02)!=0x02)&&(UartBattInfoRecvFlag==TRUE))//try to unlock lock the charge
|
|
|
{
|
|
|
#ifdef USING_PRINTF
|
|
|
printf("[%d]try to unlock charge \n",__LINE__);
|