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

AP_Camera: fixed build on navio

Browse Source
This commit is contained in:
Andrew Tridgell 2019-12-30 11:47:53 +11:00
parent f10adebb10
commit f1dfb2e401
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_Camera/AP_RunCam.cpp
View File

@ -34,7 +34,7 @@ const AP_Param::GroupInfo AP_RunCam::var_info[] = {
// @DisplayName: RunCam device type
// @Description: RunCam deviee type used to determine OSD menu structure and shutter options
// @Values: 0:Disabled, 1:RunCam Split
AP_GROUPINFO_FLAGS("TYPE", 1, AP_RunCam, _cam_type, int(DeviceType::DISABLED), AP_PARAM_FLAG_ENABLE),
AP_GROUPINFO_FLAGS("TYPE", 1, AP_RunCam, _cam_type, int(DeviceType::Disabled), AP_PARAM_FLAG_ENABLE),
// @Param: FEATURES
// @DisplayName: RunCam features available
@ -128,9 +128,9 @@ void AP_RunCam::init()
users while still enabling parameters to be hidden for users
without a runcam
*/
_cam_type.set_default(int8_t(DeviceType::SPLIT));
_cam_type.set_default(int8_t(DeviceType::Split));
}
if (_cam_type.get() == int8_t(DeviceType::DISABLED)) {
if (_cam_type.get() == int8_t(DeviceType::Disabled)) {
uart = nullptr;
return;
}
@ -198,7 +198,7 @@ void AP_RunCam::osd_option() {
// input update loop
void AP_RunCam::update()
{
if (uart == nullptr || _cam_type.get() == int8_t(DeviceType::DISABLED)) {
if (uart == nullptr || _cam_type.get() == int8_t(DeviceType::Disabled)) {
return;
}

4
libraries/AP_Camera/AP_RunCam.h
View File

@ -56,8 +56,8 @@ public:
}
enum class DeviceType {
DISABLED = 0,
SPLIT = 1,
Disabled = 0,
Split = 1,
};
// operation of camera button simulation