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

AP_BoardConfig: include BRD_IO_ENABLE without board detect

This commit is contained in:
Andrew Tridgell 2020-01-18 14:05:54 +11:00
parent 629ebbb8ea
commit 4743a7670f
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_BoardConfig/AP_BoardConfig.cpp
View File

@ -170,8 +170,7 @@ const AP_Param::GroupInfo AP_BoardConfig::var_info[] = {
AP_GROUPINFO("TYPE", 9, AP_BoardConfig, state.board_type, BOARD_TYPE_DEFAULT),
#endif
#if AP_FEATURE_BOARD_DETECT
#if HAL_PX4_HAVE_PX4IO || HAL_WITH_IO_MCU
#if HAL_WITH_IO_MCU
// @Param: IO_ENABLE
// @DisplayName: Enable IO co-processor
// @Description: This allows for the IO co-processor on FMUv1 and FMUv2 to be disabled
@ -180,7 +179,6 @@ const AP_Param::GroupInfo AP_BoardConfig::var_info[] = {
// @User: Advanced
AP_GROUPINFO("IO_ENABLE", 10, AP_BoardConfig, state.io_enable, 1),
#endif
#endif
#if HAL_RCINPUT_WITH_AP_RADIO
// @Group: RADIO

2
libraries/AP_BoardConfig/AP_BoardConfig.h
View File

@ -104,7 +104,7 @@ public:
// developer debugging by setting BRD_IO_ENABLE=100 to avoid the
// crc check of IO firmware on startup
static uint8_t io_enabled(void) {
#if AP_FEATURE_BOARD_DETECT
#if HAL_WITH_IO_MCU
return _singleton?uint8_t(_singleton->state.io_enable.get()):0;
#else
return 0;