垂直速度计算错误,更改
This commit is contained in:
parent
5985b7f56f
commit
ec5dd9abe4
|
@ -0,0 +1,18 @@
|
|||
{
|
||||
"workspace": {
|
||||
"path": "${workspaceFolder}\\Hyt2\\PROJECT\\OS2.eww"
|
||||
},
|
||||
"workspaces": {
|
||||
"${workspaceFolder}\\Hyt2\\PROJECT\\OS2.eww": {
|
||||
"configs": {
|
||||
"${workspaceFolder}\\Hyt2\\PROJECT\\OS2.ewp": "Debug"
|
||||
},
|
||||
"selected": {
|
||||
"path": "${workspaceFolder}\\Hyt2\\PROJECT\\OS2.ewp"
|
||||
}
|
||||
}
|
||||
},
|
||||
"workbench": {
|
||||
"path": "D:\\IAR"
|
||||
}
|
||||
}
|
|
@ -1211,13 +1211,13 @@ static void ptz_vert_pid_task()
|
|||
}
|
||||
lastTime_vert = time_vert;
|
||||
|
||||
if(g_ptz.hori_pid.hall_h123_count >= 2)
|
||||
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.hori_pid.hall_h123_motor_speed =
|
||||
60000.0 * (float)(g_ptz.hori_pid.hall_h123_count/* - 1*/) /
|
||||
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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue