Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-22 07:44:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Arming: allow scripting channels to be disabled

Browse Source
This commit is contained in:
Iampete1 2022-10-20 16:17:33 +01:00 committed by Andrew Tridgell
parent eee856b427
commit 623501d0d5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_Arming/AP_Arming.cpp
View File

@ -876,10 +876,12 @@ bool AP_Arming::servo_checks(bool report) const
const SRV_Channel::Aux_servo_function_t ch_function = c->get_function(); const SRV_Channel::Aux_servo_function_t ch_function = c->get_function();
// motors, e-stoppable functions, neopixels and ProfiLEDs may be digital outputs and thus can be disabled // motors, e-stoppable functions, neopixels and ProfiLEDs may be digital outputs and thus can be disabled
// scripting can use its functions as labels for LED setup
const bool disabled_ok = SRV_Channel::is_motor(ch_function) || const bool disabled_ok = SRV_Channel::is_motor(ch_function) ||
SRV_Channel::should_e_stop(ch_function) || SRV_Channel::should_e_stop(ch_function) ||
(ch_function >= SRV_Channel::k_LED_neopixel1 && ch_function <= SRV_Channel::k_LED_neopixel4) || (ch_function >= SRV_Channel::k_LED_neopixel1 && ch_function <= SRV_Channel::k_LED_neopixel4) ||
(ch_function >= SRV_Channel::k_ProfiLED_1 && ch_function <= SRV_Channel::k_ProfiLED_Clock); (ch_function >= SRV_Channel::k_ProfiLED_1 && ch_function <= SRV_Channel::k_ProfiLED_Clock) ||
(ch_function >= SRV_Channel::k_scripting1 && ch_function <= SRV_Channel::k_scripting16);
// for all other functions raise a pre-arm failure // for all other functions raise a pre-arm failure
if (!disabled_ok) { if (!disabled_ok) {