Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-01 13:38:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Camera: reduce camera_state_t scope

Browse Source
This commit is contained in:
Randy Mackay 2023-04-15 09:39:16 +09:00 committed by Andrew Tridgell
parent ea1836304a
commit a9cc32d304
4 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libraries/AP_Camera/AP_Camera.h
View File

@ -13,18 +13,6 @@
#include "AP_Camera_Params.h"
#include "AP_Mount/AP_Mount_config.h"
#if AP_CAMERA_SCRIPTING_ENABLED
// structure and accessors for use by scripting backends
typedef struct {
uint16_t take_pic_incr; // incremented each time camera is requested to take a picture
bool recording_video; // true when recording video
uint8_t zoom_type; // zoom AP_Camera::ZoomType enum (1:Rate or 2:Pct)
float zoom_value; // percentage or zoom out = -1, hold = 0, zoom in = 1
int8_t focus_step; // focus in = -1, focus hold = 0, focus out = 1
bool auto_focus; // true when auto focusing
} camera_state_t;
#endif
#define AP_CAMERA_MAX_INSTANCES 2 // maximum number of camera backends
// declare backend classes
@ -146,6 +134,16 @@ public:
void set_is_auto_mode(bool enable) { _is_in_auto_mode = enable; }
#if AP_CAMERA_SCRIPTING_ENABLED
// structure and accessors for use by scripting backends
typedef struct {
uint16_t take_pic_incr; // incremented each time camera is requested to take a picture
bool recording_video; // true when recording video
uint8_t zoom_type; // see AP_Camera::ZoomType enum (1:Rate or 2:Pct)
float zoom_value; // percentage or zoom out = -1, hold = 0, zoom in = 1
int8_t focus_step; // focus in = -1, focus hold = 0, focus out = 1
bool auto_focus; // true when auto focusing
} camera_state_t;
// accessor to allow scripting backend to retrieve state
// returns true on success and cam_state is filled in
bool get_state(uint8_t instance, camera_state_t& cam_state);

2
libraries/AP_Camera/AP_Camera_Backend.h
View File

@ -84,7 +84,7 @@ public:
#if AP_CAMERA_SCRIPTING_ENABLED
// accessor to allow scripting backend to retrieve state
// returns true on success and cam_state is filled in
virtual bool get_state(camera_state_t& cam_state) { return false; }
virtual bool get_state(AP_Camera::camera_state_t& cam_state) { return false; }
#endif
protected:

2
libraries/AP_Camera/AP_Camera_Scripting.cpp
View File

@ -47,7 +47,7 @@ bool AP_Camera_Scripting::set_auto_focus()
// access for scripting backend to retrieve state
// returns true on success and cam_state is filled in
bool AP_Camera_Scripting::get_state(camera_state_t& cam_state)
bool AP_Camera_Scripting::get_state(AP_Camera::camera_state_t& cam_state)
{
cam_state = _cam_state;
return true;

4
libraries/AP_Camera/AP_Camera_Scripting.h
View File

@ -50,12 +50,12 @@ public:
bool set_auto_focus() override;
// returns true on success and cam_state is filled in
bool get_state(camera_state_t& cam_state) override;
bool get_state(AP_Camera::camera_state_t& cam_state) override;
private:
// current state
camera_state_t _cam_state;
AP_Camera::camera_state_t _cam_state;
};
#endif // AP_CAMERA_SCRIPTING_ENABLED