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

AP_Relay: correct compilation when many features removed

Browse Source
This commit is contained in:
Peter Barker 2024-01-13 23:07:39 +11:00 committed by Peter Barker
parent fe30a93602
commit 4f56691f05
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libraries/AP_Relay/AP_Relay.cpp
View File

@ -202,29 +202,30 @@ void AP_Relay::convert_params()
// Dont need this conversion on periph as relay support is more recent
// Before converting local params we must find any relays being used by index from external libs
int8_t relay_index;
int8_t ice_relay = -1;
#if AP_ICENGINE_ENABLED
AP_ICEngine *ice = AP::ice();
if (ice != nullptr && ice->get_legacy_ignition_relay_index(relay_index)) {
ice_relay = relay_index;
int8_t ice_relay_index;
if (ice != nullptr && ice->get_legacy_ignition_relay_index(ice_relay_index)) {
ice_relay = ice_relay_index;
}
#endif
int8_t chute_relay = -1;
#if HAL_PARACHUTE_ENABLED
AP_Parachute *parachute = AP::parachute();
if (parachute != nullptr && parachute->get_legacy_relay_index(relay_index)) {
chute_relay = relay_index;
int8_t parachute_relay_index;
if (parachute != nullptr && parachute->get_legacy_relay_index(parachute_relay_index)) {
chute_relay = parachute_relay_index;
}
#endif
int8_t cam_relay = -1;
#if AP_CAMERA_ENABLED
AP_Camera *camera = AP::camera();
if ((camera != nullptr) && (camera->get_legacy_relay_index(relay_index))) {
cam_relay = relay_index;
int8_t camera_relay_index;
if ((camera != nullptr) && (camera->get_legacy_relay_index(camera_relay_index))) {
cam_relay = camera_relay_index;
}
#endif