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

AP_Button: pre-arm displays gpio vs servo_ch conflict

This commit is contained in:
Randy Mackay 2022-04-19 13:24:28 +09:00
parent 1ee01577f6
commit 846637e3e9
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/AP_Button/AP_Button.cpp
View File

@ -388,7 +388,12 @@ bool AP_Button::arming_checks(size_t buflen, char *buffer) const
}
for (uint8_t i=0; i<AP_BUTTON_NUM_PINS; i++) {
if (pin[i] != -1 && !hal.gpio->valid_pin(pin[i])) {
hal.util->snprintf(buffer, buflen, "BTN_PIN%u %d invalid", unsigned(i + 1), int(pin[i].get()));
uint8_t servo_ch;
if (hal.gpio->pin_to_servo_channel(pin[i], servo_ch)) {
hal.util->snprintf(buffer, buflen, "BTN_PIN%u=%d, set SERVO%u_FUNCTION=-1", unsigned(i + 1), int(pin[i].get()), unsigned(servo_ch+1));
} else {
hal.util->snprintf(buffer, buflen, "BTN_PIN%u=%d invalid", unsigned(i + 1), int(pin[i].get()));
}
return false;
}
}