|
@@ -45,8 +45,8 @@ ASS_PER_IN ass_CalIn = TORQUE_CAL_IN_DEFAULT;
|
|
|
ASS_PER_COEF ass_CalCoef;
|
|
|
ASS_PER_OUT ass_CalOut;
|
|
|
UWORD LinerAssist[5] = ASS_LINER_TORQUE_DEFAULT;
|
|
|
-SWORD MAF_buffer[64];
|
|
|
-MAF_IN maf_torque = {0, 32, 0, 0, MAF_buffer, 0, FALSE};
|
|
|
+SWORD MAF_buffer[60];
|
|
|
+MAF_IN maf_torque = {0, 30, 0, 0, MAF_buffer, 0, FALSE};
|
|
|
|
|
|
TOR2CURRENT_CAL_COEF ass_Tor2CurCalCoef;
|
|
|
|
|
@@ -405,12 +405,12 @@ void AssitCuvApplPerVolt(void)
|
|
|
/* 启动标志判断 */
|
|
|
if(ass_CalIn.uwtorquePer > ass_CalCoef.uwAssThreshold)
|
|
|
{
|
|
|
- if(CadGpioSta !=Get_CAD_FRE_PORT() )
|
|
|
+ if(CadGpioSta != Get_CAD_FRE_PORT())
|
|
|
{
|
|
|
CadGpioSta = Get_CAD_FRE_PORT();
|
|
|
if(ass_CalIn.uwStartRunPulse < 100)
|
|
|
{
|
|
|
- ass_CalIn.uwStartRunPulse ++;
|
|
|
+ ass_CalIn.uwStartRunPulse++;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -428,9 +428,9 @@ void AssitCuvApplPerVolt(void)
|
|
|
//滞环,不动作
|
|
|
}
|
|
|
//脚踏不动强制关闭
|
|
|
- if((ass_CalIn.uwcadLowStopCnt>=2000) ||(ass_CalIn.uwcadHighStopCnt>=2000))
|
|
|
+ if((ass_CalIn.uwcadLowStopCnt>=200) || (ass_CalIn.uwcadHighStopCnt>=200))
|
|
|
{
|
|
|
- ass_CalIn.uwStartRunPulse=0;
|
|
|
+ ass_CalIn.uwStartRunPulse = 0;
|
|
|
}
|
|
|
|
|
|
if((ass_CalIn.StartAssistEnble == FALSE) && (ass_CalIn.uwStartRunPulse > 1))
|
|
@@ -769,7 +769,7 @@ void AssitCuvApplPerVolt(void)
|
|
|
}
|
|
|
|
|
|
/* 预启动阶段,停机判断 */
|
|
|
- if((ass_CalIn.uwGearSt == 0) || (BikeBrake_blGetstate() == TRUE)||(BMS_RunInfo.Status.Status_Bit.Charge==TRUE)||((ass_CalIn.blStopAssistEnble == TRUE) && (ass_CalIn.StartAssistEnble == FALSE)))
|
|
|
+ if((ass_CalIn.uwGearSt == 0) || (BikeBrake_blGetstate() == TRUE) || (BMS_RunInfo.Status.Status_Bit.Charge==TRUE) || (ass_CalIn.blStopAssistEnble == TRUE))
|
|
|
{
|
|
|
Ass_FSM = PreStop;
|
|
|
}
|
|
@@ -831,7 +831,7 @@ void AssitCuvApplPerVolt(void)
|
|
|
ass_CalOut.swTorAssistCurrentTemp = ass_CalOut.swTorRefEnd;
|
|
|
|
|
|
/* 预启动阶段,停机判断 */
|
|
|
- if((ass_CalIn.uwGearSt == 0) || (BikeBrake_blGetstate() == TRUE)||(BMS_RunInfo.Status.Status_Bit.Charge==TRUE)||((ass_CalIn.blStopAssistEnble == TRUE) && (ass_CalIn.StartAssistEnble == FALSE)))
|
|
|
+ if((ass_CalIn.uwGearSt == 0) || (BikeBrake_blGetstate() == TRUE) || (BMS_RunInfo.Status.Status_Bit.Charge==TRUE) || (ass_CalIn.blStopAssistEnble == TRUE))
|
|
|
{
|
|
|
Ass_FSM = PreStop;
|
|
|
}
|
|
@@ -883,7 +883,7 @@ void AssitCuvApplPerVolt(void)
|
|
|
/* 重新启动判断*/
|
|
|
if((ass_CalIn.uwGearSt > 0) && (BikeBrake_blGetstate() == FALSE) &&(BMS_RunInfo.Status.Status_Bit.Charge==FALSE))
|
|
|
{
|
|
|
- if((ass_CalIn.blStopAssistEnble == FALSE) && (ass_CalIn.StartAssistEnble == TRUE))
|
|
|
+ if(ass_CalIn.StartAssistEnble == TRUE)
|
|
|
{
|
|
|
Ass_FSM = TorqueAssit;
|
|
|
}
|
|
@@ -1026,10 +1026,8 @@ void MoveAverageFilterClear(MAF_IN *in)
|
|
|
in->index = 0;
|
|
|
in->sum = 0;
|
|
|
in->blSecFlag = FALSE;
|
|
|
- // memset((UBYTE*)in->buffer, 0, sizeof(in->buffer));
|
|
|
|
|
|
- // in->buffer[(1 << in->length)-1]=0;
|
|
|
- for (i = 0; i < 64; i++)
|
|
|
+ for (i = 0; i < (sizeof(in->buffer) >> 1); i++)
|
|
|
{
|
|
|
in->buffer[i] = 0;
|
|
|
}
|