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

Remove OSD SW box mode

Browse source
This commit is contained in:
Konstantin Sharlaimov (DigitalEntity) 2018-04-26 20:53:53 +10:00
parent e3dafbf516
commit 3718732e0c
3 changed files with 1 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -55,7 +55,6 @@ static const box_t boxes[CHECKBOX_ITEM_COUNT + 1] = {
{ BOXBEEPERON, "BEEPER", 13 }, { BOXBEEPERON, "BEEPER", 13 },
{ BOXLEDLOW, "LEDLOW", 15 }, { BOXLEDLOW, "LEDLOW", 15 },
{ BOXLIGHTS, "LIGHTS", 16 }, { BOXLIGHTS, "LIGHTS", 16 },
{ BOXOSD, "OSD SW", 19 },
{ BOXTELEMETRY, "TELEMETRY", 20 }, { BOXTELEMETRY, "TELEMETRY", 20 },
{ BOXAUTOTUNE, "AUTO TUNE", 21 }, { BOXAUTOTUNE, "AUTO TUNE", 21 },
{ BOXBLACKBOX, "BLACKBOX", 26 }, { BOXBLACKBOX, "BLACKBOX", 26 },
@ -64,7 +63,6 @@ static const box_t boxes[CHECKBOX_ITEM_COUNT + 1] = {
{ BOXAIRMODE, "AIR MODE", 29 }, { BOXAIRMODE, "AIR MODE", 29 },
{ BOXHOMERESET, "HOME RESET", 30 }, { BOXHOMERESET, "HOME RESET", 30 },
{ BOXGCSNAV, "GCS NAV", 31 }, { BOXGCSNAV, "GCS NAV", 31 },
//{ BOXHEADINGLOCK, "HEADING LOCK", 32 },
{ BOXSURFACE, "SURFACE", 33 }, { BOXSURFACE, "SURFACE", 33 },
{ BOXFLAPERON, "FLAPERON", 34 }, { BOXFLAPERON, "FLAPERON", 34 },
{ BOXTURNASSIST, "TURN ASSIST", 35 }, { BOXTURNASSIST, "TURN ASSIST", 35 },
@ -224,8 +222,6 @@ void initActiveBoxIds(void)
} }
#endif #endif
activeBoxIds[activeBoxIdCount++] = BOXOSD;
#ifdef USE_TELEMETRY #ifdef USE_TELEMETRY
if (feature(FEATURE_TELEMETRY) && telemetryConfig()->telemetry_switch) if (feature(FEATURE_TELEMETRY) && telemetryConfig()->telemetry_switch)
activeBoxIds[activeBoxIdCount++] = BOXTELEMETRY; activeBoxIds[activeBoxIdCount++] = BOXTELEMETRY;
@ -280,7 +276,6 @@ void packBoxModeFlags(boxBitmask_t * mspBoxModeFlags)
CHECK_ACTIVE_BOX(IS_ENABLED(IS_RC_MODE_ACTIVE(BOXBEEPERON)), BOXBEEPERON); CHECK_ACTIVE_BOX(IS_ENABLED(IS_RC_MODE_ACTIVE(BOXBEEPERON)), BOXBEEPERON);
CHECK_ACTIVE_BOX(IS_ENABLED(IS_RC_MODE_ACTIVE(BOXLEDLOW)), BOXLEDLOW); CHECK_ACTIVE_BOX(IS_ENABLED(IS_RC_MODE_ACTIVE(BOXLEDLOW)), BOXLEDLOW);
CHECK_ACTIVE_BOX(IS_ENABLED(IS_RC_MODE_ACTIVE(BOXLIGHTS)), BOXLIGHTS); CHECK_ACTIVE_BOX(IS_ENABLED(IS_RC_MODE_ACTIVE(BOXLIGHTS)), BOXLIGHTS);
CHECK_ACTIVE_BOX(IS_ENABLED(IS_RC_MODE_ACTIVE(BOXOSD)), BOXOSD);
CHECK_ACTIVE_BOX(IS_ENABLED(IS_RC_MODE_ACTIVE(BOXTELEMETRY)), BOXTELEMETRY); CHECK_ACTIVE_BOX(IS_ENABLED(IS_RC_MODE_ACTIVE(BOXTELEMETRY)), BOXTELEMETRY);
CHECK_ACTIVE_BOX(IS_ENABLED(ARMING_FLAG(ARMED)), BOXARM); CHECK_ACTIVE_BOX(IS_ENABLED(ARMING_FLAG(ARMED)), BOXARM);
CHECK_ACTIVE_BOX(IS_ENABLED(IS_RC_MODE_ACTIVE(BOXBLACKBOX)), BOXBLACKBOX); CHECK_ACTIVE_BOX(IS_ENABLED(IS_RC_MODE_ACTIVE(BOXBLACKBOX)), BOXBLACKBOX);

2
src/main/fc/rc_modes.h
View file

@ -39,7 +39,7 @@ typedef enum {
BOXLEDLOW = 12, BOXLEDLOW = 12,
BOXLIGHTS = 13, BOXLIGHTS = 13,
BOXNAVLAUNCH = 14, BOXNAVLAUNCH = 14,
BOXOSD = 15, // BOXOSD = 15,
BOXTELEMETRY = 16, BOXTELEMETRY = 16,
BOXBLACKBOX = 17, BOXBLACKBOX = 17,
BOXFAILSAFE = 18, BOXFAILSAFE = 18,

6
src/main/io/osd.c
View file

@ -1934,12 +1934,6 @@ static void osdRefresh(timeUs_t currentTimeUs)
{ {
static timeUs_t lastTimeUs = 0; static timeUs_t lastTimeUs = 0;
if (IS_RC_MODE_ACTIVE(BOXOSD) && (!cmsInMenu)) {
displayClearScreen(osdDisplayPort);
armState = ARMING_FLAG(ARMED);
return;
}
// detect arm/disarm // detect arm/disarm
if (armState != ARMING_FLAG(ARMED)) { if (armState != ARMING_FLAG(ARMED)) {
if (ARMING_FLAG(ARMED)) { if (ARMING_FLAG(ARMED)) {