|
@@ -17,7 +17,7 @@ void BMS_InfoUpdate(void)
|
|
|
else
|
|
|
PeriodCnt = HAL_GetTick();
|
|
|
//仅主电池打开
|
|
|
- if((BMS_Magene_TPDOInfo_Main.BatStInfo.State == 1) && (BMS_Magene_TPDOInfo_Back.BatStInfo.State == 0))
|
|
|
+ if((BMS_Magene_TPDOInfo_Main.BaseInfo.WorkState == 2) && (BMS_Magene_TPDOInfo_Back.BaseInfo.WorkState != 2))
|
|
|
{
|
|
|
//运行信息
|
|
|
BMS_RunInfo.Voltage = BMS_Magene_TPDOInfo_Main.BaseInfo.Voltage;
|
|
@@ -74,7 +74,7 @@ void BMS_InfoUpdate(void)
|
|
|
BMS_UsrLog.MaxChgTime = BMS_Magene_TPDOInfo_Main.StaInfo.MaxChargeTime;
|
|
|
}
|
|
|
//仅副电池打开
|
|
|
- else if((BMS_Magene_TPDOInfo_Main.BatStInfo.State == 0) && (BMS_Magene_TPDOInfo_Back.BatStInfo.State == 1))
|
|
|
+ else if((BMS_Magene_TPDOInfo_Main.BaseInfo.WorkState != 2) && (BMS_Magene_TPDOInfo_Back.BaseInfo.WorkState == 2))
|
|
|
{
|
|
|
//运行信息
|
|
|
BMS_RunInfo.Voltage = BMS_Magene_TPDOInfo_Back.BaseInfo.Voltage;
|
|
@@ -131,7 +131,7 @@ void BMS_InfoUpdate(void)
|
|
|
BMS_UsrLog.MaxChgTime = BMS_Magene_TPDOInfo_Back.StaInfo.MaxChargeTime;
|
|
|
}
|
|
|
//主副电池同时打开
|
|
|
- else if((BMS_Magene_TPDOInfo_Main.BatStInfo.State == 1) && (BMS_Magene_TPDOInfo_Back.BatStInfo.State == 1))
|
|
|
+ else if((BMS_Magene_TPDOInfo_Main.BaseInfo.WorkState == 2) && (BMS_Magene_TPDOInfo_Back.BaseInfo.WorkState == 2))
|
|
|
{
|
|
|
//暂不考虑
|
|
|
}
|
|
@@ -167,7 +167,7 @@ void BMS_CanProcess(BMS_Magene_CanData_Struct_t* CanData)
|
|
|
{
|
|
|
if(CanData->Data[0] == BMS_MAGENE_STATUS_PAGE_ID) //识别PageID
|
|
|
{
|
|
|
- memcpy((uint8_t*)CanData->Data + 2, (uint8_t*)&BMS_Magene_TPDOInfo_Main.BaseInfo.PageID + (CanData->Data[1] - 9) * 8 + 2, 6);
|
|
|
+ memcpy((uint8_t*)&BMS_Magene_TPDOInfo_Main.BaseInfo.PageID + (CanData->Data[1] - 9) * 8 + 2, (uint8_t*)CanData->Data + 2, 6); //起始状态码为0x09
|
|
|
}
|
|
|
BMS_Magene_OnLineCheck_Main.OnLineFlag = 1;
|
|
|
BMS_Magene_OnLineCheck_Main.TimeCnt = HAL_GetTick();
|
|
@@ -176,7 +176,7 @@ void BMS_CanProcess(BMS_Magene_CanData_Struct_t* CanData)
|
|
|
{
|
|
|
if(CanData->Data[0] == BMS_MAGENE_STATUS_PAGE_ID) //识别PageID
|
|
|
{
|
|
|
- memcpy((uint8_t*)CanData->Data + 2, (uint8_t*)&BMS_Magene_TPDOInfo_Back.BaseInfo.PageID + (CanData->Data[1] - 9) * 8 + 2, 6);
|
|
|
+ memcpy((uint8_t*)&BMS_Magene_TPDOInfo_Back.BaseInfo.PageID + (CanData->Data[1] - 9) * 8 + 2, (uint8_t*)CanData->Data + 2, 6); //起始状态码为0x09
|
|
|
}
|
|
|
BMS_Magene_OnLineCheck_Back.OnLineFlag = 1;
|
|
|
BMS_Magene_OnLineCheck_Back.TimeCnt = HAL_GetTick();
|