Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-19 06:15:16 +03:00
Code Issues Wiki Activity

Unified BOX3DDISABLE and BOX3DONASWITCH switches.

Browse source
This commit is contained in:
mikeller 2018-02-13 20:02:02 +13:00
parent a301a0019e
commit 232fc4e8de
9 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/main/interface/msp_box.c
View file

@ -73,7 +73,7 @@ static const box_t boxes[CHECKBOX_ITEM_COUNT] = {
{ BOXBLACKBOX, "BLACKBOX", 26 },
{ BOXFAILSAFE, "FAILSAFE", 27 },
{ BOXAIRMODE, "AIR MODE", 28 },
{ BOX3DDISABLE, "DISABLE 3D", 29},
{ BOX3D, "DISABLE / SWITCH 3D", 29},
{ BOXFPVANGLEMIX, "FPV ANGLE MIX", 30},
{ BOXBLACKBOXERASE, "BLACKBOX ERASE (>30s)", 31 },
{ BOXCAMERA1, "CAMERA CONTROL 1", 32},
@ -82,7 +82,7 @@ static const box_t boxes[CHECKBOX_ITEM_COUNT] = {
{ BOXFLIPOVERAFTERCRASH, "FLIP OVER AFTER CRASH", 35 },
{ BOXPREARM, "PREARM", 36 },
{ BOXBEEPGPSCOUNT, "BEEP GPS SATELLITE COUNT", 37 },
{ BOX3DONASWITCH, "3D ON A SWITCH", 38 },
// { BOX3DONASWITCH, "3D ON A SWITCH", 38 }, (removed)
{ BOXVTXPITMODE, "VTX PIT MODE", 39 },
{ BOXUSER1, "USER1", 40 },
{ BOXUSER2, "USER2", 41 },
@ -224,8 +224,7 @@ void initActiveBoxIds(void)
BME(BOXFPVANGLEMIX);
if (feature(FEATURE_3D)) {
BME(BOX3DDISABLE);
BME(BOX3DONASWITCH);
BME(BOX3D);
}
if (isMotorProtocolDshot()) {