Ver Fonte

去掉不用的hwlim.dc_vol和对应的宏定义

Signed-off-by: kevin <huhui@sharkgulf.com>
kevin há 2 anos atrás
pai
commit
70e9e2457d

+ 0 - 1
Applications/bsp/gd32/board_mc100_v1.h

@@ -6,7 +6,6 @@
 #include "gd32e10x.h"
 #endif
 
-#define CONFIG_HW_MAX_DC_VOLTAGE 115.0F
 #define CONFIG_HW_MAX_DC_CURRENT 250.0f
 #define CONFIG_HW_MAX_CHRG_CURRENT (-100.0f)
 #define CONFIG_HW_MAX_MOTOR_RPM      9000.0f

+ 0 - 1
Applications/bsp/gd32/board_mc105_v3.h

@@ -6,7 +6,6 @@
 #include "gd32e10x.h"
 #endif
 
-#define CONFIG_HW_MAX_DC_VOLTAGE CONFIG_BOARD_MAX_DC
 #define CONFIG_HW_MAX_DC_CURRENT 250.0f
 #define CONFIG_HW_MAX_CHRG_CURRENT (-100.0f)
 #define CONFIG_HW_MAX_MOTOR_RPM      9000.0f

+ 0 - 2
Applications/bsp/gd32/bsp.h

@@ -35,7 +35,6 @@
 #define CONFIG_MC105_HW_VERSION 2
 
 #elif defined (CONFIG_MC105_HW_V3)
-#define CONFIG_BOARD_MAX_DC 115.0F
 #define CONFIG_VBUS_I_POSITIVE 1
 #define CONFIG_CURRENT_SENSOR_CEOF 0.303F
 #include "bsp/gd32/board_mc105_v3.h"
@@ -44,7 +43,6 @@
 #define CONFIG_MC105_HW_VERSION 3
 
 #elif defined (CONFIG_BOARD_MC124)
-#define CONFIG_BOARD_MAX_DC 84.0F
 #define CONFIG_CURRENT_SENSOR_CEOF 0.313F
 #include "bsp/gd32/board_mc105_v3.h"
 #define CONFIG_BOARD_MCXXX

+ 1 - 1
Applications/foc/core/controller.c

@@ -24,7 +24,7 @@ void mot_contrl_init(mot_contrl_t *ctrl) {
 	ctrl->hwlim.mot_vel = CONFIG_HW_MAX_MOTOR_RPM;
 	ctrl->hwlim.phase_curr = CONFIG_HW_MAX_PHASE_CURR;
 	ctrl->hwlim.phase_vol = CONFIG_HW_MAX_PHASE_VOL;
-	ctrl->hwlim.dc_vol      = CONFIG_HW_MAX_DC_VOLTAGE;
+	//ctrl->hwlim.dc_vol      = CONFIG_HW_MAX_DC_VOLTAGE;
 	ctrl->hwlim.torque  = mc_conf()->m.max_torque; //电机的最大扭矩
 	ctrl->hwlim.fw_id = mc_conf()->m.max_fw_id;  //电池能支持的最大弱磁电流
 	ctrl->protlim.dc_curr = HW_LIMIT_NONE;

+ 1 - 1
Applications/foc/core/controller.h

@@ -106,7 +106,7 @@ typedef struct {
 	float phase_vol;
 	float fw_id; //D轴最大退磁电流
 	float dc_curr;
-	float dc_vol;
+	//float dc_vol;
 	float torque;
 }hw_limit;
 

+ 1 - 1
Applications/foc/motor/motor.c

@@ -1219,7 +1219,7 @@ static void motor_vbus_crit_check(s16 curr_vbus) {
 	}
 	if (curr_vbus >= motor.s_vbus_hw_max) {
 		motor.vbus_he_cnt ++;
-		if (motor.vbus_he_cnt >= 2) {
+		if (motor.vbus_he_cnt >= 1) {
 			if (mot_contrl_is_start(&motor.controller)) {
 				pwm_disable_channel();
 				mc_save_err_runtime();