|
@@ -12,7 +12,7 @@
|
|
|
#include "bikeinformation.h"
|
|
|
#include "Cadence.h"
|
|
|
#include "FSM_1st.h"
|
|
|
-#include "Syspar.h"
|
|
|
+#include "syspar.h"
|
|
|
#include "flash_master.h"
|
|
|
#include "string.h"
|
|
|
#include "typedefine.h"
|
|
@@ -874,7 +874,6 @@ void ass_voAssistCmdDeal(void)
|
|
|
/** Record Last assist mode */
|
|
|
ass_stCadAssParaPro.uwAssitModeLast = ass_stCadAssParaPro.uwAssitMode;
|
|
|
|
|
|
-#if 0
|
|
|
/** Cart Comand */
|
|
|
if(ass_stCadAssParaIn.uwGearSt == 0x22)
|
|
|
{
|
|
@@ -919,7 +918,7 @@ void ass_voAssistCmdDeal(void)
|
|
|
{
|
|
|
ass_MaxSpeed.MaxBikeSpeed = ass_MaxSpeed.uwGearFour;
|
|
|
}
|
|
|
- else if((ass_stCadAssParaIn.uwGearSt == 5) )
|
|
|
+ else if(ass_stCadAssParaIn.uwGearSt == 5)
|
|
|
{
|
|
|
ass_MaxSpeed.MaxBikeSpeed = ass_stCadAssCoef.uwThrottleMaxBikeSpeed ;
|
|
|
}
|
|
@@ -1086,33 +1085,7 @@ void ass_voAssistCmdDeal(void)
|
|
|
ass_stCadAssParaPro.uwAssitMode = 0;
|
|
|
tmp_slAssistSpdCmd = 0; /**< Q15 */
|
|
|
}
|
|
|
-#else //仪表挡位控制转速
|
|
|
- if((ass_stCadAssParaIn.uwGearSt >= 0x01) && (ass_stCadAssParaIn.uwGearSt <= 0x05) )
|
|
|
- {
|
|
|
- ass_stCadAssParaPro.uwAssitMode = 6;
|
|
|
- if(ass_stCadAssParaIn.uwGearSt == 0x01)
|
|
|
- MC_MotorSPD_rpm_Percent = 20;
|
|
|
- else if(ass_stCadAssParaIn.uwGearSt == 0x02)
|
|
|
- MC_MotorSPD_rpm_Percent = 40;
|
|
|
- else if(ass_stCadAssParaIn.uwGearSt == 0x03)
|
|
|
- MC_MotorSPD_rpm_Percent = 60;
|
|
|
- else
|
|
|
- MC_MotorSPD_rpm_Percent = 100;
|
|
|
- tmp_slAssistSpdCmd = (SLONG)ass_stCadAssCoef.swKmhToMSpdPu*(SLONG)ass_stCadAssCoef.uwThrottleMaxBikeSpeed >> 4;
|
|
|
- tmp_slAssistSpdCmd= ((SLONG)MC_MotorSPD_rpm_Percent * tmp_slAssistSpdCmd) / 100;
|
|
|
|
|
|
- if(MC_MotorSPD_rpm_Percent <= 2)
|
|
|
- {
|
|
|
- tmp_slAssistSpdCmd = 0;
|
|
|
- ass_stCadAssParaPro.uwAssitMode = 0;
|
|
|
- }
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- ass_stCadAssParaPro.uwAssitMode = 0;
|
|
|
- tmp_slAssistSpdCmd = 0; /**< Q15 */
|
|
|
- }
|
|
|
-#endif
|
|
|
/** Stop Assist when Bike Brake */
|
|
|
if((BikeBrake_blGetstate() == TRUE) ||(BMS_RunInfo.Status.Status_Bit.Charge!=0))
|
|
|
{
|