Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed position for formation flight / inav radar #2029

Merged
merged 1 commit into from
Jun 22, 2024
Merged

Fixed position for formation flight / inav radar #2029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions locale/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4129,6 +4129,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"
},
Expand Down Expand Up @@ -4551,7 +4557,7 @@
},
"missionTitleAdd": {
"message": "Add"
},
},
"missionTitleMoveToCenterView": {
"message": "move to center view"
},
Expand All @@ -4565,7 +4571,7 @@
"message": "Edit Mission"
},
"MissionPlannerFwLAndingAltitudeChangeReset": {
"message": "Altitude below min land altitude. Change ignored"
"message": "Altitude below min land altitude. Change ignored"
},
"missionWpType": {
"message": "Type:"
Expand Down
16 changes: 14 additions & 2 deletions tabs/osd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 video_type = null;
Expand Down Expand Up @@ -1774,6 +1777,15 @@ OSD.constants = {
id: 99,
preview: FONT.symbol(SYM.DIRECTION) + '\nN',
},
{
name: 'FORMATION_FLIGHT',
id: 153,
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" ;
}
},
],
},
{
Expand Down Expand Up @@ -1912,7 +1924,7 @@ OSD.constants = {
min_version: '7.1.0',
positionable: true,
preview: "CE_3",
},
}
]
},
{
Expand Down Expand Up @@ -3845,4 +3857,4 @@ TABS.osd.cleanup = function (callback) {
$('.jBox-wrapper').remove();

if (callback) callback();
};
};
Loading