Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-25 17:25:20 +03:00
Code Issues Wiki Activity

OSD: Move crosshair to active elements and not background

Browse source
This commit is contained in:
Miguel Angel Mulero Martinez 2020-06-25 13:50:16 +02:00
parent d85b372ae7
commit 10a67e3a1a
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/osd/osd_elements.c
View file

@ -702,7 +702,7 @@ static void osdElementCrashFlipArrow(osdElementParms_t *element)
} }
#endif // USE_ACC #endif // USE_ACC
static void osdBackgroundCrosshairs(osdElementParms_t *element) static void osdElementCrosshairs(osdElementParms_t *element)
{ {
element->buff[0] = SYM_AH_CENTER_LINE; element->buff[0] = SYM_AH_CENTER_LINE;
element->buff[1] = SYM_AH_CENTER; element->buff[1] = SYM_AH_CENTER;
@ -1619,7 +1619,7 @@ const osdElementDrawFn osdElementDrawFunction[OSD_ITEM_COUNT] = {
[OSD_CAMERA_FRAME] = NULL, // only has background. Added first so it's the lowest "layer" and doesn't cover other elements [OSD_CAMERA_FRAME] = NULL, // only has background. Added first so it's the lowest "layer" and doesn't cover other elements
[OSD_RSSI_VALUE] = osdElementRssi, [OSD_RSSI_VALUE] = osdElementRssi,
[OSD_MAIN_BATT_VOLTAGE] = osdElementMainBatteryVoltage, [OSD_MAIN_BATT_VOLTAGE] = osdElementMainBatteryVoltage,
[OSD_CROSSHAIRS] = NULL, // only has background [OSD_CROSSHAIRS] = osdElementCrosshairs, // only has background, but needs to be over other elements (like artificial horizon)
#ifdef USE_ACC #ifdef USE_ACC
[OSD_ARTIFICIAL_HORIZON] = osdElementArtificialHorizon, [OSD_ARTIFICIAL_HORIZON] = osdElementArtificialHorizon,
#endif #endif
@ -1728,7 +1728,6 @@ const osdElementDrawFn osdElementDrawFunction[OSD_ITEM_COUNT] = {
const osdElementDrawFn osdElementBackgroundFunction[OSD_ITEM_COUNT] = { const osdElementDrawFn osdElementBackgroundFunction[OSD_ITEM_COUNT] = {
[OSD_CAMERA_FRAME] = osdBackgroundCameraFrame, [OSD_CAMERA_FRAME] = osdBackgroundCameraFrame,
[OSD_CROSSHAIRS] = osdBackgroundCrosshairs,
[OSD_HORIZON_SIDEBARS] = osdBackgroundHorizonSidebars, [OSD_HORIZON_SIDEBARS] = osdBackgroundHorizonSidebars,
[OSD_CRAFT_NAME] = osdBackgroundCraftName, [OSD_CRAFT_NAME] = osdBackgroundCraftName,
#ifdef USE_OSD_STICK_OVERLAY #ifdef USE_OSD_STICK_OVERLAY