Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-18 06:38:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_BoardConfig: enable get_board_type() on all boards

Browse Source 
return BOARD_TYPE_UNKNOWN for boards that don't use board detection
This commit is contained in:
Andrew Tridgell 2018-07-13 20:29:00 +10:00
parent 9ab55f6838
commit 2a62938fb1
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/AP_BoardConfig/AP_BoardConfig.h
View File

@ -72,12 +72,10 @@ public:
static bool px4_start_driver(main_fn_t main_function, const char *name, const char *arguments);
#endif
#if AP_FEATURE_BOARD_DETECT
// valid types for BRD_TYPE: these values need to be in sync with the
// values from the param description
enum px4_board_type {
#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 || CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN || CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS
BOARD_TYPE_UNKNOWN = -1,
PX4_BOARD_AUTO = 0,
PX4_BOARD_PX4V1 = 1,
PX4_BOARD_PIXHAWK = 2,
@ -100,18 +98,18 @@ public:
VRX_BOARD_CORE10 = 36,
VRX_BOARD_BRAIN54 = 38,
PX4_BOARD_OLDDRIVERS = 100,
#endif
};
#endif // AP_FEATURE_BOARD_DETECT
// set default value for BRD_SAFETY_MASK
void set_default_safety_ignore_mask(uint16_t mask);
#if AP_FEATURE_BOARD_DETECT
static enum px4_board_type get_board_type(void) {
#if AP_FEATURE_BOARD_DETECT
return px4_configured_board;
}
#else
return BOARD_TYPE_UNKNOWN;
#endif
}
// ask if IOMCU is enabled. This is a uint8_t to allow
// developer debugging by setting BRD_IO_ENABLE=100 to avoid the