|
|
@@ -1687,7 +1687,7 @@ MC_CalParam_Struct_t MC_AssistRunMode_Torque_Process(MC_CadenceResult_Struct_t C
|
|
|
}
|
|
|
|
|
|
//随车速调节助力比
|
|
|
- if(IsEnterGasMode == SET)//指拨模式限速40km/h
|
|
|
+ if((IsEnterGasMode == SET) && (CadenceData.Cadence_Dir == MC_Cadence_Forward))//指拨模式同时踩踏，限速40km/h
|
|
|
{
|
|
|
Torque_Temp = (uint16_t)((uint32_t)(Torque_Temp * Function_Linear_3Stage(0, 0, 40 * 10, 52, MC_SpeedSensorData.Speed_Data)) >> 10);
|
|
|
}
|
|
|
@@ -1704,7 +1704,7 @@ MC_CalParam_Struct_t MC_AssistRunMode_Torque_Process(MC_CadenceResult_Struct_t C
|
|
|
}
|
|
|
|
|
|
//升降速曲线计算
|
|
|
- if( MC_SpeedSensorData.Speed_Data > ((IsEnterGasMode == SET) ? 40 * 10 : MC_ConfigParam1.SpeedLimit * 10) ) //限速处理
|
|
|
+ if( MC_SpeedSensorData.Speed_Data > (((IsEnterGasMode == SET) && (CadenceData.Cadence_Dir == MC_Cadence_Forward)) ? 40 * 10 : MC_ConfigParam1.SpeedLimit * 10) ) //限速处理
|
|
|
{
|
|
|
if((MC_TorqueProcess_Param.TorqueRef - MC_TorqueProcess_Param.TorqueRefEnd) > 2)
|
|
|
{
|
|
|
@@ -1790,7 +1790,7 @@ MC_CalParam_Struct_t MC_AssistRunMode_Torque_Process(MC_CadenceResult_Struct_t C
|
|
|
MC_TorqueProcess_Param.TorqueRefEnd = (MC_TorqueProcess_Param.TorqueRefEnd < 6) ? 6 : MC_TorqueProcess_Param.TorqueRefEnd;
|
|
|
|
|
|
//限速点处理
|
|
|
- if( MC_SpeedSensorData.Speed_Data > ((IsEnterGasMode == SET) ? (40 * 10 + 22) : MC_ConfigParam1.SpeedLimit * 10 + 22)) //限速值 + 2.2
|
|
|
+ if( MC_SpeedSensorData.Speed_Data > (((IsEnterGasMode == SET) && (CadenceData.Cadence_Dir == MC_Cadence_Forward)) ? (40 * 10 + 22) : MC_ConfigParam1.SpeedLimit * 10 + 22)) //限速值 + 2.2
|
|
|
{
|
|
|
MC_TorqueProcess_Param.MotorStopLock_Flag = SET;
|
|
|
MC_TorqueProcess_Param.TorqueRefEnd = 0;
|
|
|
@@ -1798,7 +1798,7 @@ MC_CalParam_Struct_t MC_AssistRunMode_Torque_Process(MC_CadenceResult_Struct_t C
|
|
|
MC_MotorStop(&MC_StarFlag);
|
|
|
}
|
|
|
#if 0 //低于限速点启动电机
|
|
|
- else if(MC_RunInfo.BikeSpeed < ((IsEnterGasMode == SET) ? (40 * 10 + 22) : MC_ConfigParam1.SpeedLimit * 10 + 22))
|
|
|
+ else if(MC_RunInfo.BikeSpeed < (((IsEnterGasMode == SET) && (CadenceData.Cadence_Dir == MC_Cadence_Forward)) ? (40 * 10 + 22) : MC_ConfigParam1.SpeedLimit * 10 + 22))
|
|
|
{
|
|
|
MC_MotorStar(&MC_StarFlag);
|
|
|
}
|
