Skip to content

Use extended OSD glyphs for dot in numbers and second line for ADSB warning #2311

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

Closed
wants to merge 2 commits into from
Closed

Use extended OSD glyphs for dot in numbers and second line for ADSB warning #2311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eca4229
Use extended OSd glyphs for dot in numbers
error414 Jan 18, 2025
c02be70
second line for ADSB warning
error414 Apr 29, 2025
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
2 changes: 2 additions & 0 deletions js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ function createWindow() {
},
});

//mainWindow.webContents.openDevTools()

mainWindow.webContents.on('context-menu', (_, props) => {
const menu = new Menu() ;
menu.append(new MenuItem({ label: "Undo", role: "undo", accelerator: 'CmdOrCtrl+Z', visible: props.isEditable }));
Expand Down
50 changes: 47 additions & 3 deletions tabs/osd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ OSD.initData = function () {
right_sidebar_scroll: null,
sidebar_scroll_arrows: null,
units: null,
stats_energy_unit: null,
adsb_warning_style: null,
},
alarms: {
rssi: null,
Expand Down Expand Up @@ -693,6 +693,11 @@ OSD.constants = {
AHISIDEBARWIDTHPOSITION: 7,
AHISIDEBARHEIGHTPOSITION: 3,

ADSB_WARNING_STYLE: {
'COMPACT' : 0,
'EXTENDED' : 1,
},

ALL_ALARMS: [
{
name: 'RSSI',
Expand Down Expand Up @@ -733,6 +738,7 @@ OSD.constants = {
min: 0,
max: altitude_alarm_max
},

{
name: 'DIST',
field: 'dist',
Expand Down Expand Up @@ -1744,7 +1750,43 @@ OSD.constants = {
name: 'ADSB_WARNING_MESSAGE',
id: 150,
min_version: '7.1.0',
preview: FONT.symbol(SYM.ADSB) + '19.25' + FONT.symbol(SYM.DIR_TO_HOME+1) + '2.75',
preview: function(osd_data) {

var distanceSymbol;
var distanceSymbolSmaller;
var velocitySymbol;

switch (OSD.data.preferences.units) {
case 0: // Imperial
case 2: // Metric + MPH
distanceSymbol = SYM.KM;
distanceSymbolSmaller = SYM.M;
velocitySymbol = SYM.MPH;
break;
case 3: // UK
distanceSymbol = SYM.MI;
distanceSymbolSmaller = SYM.ALT_FT;
velocitySymbol = SYM.MPH;
break;
case 4: // GA
distanceSymbol = SYM.MI;
distanceSymbolSmaller = SYM.ALT_FT;
velocitySymbol = SYM.KT;
break;
default: // Metric
distanceSymbol = SYM.KM;
distanceSymbolSmaller = SYM.M;
velocitySymbol = SYM.KMH;
break;
}

var el = FONT.symbol(SYM.ADSB) + FONT.embed_dot('9.28') + FONT.symbol(distanceSymbol) + FONT.symbol(SYM.SYM_HUD_CARDINAL+5) + FONT.embed_dot('-423') + FONT.symbol(distanceSymbolSmaller);
if (OSD.data.preferences.adsb_warning_style !== null && OSD.data.preferences.adsb_warning_style === OSD.constants.ADSB_WARNING_STYLE.EXTENDED){
el += "\n" + "HEAVY " + FONT.symbol(SYM.DIR_TO_HOME+1)+FONT.embed_dot('653') + FONT.symbol(velocitySymbol);
}

return el;
},
},
{
name: 'ADSB_INFO',
Expand Down Expand Up @@ -2536,7 +2578,8 @@ OSD.msp = {
result.push8(p.right_sidebar_scroll);
result.push8(p.sidebar_scroll_arrows);
result.push8(p.units);
result.push8(p.stats_energy_unit)
result.push8(p.stats_energy_unit);
result.push8(p.adsb_warning_style)
return result;
},

Expand All @@ -2553,6 +2596,7 @@ OSD.msp = {
p.sidebar_scroll_arrows = prefs.readU8();
p.units = prefs.readU8();
p.stats_energy_unit = prefs.readU8();
p.adsb_warning_style = prefs.readU8();
},

encodeLayoutItem: function(layout, item, pos) {
Expand Down