Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-25 17:25:18 +03:00
Code Issues Wiki Activity

Merge remote-tracking branch 'upstream/master' into abo_in_flight_mission_planner

Browse source
This commit is contained in:
breadoven 2021-05-15 10:42:34 +01:00
commit b37c1c43e8
17 changed files with 178 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/main/fc/fc_msp_box.c
View file

@ -91,7 +91,8 @@ static const box_t boxes[CHECKBOX_ITEM_COUNT + 1] = {
{ BOXPREARM, "PREARM", 51 },
{ BOXTURTLE, "TURTLE", 52 },
{ BOXNAVCRUISE, "NAV CRUISE", 53 },
{ BOXPLANWPMISSION, "WP PLANNER", 54 },
{ BOXAUTOLEVEL, "AUTO LEVEL", 54 },
{ BOXPLANWPMISSION, "WP PLANNER", 55 },
{ CHECKBOX_ITEM_COUNT, NULL, 0xFF }
};
@ -252,6 +253,9 @@ void initActiveBoxIds(void)
#if defined(USE_AUTOTUNE_FIXED_WING)
activeBoxIds[activeBoxIdCount++] = BOXAUTOTUNE;
#endif
if (sensors(SENSOR_BARO)) {
activeBoxIds[activeBoxIdCount++] = BOXAUTOLEVEL;
}
}
/*
@ -382,6 +386,7 @@ void packBoxModeFlags(boxBitmask_t * mspBoxModeFlags)
#if defined(USE_RX_MSP) && defined(USE_MSP_RC_OVERRIDE)
CHECK_ACTIVE_BOX(IS_ENABLED(IS_RC_MODE_ACTIVE(BOXMSPRCOVERRIDE)), BOXMSPRCOVERRIDE);
#endif
CHECK_ACTIVE_BOX(IS_ENABLED(IS_RC_MODE_ACTIVE(BOXAUTOLEVEL)), BOXAUTOLEVEL);
memset(mspBoxModeFlags, 0, sizeof(boxBitmask_t));
for (uint32_t i = 0; i < activeBoxIdCount; i++) {