mirror of
https://github.com/iNavFlight/inav.git
synced 2025-07-24 16:55:29 +03:00
Merge remote-tracking branch 'upstream/master' into abo_multi_function_utility
This commit is contained in:
commit
cfca116a14
425 changed files with 152438 additions and 1937 deletions
|
@ -93,11 +93,12 @@ static const box_t boxes[CHECKBOX_ITEM_COUNT + 1] = {
|
|||
{ .boxId = BOXPREARM, .boxName = "PREARM", .permanentId = 51 },
|
||||
{ .boxId = BOXTURTLE, .boxName = "TURTLE", .permanentId = 52 },
|
||||
{ .boxId = BOXNAVCRUISE, .boxName = "NAV CRUISE", .permanentId = 53 },
|
||||
{ .boxId = BOXAUTOLEVEL, .boxName = "AUTO LEVEL", .permanentId = 54 },
|
||||
{ .boxId = BOXAUTOLEVEL, .boxName = "AUTO LEVEL TRIM", .permanentId = 54 },
|
||||
{ .boxId = BOXPLANWPMISSION, .boxName = "WP PLANNER", .permanentId = 55 },
|
||||
{ .boxId = BOXSOARING, .boxName = "SOARING", .permanentId = 56 },
|
||||
{ .boxId = BOXCHANGEMISSION, .boxName = "MISSION CHANGE", .permanentId = 59 },
|
||||
{ .boxId = BOXMULTIFUNCTION, .boxName = "MULTI FUNCTION", .permanentId = 60 },
|
||||
{ .boxId = BOXBEEPERMUTE, .boxName = "BEEPER MUTE", .permanentId = 60 },
|
||||
{ .boxId = BOXMULTIFUNCTION, .boxName = "MULTI FUNCTION", .permanentId = 61 },
|
||||
{ .boxId = CHECKBOX_ITEM_COUNT, .boxName = NULL, .permanentId = 0xFF }
|
||||
};
|
||||
|
||||
|
@ -283,6 +284,7 @@ void initActiveBoxIds(void)
|
|||
}
|
||||
|
||||
ADD_ACTIVE_BOX(BOXBEEPERON);
|
||||
ADD_ACTIVE_BOX(BOXBEEPERMUTE);
|
||||
|
||||
#ifdef USE_LIGHTS
|
||||
ADD_ACTIVE_BOX(BOXLIGHTS);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue