Sfoglia il codice sorgente

fix encoder error for mc100

Signed-off-by: huhui <huhui@sharkgulf.com>
huhui 3 anni fa
parent
commit
3fbd6b08fc

+ 2 - 1
Applications/bsp/board_mc100_v1.h

@@ -251,6 +251,7 @@
 
 /* 是否用编码器 */
 #define USE_ENCODER_ABI
+#define ENCODER_TYPE ENCODER_MT
 
 /* 编码器 */
 #define ENC_A_GROUP GPIOB
@@ -315,7 +316,7 @@
 #define ENC_PWM_Max_P      ((ENC_PWM_MAX_RES-ENC_PWM_END_WIDTH)/(ENC_PWM_MAX_RES - 1.0f))
 
 #define PWM_Duty(d, t) ((d)/(t))
-#define ENC_Duty(d, t) ((PWM_Duty(d, t)*ENC_PWM_MAX_RES - ENC_PWM_INIT_WIDTH)/(ENC_PWM_MAX_RES - ENC_PWM_END_WIDTH - ENC_PWM_INIT_WIDTH)
+#define ENC_Duty(d, t) ((PWM_Duty(d, t)*ENC_PWM_MAX_RES - ENC_PWM_INIT_WIDTH)/(ENC_PWM_MAX_RES - ENC_PWM_END_WIDTH - ENC_PWM_INIT_WIDTH))
 #else
 #error "Postion sensor ERROR"
 

+ 1 - 0
Applications/bsp/board_yuanqu.h

@@ -188,6 +188,7 @@
 
 /* 是否用编码器 */
 #define USE_ENCODER_ABI
+#define ENCODER_TYPE ENCODER_MPS
 
 /* 编码器 */
 #define ENC_A_GROUP GPIOB

+ 0 - 2
Applications/bsp/bsp.h

@@ -53,8 +53,6 @@
 #define ENCODER_MPS 1
 #define ENCODER_MT  2
 
-#define ENCODER_TYPE ENCODER_MPS
-
 #ifdef GD32_FOC_DEMO
 #include "bsp/board_gd32demo.h"
 #elif defined (YUANQU_HW_V1)