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

MSP DisplayPort add DJI native #2222

Merged
merged 4 commits into from
Feb 13, 2025
Merged

MSP DisplayPort add DJI native #2222

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4190480
New video system type
mmosca Oct 29, 2024
104bb75
Update new option name
mmosca Nov 1, 2024
06defd8
Update osd.js
mmosca Jan 27, 2025
ab9f6db
missing ,
mmosca Feb 13, 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
22 changes: 13 additions & 9 deletions tabs/osd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,8 @@ OSD.constants = {
'DJIWTF',
'AVATAR',
'BF43COMPAT',
'BFHDCOMPAT'
'BFHDCOMPAT',
'DJI_NATIVE'
],
VIDEO_LINES: {
PAL: 16,
Expand All @@ -640,7 +641,8 @@ OSD.constants = {
DJIWTF: 22,
AVATAR: 20,
BF43COMPAT: 16,
BFHDCOMPAT: 20
BFHDCOMPAT: 20,
DJI_NATIVE: 20
},
VIDEO_COLS: {
PAL: 30,
Expand All @@ -649,7 +651,8 @@ OSD.constants = {
DJIWTF: 60,
AVATAR: 53,
BF43COMPAT: 30,
BFHDCOMPAT: 53
BFHDCOMPAT: 53,
DJI_NATIVE: 53,
},
VIDEO_BUFFER_CHARS: {
PAL: 480,
Expand All @@ -658,7 +661,8 @@ OSD.constants = {
DJIWTF: 1320,
AVATAR: 1060,
BF43COMPAT: 480,
BFHDCOMPAT: 1060
BFHDCOMPAT: 1060,
DJI_NATIVE: 1060
},
UNIT_TYPES: [
{name: 'osdUnitImperial', value: 0},
Expand Down Expand Up @@ -2325,9 +2329,9 @@ OSD.updateDisplaySize = function () {
$('.preview').toggleClass('preview_hdzero cut43_left', (video_type == 'HDZERO'))
$('.third_right').toggleClass('preview_hdzero_side', (video_type == 'HDZERO'))
// -- BFHDCOMPAT
$('.third_left').toggleClass('preview_bfhdcompat_side', (video_type == 'BFHDCOMPAT'))
$('.preview').toggleClass('preview_bfhdcompat cut43_left', (video_type == 'BFHDCOMPAT'))
$('.third_right').toggleClass('preview_bfhdcompat_side', (video_type == 'BFHDCOMPAT'))
$('.third_left').toggleClass('preview_bfhdcompat_side', (video_type == 'BFHDCOMPAT' || video_type == 'DJI_NATIVE'))
$('.preview').toggleClass('preview_bfhdcompat cut43_left', (video_type == 'BFHDCOMPAT' || video_type == 'DJI_NATIVE'))
$('.third_right').toggleClass('preview_bfhdcompat_side', (video_type == 'BFHDCOMPAT' || video_type == 'DJI_NATIVE'))

OSD.GUI.updateGuidesView($('#videoGuides').find('input').is(':checked'));
};
Expand Down Expand Up @@ -2616,7 +2620,7 @@ OSD.GUI.checkAndProcessSymbolPosition = function(pos, charCode) {
}
};

const mspVideoSystem = [1,3,4,5,6,7]; // indexes of PAL, HDZERO, DJIWTF, AVATAR, BF43COMPAT & BFHDCOMPAT
const mspVideoSystem = [1,3,4,5,6,7,8]; // indexes of PAL, HDZERO, DJIWTF, AVATAR, BF43COMPAT, BFHDCOMPAT & DJI_NATIVE
const analogVideoSystem = [0,1,2]; // indexes of AUTO, PAL, & NTSC

OSD.GUI.updateVideoMode = function() {
Expand Down Expand Up @@ -2929,7 +2933,7 @@ OSD.GUI.updateGuidesView = function(on) {
$('.hd_avatar_storage_box_left').toggleClass('hd_avatar_storagebox_l', (isAvatar && on))
$('.hd_avatar_storage_box_right').toggleClass('hd_avatar_storagebox_r', (isAvatar && on))

let isBfHdCompat = OSD.constants.VIDEO_TYPES[OSD.data.preferences.video_system] == 'BFHDCOMPAT';
let isBfHdCompat = OSD.constants.VIDEO_TYPES[OSD.data.preferences.video_system] == 'BFHDCOMPAT' || OSD.constants.VIDEO_TYPES[OSD.data.preferences.video_system] == 'DJI_NATIVE';
$('.hd_43_margin_left').toggleClass('hd_bfhdcompat_43_left', (isBfHdCompat && on));
$('.hd_43_margin_right').toggleClass('hd_bfhdcompat_43_right', (isBfHdCompat && on));
$('.hd_bfhdcompat_bottom_box').toggleClass('hd_bfhdcompat_bottom', (isBfHdCompat && on));
Expand Down