aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RC_Channel: HAL_RUNCAM_ENABLED -> AP_CAMERA_RUNCAM_ENABLED

Browse Source
This commit is contained in:
Andy Piper 2024-09-13 16:48:10 +01:00
parent be49a06f04
commit 9308a6ef69
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/RC_Channel/RC_Channel.cpp
View File

@ -742,7 +742,7 @@ void RC_Channel::init_aux_function(const AUX_FUNC ch_option, const AuxSwitchPos
#endif #endif
case AUX_FUNC::MOTOR_ESTOP: case AUX_FUNC::MOTOR_ESTOP:
case AUX_FUNC::RC_OVERRIDE_ENABLE: case AUX_FUNC::RC_OVERRIDE_ENABLE:
#if HAL_RUNCAM_ENABLED #if AP_CAMERA_RUNCAM_ENABLED
case AUX_FUNC::RUNCAM_CONTROL: case AUX_FUNC::RUNCAM_CONTROL:
case AUX_FUNC::RUNCAM_OSD_CONTROL: case AUX_FUNC::RUNCAM_OSD_CONTROL:
#endif #endif
@ -849,7 +849,7 @@ const RC_Channel::LookupTable RC_Channel::lookuptable[] = {
#endif #endif
{ AUX_FUNC::SAILBOAT_MOTOR_3POS,"SailboatMotor"}, { AUX_FUNC::SAILBOAT_MOTOR_3POS,"SailboatMotor"},
{ AUX_FUNC::SURFACE_TRACKING,"SurfaceTracking"}, { AUX_FUNC::SURFACE_TRACKING,"SurfaceTracking"},
#if HAL_RUNCAM_ENABLED #if AP_CAMERA_RUNCAM_ENABLED
{ AUX_FUNC::RUNCAM_CONTROL,"RunCamControl"}, { AUX_FUNC::RUNCAM_CONTROL,"RunCamControl"},
{ AUX_FUNC::RUNCAM_OSD_CONTROL,"RunCamOSDControl"}, { AUX_FUNC::RUNCAM_OSD_CONTROL,"RunCamOSDControl"},
#endif #endif
@ -1169,7 +1169,7 @@ bool RC_Channel::do_aux_function_camera_lens(const AuxSwitchPos ch_flag)
} }
#endif // AP_CAMERA_ENABLED #endif // AP_CAMERA_ENABLED
#if HAL_RUNCAM_ENABLED #if AP_CAMERA_RUNCAM_ENABLED
void RC_Channel::do_aux_function_runcam_control(const AuxSwitchPos ch_flag) void RC_Channel::do_aux_function_runcam_control(const AuxSwitchPos ch_flag)
{ {
AP_RunCam *runcam = AP::runcam(); AP_RunCam *runcam = AP::runcam();
@ -1474,7 +1474,7 @@ bool RC_Channel::do_aux_function(const AUX_FUNC ch_option, const AuxSwitchPos ch
break; break;
#endif // AP_SERVORELAYEVENTS_ENABLED && AP_RELAY_ENABLED #endif // AP_SERVORELAYEVENTS_ENABLED && AP_RELAY_ENABLED
#if HAL_RUNCAM_ENABLED #if AP_CAMERA_RUNCAM_ENABLED
case AUX_FUNC::RUNCAM_CONTROL: case AUX_FUNC::RUNCAM_CONTROL:
do_aux_function_runcam_control(ch_flag); do_aux_function_runcam_control(ch_flag);
break; break;