Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Camera: camera state uses Vector2f

This commit is contained in:
Randy Mackay 2023-05-08 12:43:03 +09:00
parent ae09dc7d43
commit 267cbf9a37
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Camera/AP_Camera.h
View File

@ -142,10 +142,8 @@ public:
uint8_t focus_type; // see FocusType enum (1:Rate, 2:Pct, 4:Auto)
float focus_value; // If Rate, focus in = -1, focus hold = 0, focus out = 1. If PCT 0 to 100
uint8_t tracking_type; // see TrackingType enum (0:NONE, 1:POINT, 2:RECTANGLE)
float tracking_p1x; // center or top-left tracking point's x-axis value (0 is left, 1 is right)
float tracking_p1y; // center or top-left tracking point's y-axis value (0 is top, 1 is bottom)
float tracking_p2x; // bottom-right tracking point's x-axis value (0 is left, 1 is right)
float tracking_p2y; // bottom-right tracking point's y-axis value (0 is top, 1 is bottom)
Vector2f tracking_p1; // center or top-left tracking point. x left-right, y is top-bottom. range is 0 to 1
Vector2f tracking_p2; // bottom-right tracking point. x left-right, y is top-bottom. range is 0 to 1
} camera_state_t;
// accessor to allow scripting backend to retrieve state

6
libraries/AP_Camera/AP_Camera_Scripting.cpp
View File

@ -43,10 +43,8 @@ bool AP_Camera_Scripting::set_focus(FocusType focus_type, float focus_value)
bool AP_Camera_Scripting::set_tracking(TrackingType tracking_type, const Vector2f& p1, const Vector2f& p2)
{
_cam_state.tracking_type = (uint8_t)tracking_type;
_cam_state.tracking_p1x = p1.x;
_cam_state.tracking_p1y = p1.y;
_cam_state.tracking_p2x = p2.x;
_cam_state.tracking_p2y = p2.y;
_cam_state.tracking_p1 = p1;
_cam_state.tracking_p2 = p2;
return true;
}