Преглед изворни кода

runtime 限制处理优化

Signed-off-by: huhui <huhui@sharkgulf.com>
huhui пре 3 година
родитељ
комит
48915aebed
1 измењених фајлова са 2 додато и 5 уклоњено
  1. 2 5
      Applications/foc/core/PMSM_FOC_Core.c

+ 2 - 5
Applications/foc/core/PMSM_FOC_Core.c

@@ -578,11 +578,8 @@ void PMSM_FOC_RunTime_Limit(void) {
 	float dclim = (float)vbus_current_vol_lower_limit();
 	float phaselim = (float)phase_current_temp_high_limit();
 
-	dclim = (dclim!=CURRENT_LIMIT_NONE)?dclim:gFoc_Ctrl.userLim.s_iDCLim;
-	phaselim = (phaselim!=CURRENT_LIMIT_NONE)?phaselim:gFoc_Ctrl.userLim.s_PhaseCurrLim;
-
-	dclim = min(dclim, gFoc_Ctrl.userLim.s_iDCLim);
-	phaselim = min(phaselim, gFoc_Ctrl.userLim.s_PhaseCurrLim);
+	dclim = (dclim!=CURRENT_LIMIT_NONE)?dclim:gFoc_Ctrl.hwLim.s_iDCMax;
+	phaselim = (phaselim!=CURRENT_LIMIT_NONE)?phaselim:gFoc_Ctrl.hwLim.s_PhaseCurrMax;
 
 	if (phaselim < gFoc_Ctrl.rtLim.phaseCurrLimRamp.target) {
 		eRamp_set_step_target(&gFoc_Ctrl.rtLim.phaseCurrLimRamp, phaselim, CONFIG_eCTRL_STEP_TS);