1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 16:25:31 +03:00

Merge pull request #3326 from DanNixon/osd_fix_typo

Fix broken if-else from 41668fa
This commit is contained in:
Michael Keller 2017-06-22 13:01:07 +12:00 committed by GitHub
commit 19ebc38e0d

View file

@ -644,12 +644,7 @@ static void osdDrawElements(void)
if (IS_RC_MODE_ACTIVE(BOXOSD)) if (IS_RC_MODE_ACTIVE(BOXOSD))
return; return;
#ifdef CMS if (sensors(SENSOR_ACC)) {
else if (sensors(SENSOR_ACC) || displayIsGrabbed(osdDisplayPort))
#else
else if (sensors(SENSOR_ACC))
#endif
{
osdDrawSingleElement(OSD_ARTIFICIAL_HORIZON); osdDrawSingleElement(OSD_ARTIFICIAL_HORIZON);
} }
@ -683,12 +678,7 @@ static void osdDrawElements(void)
osdDrawSingleElement(OSD_COMPASS_BAR); osdDrawSingleElement(OSD_COMPASS_BAR);
#ifdef GPS #ifdef GPS
#ifdef CMS if (sensors(SENSOR_GPS)) {
if (sensors(SENSOR_GPS) || displayIsGrabbed(osdDisplayPort))
#else
if (sensors(SENSOR_GPS))
#endif
{
osdDrawSingleElement(OSD_GPS_SATS); osdDrawSingleElement(OSD_GPS_SATS);
osdDrawSingleElement(OSD_GPS_SPEED); osdDrawSingleElement(OSD_GPS_SPEED);
osdDrawSingleElement(OSD_GPS_LAT); osdDrawSingleElement(OSD_GPS_LAT);