From 4190480e47afc8f9fc36d4a60810161624368958 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Tue, 29 Oct 2024 21:53:52 +0100 Subject: [PATCH 1/4] New video system type --- tabs/osd.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tabs/osd.js b/tabs/osd.js index 92e58ebb8..33b397105 100644 --- a/tabs/osd.js +++ b/tabs/osd.js @@ -631,7 +631,8 @@ OSD.constants = { 'DJIWTF', 'AVATAR', 'BF43COMPAT', - 'BFHDCOMPAT' + 'BFHDCOMPAT', + 'DJINEW' ], VIDEO_LINES: { PAL: 16, @@ -640,7 +641,8 @@ OSD.constants = { DJIWTF: 22, AVATAR: 20, BF43COMPAT: 16, - BFHDCOMPAT: 20 + BFHDCOMPAT: 20, + DJINEW: 20 }, VIDEO_COLS: { PAL: 30, @@ -649,7 +651,8 @@ OSD.constants = { DJIWTF: 60, AVATAR: 53, BF43COMPAT: 30, - BFHDCOMPAT: 53 + BFHDCOMPAT: 53, + DJINEW: 53, }, VIDEO_BUFFER_CHARS: { PAL: 480, @@ -659,6 +662,7 @@ OSD.constants = { AVATAR: 1060, BF43COMPAT: 480, BFHDCOMPAT: 1060 + DJINEW: 1060 }, UNIT_TYPES: [ {name: 'osdUnitImperial', value: 0}, @@ -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 == 'DJINEW')) + $('.preview').toggleClass('preview_bfhdcompat cut43_left', (video_type == 'BFHDCOMPAT' || video_type == 'DJINEW')) + $('.third_right').toggleClass('preview_bfhdcompat_side', (video_type == 'BFHDCOMPAT' || video_type == 'DJINEW')) OSD.GUI.updateGuidesView($('#videoGuides').find('input').is(':checked')); }; @@ -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 & DJINEW const analogVideoSystem = [0,1,2]; // indexes of AUTO, PAL, & NTSC OSD.GUI.updateVideoMode = function() { @@ -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] == 'DJINEW'; $('.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)); From 104bb7509ca39df035a33f0edf869a2e7defb215 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Fri, 1 Nov 2024 11:18:29 +0100 Subject: [PATCH 2/4] Update new option name --- tabs/osd.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tabs/osd.js b/tabs/osd.js index 33b397105..e7aa02607 100644 --- a/tabs/osd.js +++ b/tabs/osd.js @@ -632,7 +632,7 @@ OSD.constants = { 'AVATAR', 'BF43COMPAT', 'BFHDCOMPAT', - 'DJINEW' + 'DJI_NATIVE' ], VIDEO_LINES: { PAL: 16, @@ -642,7 +642,7 @@ OSD.constants = { AVATAR: 20, BF43COMPAT: 16, BFHDCOMPAT: 20, - DJINEW: 20 + DJI_NATIVE: 20 }, VIDEO_COLS: { PAL: 30, @@ -652,7 +652,7 @@ OSD.constants = { AVATAR: 53, BF43COMPAT: 30, BFHDCOMPAT: 53, - DJINEW: 53, + DJI_NATIVE: 53, }, VIDEO_BUFFER_CHARS: { PAL: 480, @@ -662,7 +662,7 @@ OSD.constants = { AVATAR: 1060, BF43COMPAT: 480, BFHDCOMPAT: 1060 - DJINEW: 1060 + DJI_NATIVE: 1060 }, UNIT_TYPES: [ {name: 'osdUnitImperial', value: 0}, @@ -2329,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' || video_type == 'DJINEW')) - $('.preview').toggleClass('preview_bfhdcompat cut43_left', (video_type == 'BFHDCOMPAT' || video_type == 'DJINEW')) - $('.third_right').toggleClass('preview_bfhdcompat_side', (video_type == 'BFHDCOMPAT' || video_type == 'DJINEW')) + $('.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')); }; @@ -2620,7 +2620,7 @@ OSD.GUI.checkAndProcessSymbolPosition = function(pos, charCode) { } }; -const mspVideoSystem = [1,3,4,5,6,7,8]; // indexes of PAL, HDZERO, DJIWTF, AVATAR, BF43COMPAT, BFHDCOMPAT & DJINEW +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() { @@ -2933,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' || OSD.constants.VIDEO_TYPES[OSD.data.preferences.video_system] == 'DJINEW'; + 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)); From 06defd8e90ecd885253ca314581dfbd823505312 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 27 Jan 2025 16:19:37 +0100 Subject: [PATCH 3/4] Update osd.js --- tabs/osd.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tabs/osd.js b/tabs/osd.js index e7aa02607..96cea7053 100644 --- a/tabs/osd.js +++ b/tabs/osd.js @@ -632,7 +632,7 @@ OSD.constants = { 'AVATAR', 'BF43COMPAT', 'BFHDCOMPAT', - 'DJI_NATIVE' + 'DJI_NATIVE' ], VIDEO_LINES: { PAL: 16, From ab9f6dbe65cfe364885abf815f58dac75079125e Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Thu, 13 Feb 2025 21:20:30 +0100 Subject: [PATCH 4/4] missing , --- tabs/osd.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tabs/osd.js b/tabs/osd.js index 96cea7053..b5dec0820 100644 --- a/tabs/osd.js +++ b/tabs/osd.js @@ -661,7 +661,7 @@ OSD.constants = { DJIWTF: 1320, AVATAR: 1060, BF43COMPAT: 480, - BFHDCOMPAT: 1060 + BFHDCOMPAT: 1060, DJI_NATIVE: 1060 }, UNIT_TYPES: [