AP_BoardConfig: fixed AUAV21 board ID to not overlap with VRBrain boards

This commit is contained in:
Andrew Tridgell 2017-03-01 18:07:44 +11:00
parent 507b461388
commit cf3db7560c
2 changed files with 2 additions and 2 deletions

View File

@ -154,7 +154,7 @@ const AP_Param::GroupInfo AP_BoardConfig::var_info[] = {
// @Param: TYPE // @Param: TYPE
// @DisplayName: Board type // @DisplayName: Board type
// @Description: This allows selection of a PX4 or VRBRAIN board type. If set to zero then the board type is auto-detected (PX4) // @Description: This allows selection of a PX4 or VRBRAIN board type. If set to zero then the board type is auto-detected (PX4)
// @Values: 0:AUTO,1:PX4V1,2:Pixhawk,3:Pixhawk2,4:Pixracer,5:PixhawkMini,6:Pixhawk2Slim,7:VRBrain 5.1,8:VRBrain 5.2,9:VR Micro Brain 5.1,10:VR Micro Brain 5.2,11:VRBrain Core 1.0,12:VRBrain 5.4 // @Values: 0:AUTO,1:PX4V1,2:Pixhawk,3:Pixhawk2,4:Pixracer,5:PixhawkMini,6:Pixhawk2Slim,7:VRBrain 5.1,8:VRBrain 5.2,9:VR Micro Brain 5.1,10:VR Micro Brain 5.2,11:VRBrain Core 1.0,12:VRBrain 5.4,20:AUAV2.1
// @RebootRequired: True // @RebootRequired: True
// @User: Advanced // @User: Advanced
AP_GROUPINFO("TYPE", 9, AP_BoardConfig, px4.board_type, BOARD_TYPE_DEFAULT), AP_GROUPINFO("TYPE", 9, AP_BoardConfig, px4.board_type, BOARD_TYPE_DEFAULT),

View File

@ -46,7 +46,7 @@ public:
PX4_BOARD_PIXRACER = 4, PX4_BOARD_PIXRACER = 4,
PX4_BOARD_PHMINI = 5, PX4_BOARD_PHMINI = 5,
PX4_BOARD_PH2SLIM = 6, PX4_BOARD_PH2SLIM = 6,
PX4_BOARD_AUAV21 = 7, PX4_BOARD_AUAV21 = 20,
PX4_BOARD_OLDDRIVERS = 100, PX4_BOARD_OLDDRIVERS = 100,
#endif #endif
#if CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN #if CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN