diff --git a/Hyt2/APP/Device/Device_speed/speed_to_bldc.c b/Hyt2/APP/Device/Device_speed/speed_to_bldc.c index 13112c0..11e7560 100644 --- a/Hyt2/APP/Device/Device_speed/speed_to_bldc.c +++ b/Hyt2/APP/Device/Device_speed/speed_to_bldc.c @@ -1213,12 +1213,12 @@ static void ptz_vert_pid_task() if(g_ptz.vert_pid.hall_h123_count >= 2) { - // g_ptz.hori_pid.hall_h123_motor_speed = - // 60000.0 * (float)(g_ptz.hori_pid.hall_h123_count/* - 1*/) / - // (float)PTZ_VERT_PID_T / PTZ_HORI_ONE_CYCLE_HALL_NUM; +// g_ptz.vert_pid.hall_h123_motor_speed = +// 60000.0 * (float)(g_ptz.vert_pid.hall_h123_count /*-1*/) / +// (float)PTZ_VERT_PID_T / PTZ_VERT_ONE_CYCLE_HALL_NUM; g_ptz.vert_pid.hall_h123_motor_speed = 60000.0 * (float)(g_ptz.vert_pid.hall_h123_count/* - 1*/) / - (float)vertTime / PTZ_HORI_ONE_CYCLE_HALL_NUM; + (float)vertTime / PTZ_VERT_ONE_CYCLE_HALL_NUM; } g_ptz.vert_motor_speed_hall_actual = g_ptz.vert_pid.hall_h123_motor_speed; diff --git a/Hyt2/BSP/Driver/as5047d/as5047d.h b/Hyt2/BSP/Driver/as5047d/as5047d.h index 5c4f24a..b0074c1 100644 --- a/Hyt2/BSP/Driver/as5047d/as5047d.h +++ b/Hyt2/BSP/Driver/as5047d/as5047d.h @@ -2,7 +2,7 @@ #define __AS5047D_H_ #include "gd32f4xx.h" -#define TMR3109 1 +//#define TMR3109 1 #if !(AS5047) && !(TMR3109) #define AS5047