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

AP_Camera: correct compilation when HAL_MOUNT_SET_CAMERA_SOURCE_ENABLED not set 

- need the include because an enumeration is used in the header (relied on the include previously being made by a file including this header)
 - set_lens is not part of set-camera-source, so shouldn't be excluded
 - exclude entire method, not body of method based on the include
This commit is contained in:
Peter Barker 2024-04-12 10:50:27 +10:00 committed by Peter Barker
parent a4ec91c4f1
commit 5a21d0cb8a
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_Camera/AP_Camera_Backend.h
View File

@ -82,10 +82,10 @@ public:
// p1,p2 are in range 0 to 1. 0 is left or top, 1 is right or bottom // p1,p2 are in range 0 to 1. 0 is left or top, 1 is right or bottom
virtual bool set_tracking(TrackingType tracking_type, const Vector2f& p1, const Vector2f& p2) { return false; } virtual bool set_tracking(TrackingType tracking_type, const Vector2f& p1, const Vector2f& p2) { return false; }
#if AP_CAMERA_SET_CAMERA_SOURCE_ENABLED
// set camera lens as a value from 0 to 5 // set camera lens as a value from 0 to 5
virtual bool set_lens(uint8_t lens) { return false; } virtual bool set_lens(uint8_t lens) { return false; }
#if AP_CAMERA_SET_CAMERA_SOURCE_ENABLED
// set_camera_source is functionally the same as set_lens except primary and secondary lenses are specified by type // set_camera_source is functionally the same as set_lens except primary and secondary lenses are specified by type
virtual bool set_camera_source(AP_Camera::CameraSource primary_source, AP_Camera::CameraSource secondary_source) { return false; } virtual bool set_camera_source(AP_Camera::CameraSource primary_source, AP_Camera::CameraSource secondary_source) { return false; }
#endif #endif

4
libraries/AP_Camera/AP_Camera_Mount.cpp
View File

@ -70,17 +70,17 @@ bool AP_Camera_Mount::set_lens(uint8_t lens)
return false; return false;
} }
#if HAL_MOUNT_SET_CAMERA_SOURCE_ENABLED
// set_camera_source is functionally the same as set_lens except primary and secondary lenses are specified by type // set_camera_source is functionally the same as set_lens except primary and secondary lenses are specified by type
bool AP_Camera_Mount::set_camera_source(AP_Camera::CameraSource primary_source, AP_Camera::CameraSource secondary_source) bool AP_Camera_Mount::set_camera_source(AP_Camera::CameraSource primary_source, AP_Camera::CameraSource secondary_source)
{ {
#if HAL_MOUNT_SET_CAMERA_SOURCE_ENABLED
AP_Mount* mount = AP::mount(); AP_Mount* mount = AP::mount();
if (mount != nullptr) { if (mount != nullptr) {
return mount->set_camera_source(get_mount_instance(), (uint8_t)primary_source, (uint8_t)secondary_source); return mount->set_camera_source(get_mount_instance(), (uint8_t)primary_source, (uint8_t)secondary_source);
} }
#endif
return false; return false;
} }
#endif
// send camera information message to GCS // send camera information message to GCS
void AP_Camera_Mount::send_camera_information(mavlink_channel_t chan) const void AP_Camera_Mount::send_camera_information(mavlink_channel_t chan) const

4
libraries/AP_Camera/AP_Camera_Mount.h
View File

@ -22,6 +22,8 @@
#if AP_CAMERA_MOUNT_ENABLED #if AP_CAMERA_MOUNT_ENABLED
#include "AP_Camera.h"
class AP_Camera_Mount : public AP_Camera_Backend class AP_Camera_Mount : public AP_Camera_Backend
{ {
public: public:
@ -54,8 +56,10 @@ public:
// set camera lens as a value from 0 to 5 // set camera lens as a value from 0 to 5
bool set_lens(uint8_t lens) override; bool set_lens(uint8_t lens) override;
#if AP_CAMERA_SET_CAMERA_SOURCE_ENABLED
// set_camera_source is functionally the same as set_lens except primary and secondary lenses are specified by type // set_camera_source is functionally the same as set_lens except primary and secondary lenses are specified by type
bool set_camera_source(AP_Camera::CameraSource primary_source, AP_Camera::CameraSource secondary_source) override; bool set_camera_source(AP_Camera::CameraSource primary_source, AP_Camera::CameraSource secondary_source) override;
#endif // AP_CAMERA_SET_CAMERA_SOURCE_ENABLED
// send camera information message to GCS // send camera information message to GCS
void send_camera_information(mavlink_channel_t chan) const override; void send_camera_information(mavlink_channel_t chan) const override;