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

Merge branch 'master' into avs-automatic-servo-trim

# Conflicts:
#	docs/Settings.md
#	src/main/build/debug.h
#	src/main/fc/settings.yaml
This commit is contained in:
Alexander van Saase 2021-05-01 08:43:35 +02:00
commit f2ac92b1bf
226 changed files with 38760 additions and 3873 deletions

View file

@ -58,9 +58,9 @@ static const box_t boxes[CHECKBOX_ITEM_COUNT + 1] = {
{ BOXNAVPOSHOLD, "NAV POSHOLD", 11 }, // old GPS HOLD
{ BOXMANUAL, "MANUAL", 12 },
{ BOXBEEPERON, "BEEPER", 13 },
{ BOXLEDLOW, "LEDLOW", 15 },
{ BOXLEDLOW, "LEDS OFF", 15 },
{ BOXLIGHTS, "LIGHTS", 16 },
{ BOXOSD, "OSD SW", 19 },
{ BOXOSD, "OSD OFF", 19 },
{ BOXTELEMETRY, "TELEMETRY", 20 },
{ BOXAUTOTUNE, "AUTO TUNE", 21 },
{ BOXBLACKBOX, "BLACKBOX", 26 },