From 63fd963a040d21e05cbedeb2c1f73dae2891a58f Mon Sep 17 00:00:00 2001 From: error414 Date: Mon, 1 Apr 2024 14:37:58 +0200 Subject: [PATCH] Fixed position for formation flight / inav radar --- locale/en/messages.json | 10 ++++++++-- tabs/osd.js | 14 +++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/locale/en/messages.json b/locale/en/messages.json index f605ccafe..13f2efc7e 100644 --- a/locale/en/messages.json +++ b/locale/en/messages.json @@ -4042,6 +4042,12 @@ "osdElement_MAP_REFERENCE_HELP": { "message": "Reference (direction that points up) of the current map. N for North and T for takeoff direction." }, + "osdElement_FORMATION_FLIGHT": { + "message": "Inav radar fixed" + }, + "osdElement_FORMATION_FLIGHT_HELP": { + "message": "The closest aircraft from Inav radar/Formation flight" + }, "osdElement_WIND_SPEED_HORIZONTAL": { "message": "Horizontal wind speed" }, @@ -4464,7 +4470,7 @@ }, "missionTitleAdd": { "message": "Add" - }, + }, "missionTitleMoveToCenterView": { "message": "move to center view" }, @@ -4478,7 +4484,7 @@ "message": "Edit Mission" }, "MissionPlannerFwLAndingAltitudeChangeReset": { - "message": "Altitude below min land altitude. Change ignored" + "message": "Altitude below min land altitude. Change ignored" }, "missionWpType": { "message": "Type:" diff --git a/tabs/osd.js b/tabs/osd.js index c0ce01f56..1ea140c63 100644 --- a/tabs/osd.js +++ b/tabs/osd.js @@ -147,6 +147,9 @@ SYM.AH_AIRCRAFT2 = 0x1A4; SYM.AH_AIRCRAFT3 = 0x1A5; SYM.AH_AIRCRAFT4 = 0x1A6; +SYM.SYM_HUD_SIGNAL_3 = 0x163; +SYM.SYM_HUD_CARDINAL = 0x1BA; + SYM.AH_CROSSHAIRS = new Array(0x166, 0x1A4, new Array(0x190, 0x191, 0x192), new Array(0x193, 0x194, 0x195), new Array(0x196, 0x197, 0x198), new Array(0x199, 0x19A, 0x19B), new Array (0x19C, 0x19D, 0x19E), new Array (0x19F, 0x1A0, 0x1A1)); var useESCTelemetry = false; @@ -1781,6 +1784,15 @@ OSD.constants = { id: 99, preview: FONT.symbol(SYM.DIRECTION) + '\nN', }, + { + name: 'FORMATION_FLIGHT', + id: 152, + min_version: '8.0.0', + positionable: true, + preview: function(osd_data) { + return FONT.symbol(SYM.DIRECTION) + 'B' + FONT.symbol(SYM.SYM_HUD_SIGNAL_3) + FONT.symbol(SYM.SYM_HUD_CARDINAL) + "\n 150" + "\n" + FONT.symbol(SYM.AH_DECORATION_UP) + " 27" ; + } + }, ], }, { @@ -1919,7 +1931,7 @@ OSD.constants = { min_version: '7.1.0', positionable: true, preview: "CE_3", - }, + } ] }, {