speedybac
/
inav-configurator
mirror of https://github.com/iNavFlight/inav-configurator
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1683 from iNavFlight/MrD_update-MSPDisplayPort-and-add-Avatar-stuff

Browse Source 
Update MSPDisplayPort and add Walksnail Avatar settings
pull/1696/head
Darren Lines 2 years ago committed by GitHub
parent ede1be1933 96459c507d
commit 6bc27d22f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 117 additions and 24 deletions
Show Stats Download Patch File Download Diff File

69
src/css/tabs/osd.css
Unescape Escape View File

@ -430,6 +430,31 @@ button {
left: calc(50% - 197px); left: calc(50% - 197px);
} }
.tab-osd .preview_avatar {
width: 636px !important; /* 12 X char width */
left: calc(50% - 335px) !important; /* width / 2 + 17 */
}
.tab-osd .hd_avatar_43_left {
border-left: 2px solid red;
position: absolute;
/*left: 77.5px; // Calculated correct position */
left: 30px;
height: calc(100% - 27px);
}
.tab-osd .hd_avatar_43_right {
border-right: 2px solid red;
position: absolute;
/* right: 77.5px; // Calculated correct position */
right: 36px;
height: calc(100% - 27px);
}
.tab-osd .preview_avatar_side {
width: calc(50% - 335px) !important;
}
.tab-osd .preview_hdzero { .tab-osd .preview_hdzero {
width: 600px !important; width: 600px !important;
left: calc(50% - 317px) !important; left: calc(50% - 317px) !important;
@ -508,6 +533,50 @@ button {
height: 288px; height: 288px;
} }
.tab-osd .hd_avatar_bottom {
border-bottom: 2px solid purple;
position: absolute;
bottom: 33px;
left: 0px;
right: 0px;
}
.tab-osd .hd_avatar_storagebox_t {
border-top: 2px solid purple;
position: absolute;
top: 56px;
height: 1px;
right: 34px;
width: 48px;
}
.tab-osd .hd_avatar_storagebox_b {
border-bottom: 2px solid purple;
position: absolute;
top: 88px;
height: 1px;
right: 34px;
width: 48px;
}
.tab-osd .hd_avatar_storagebox_l {
border-left: 2px solid purple;
position: absolute;
top: 56px;
height: 35px;
right: 80px;
width: 1px;
}
.tab-osd .hd_avatar_storagebox_r {
border-right: 2px solid purple;
position: absolute;
top: 56px;
height: 35px;
right: 32px;
width: 1px;
}
.tab-osd .ntsc_bottom { .tab-osd .ntsc_bottom {
border-bottom: 2px solid green; border-bottom: 2px solid green;
position: absolute; position: absolute;

7
tabs/osd.html
Unescape Escape View File

@ -38,6 +38,11 @@
<div class="hd_3016_box_left"></div> <div class="hd_3016_box_left"></div>
<div class="hd_3016_box_right"></div> <div class="hd_3016_box_right"></div>
<div class="pal_ntsc_box_bottom"></div> <div class="pal_ntsc_box_bottom"></div>
<div class="hd_avatar_storage_box_top"></div>
<div class="hd_avatar_storage_box_bottom"></div>
<div class="hd_avatar_storage_box_left"></div>
<div class="hd_avatar_storage_box_right"></div>
<div class="hd_avatar_bottom_bar"></div>
<div class="preview"></div> <div class="preview"></div>
</div> </div>
</div> </div>
@ -48,7 +53,7 @@
<div class="spacer_box_title" data-i18n="osd_video_format"></div> <div class="spacer_box_title" data-i18n="osd_video_format"></div>
</div> </div>
<div class="spacer_box"> <div class="spacer_box">
<div class="video-types"></div> <select class="video-types"></select>
</div> </div>
<div class="spacer_box settings"> <div class="spacer_box settings">
<div for="osd_video_show_guides" class="helpicon cf_tip" data-i18n_title="osd_video_HELP"></div> <div for="osd_video_show_guides" class="helpicon cf_tip" data-i18n_title="osd_video_HELP"></div>

65
tabs/osd.js
Unescape Escape View File

@ -123,7 +123,7 @@ SYM.AH_AIRCRAFT4 = 0x1A6;
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)); 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; var video_type = null;
var isGuidesChecked = false;
var FONT = FONT || {}; var FONT = FONT || {};
FONT.initData = function () { FONT.initData = function () {
@ -539,6 +539,7 @@ OSD.constants = {
'NTSC', 'NTSC',
'HDZERO', 'HDZERO',
'DJIWTF', 'DJIWTF',
'AVATAR',
'BF43COMPAT' 'BF43COMPAT'
], ],
VIDEO_LINES: { VIDEO_LINES: {
@ -546,6 +547,7 @@ OSD.constants = {
NTSC: 13, NTSC: 13,
HDZERO: 18, HDZERO: 18,
DJIWTF: 22, DJIWTF: 22,
AVATAR: 20,
BF43COMPAT: 16, BF43COMPAT: 16,
}, },
VIDEO_COLS: { VIDEO_COLS: {
@ -553,6 +555,7 @@ OSD.constants = {
NTSC: 30, NTSC: 30,
HDZERO: 50, HDZERO: 50,
DJIWTF: 60, DJIWTF: 60,
AVATAR: 53,
BF43COMPAT: 30 BF43COMPAT: 30
}, },
VIDEO_BUFFER_CHARS: { VIDEO_BUFFER_CHARS: {
@ -560,6 +563,7 @@ OSD.constants = {
NTSC: 390, NTSC: 390,
HDZERO: 900, HDZERO: 900,
DJIWTF: 1320, DJIWTF: 1320,
AVATAR: 1060,
BF43COMPAT: 480 BF43COMPAT: 480
}, },
UNIT_TYPES: [ UNIT_TYPES: [
@ -2100,15 +2104,20 @@ OSD.updateDisplaySize = function () {
} }
} }
// set the preview size if dji wtf // set the preview size based on the video type
// -- AVATAR
$('.third_left').toggleClass('preview_avatar_side', (video_type == 'AVATAR'))
$('.preview').toggleClass('preview_avatar cut43_left', (video_type == 'AVATAR'))
$('.third_right').toggleClass('preview_avatar_side', (video_type == 'AVATAR'))
// -- DJI WTF
$('.third_left').toggleClass('preview_dji_hd_side', video_type == 'DJIWTF') $('.third_left').toggleClass('preview_dji_hd_side', video_type == 'DJIWTF')
$('.preview').toggleClass('preview_dji_hd cut43_left', video_type == 'DJIWTF') $('.preview').toggleClass('preview_dji_hd cut43_left', video_type == 'DJIWTF')
$('.third_right').toggleClass('preview_dji_hd_side', video_type == 'DJIWTF') $('.third_right').toggleClass('preview_dji_hd_side', video_type == 'DJIWTF')
// -- HD ZERO
// set the preview size based on the video type
$('.third_left').toggleClass('preview_hdzero_side', (video_type == 'HDZERO')) $('.third_left').toggleClass('preview_hdzero_side', (video_type == 'HDZERO'))
$('.preview').toggleClass('preview_hdzero cut43_left', (video_type == 'HDZERO')) $('.preview').toggleClass('preview_hdzero cut43_left', (video_type == 'HDZERO'))
$('.third_right').toggleClass('preview_hdzero_side', (video_type == 'HDZERO')) $('.third_right').toggleClass('preview_hdzero_side', (video_type == 'HDZERO'))
OSD.GUI.updateGuidesView($('#videoGuides').find('input').is(':checked')); OSD.GUI.updateGuidesView($('#videoGuides').find('input').is(':checked'));
}; };
@ -2392,7 +2401,7 @@ OSD.GUI.checkAndProcessSymbolPosition = function(pos, charCode) {
} }
}; };
const mspVideoSystem = [1,3,4,5]; // indexes of PAL, HDZERO, DJIWTF, & BF43COMPAT const mspVideoSystem = [1,3,4,5,6]; // indexes of PAL, HDZERO, DJIWTF,AVATAR, & BF43COMPAT
const analogVideoSystem = [0,1,2]; // indexes of AUTO, PAL, & NTSC const analogVideoSystem = [0,1,2]; // indexes of AUTO, PAL, & NTSC
OSD.GUI.updateVideoMode = function() { OSD.GUI.updateVideoMode = function() {
@ -2422,11 +2431,9 @@ OSD.GUI.updateVideoMode = function() {
if (mspVideoSystem.includes(i)) if (mspVideoSystem.includes(i))
{ {
$videoTypes.append( $videoTypes.append(
$('<label/>') $('<option value="' + OSD.constants.VIDEO_TYPES[i] + '">' + OSD.constants.VIDEO_TYPES[i] + '</option>')
.append($('<input name="video_system" type="radio"/>' + OSD.constants.VIDEO_TYPES[i] + '</label>') .prop('selected', i === OSD.data.preferences.video_system)
.prop('checked', i === OSD.data.preferences.video_system)
.data('type', i) .data('type', i)
)
); );
} }
} }
@ -2435,18 +2442,16 @@ OSD.GUI.updateVideoMode = function() {
if (analogVideoSystem.includes(i)) if (analogVideoSystem.includes(i))
{ {
$videoTypes.append( $videoTypes.append(
$('<label/>') $('<option value="' + OSD.constants.VIDEO_TYPES[i] + '">' + OSD.constants.VIDEO_TYPES[i] + '</option>')
.append($('<input name="video_system" type="radio"/>' + OSD.constants.VIDEO_TYPES[i] + '</label>') .prop('selected', i === OSD.data.preferences.video_system)
.prop('checked', i === OSD.data.preferences.video_system)
.data('type', i) .data('type', i)
)
); );
} }
} }
} }
$videoTypes.find(':radio').click(function () { $videoTypes.change(function () {
OSD.data.preferences.video_system = $(this).data('type'); OSD.data.preferences.video_system = $(this).find(':selected').data('type');
OSD.updateDisplaySize(); OSD.updateDisplaySize();
OSD.GUI.saveConfig(); OSD.GUI.saveConfig();
}); });
@ -2620,9 +2625,10 @@ OSD.GUI.updateFields = function() {
if ($('#videoGuidesToggle').length == false) { if ($('#videoGuidesToggle').length == false) {
$('#videoGuides').prepend( $('#videoGuides').prepend(
$('<input id="videoGuidesToggle" type="checkbox" class="toggle" />') $('<input id="videoGuidesToggle" type="checkbox" class="toggle" />')
.attr('checked', false) .attr('checked', isGuidesChecked)
.on('change', function () { .on('change', function () {
OSD.GUI.updateGuidesView(this.checked); OSD.GUI.updateGuidesView(this.checked);
chrome.storage.local.set({'showOSDGuides': this.checked});
OSD.GUI.updatePreviews(); OSD.GUI.updatePreviews();
}) })
); );
@ -2642,9 +2648,9 @@ OSD.GUI.updateFields = function() {
// needs to be called after all of them have been set up // needs to be called after all of them have been set up
GUI.switchery(); GUI.switchery();
// Update the OSD preview // Update the OSD preview
refreshOSDSwitchIndicators(); refreshOSDSwitchIndicators();
updateCraftName(); updateCraftName();
}; };
OSD.GUI.removeBottomLines = function(){ OSD.GUI.removeBottomLines = function(){
@ -2664,8 +2670,6 @@ OSD.GUI.removeBottomLines = function(){
}); });
}; };
OSD.GUI.updateDjiMessageElements = function(on) { OSD.GUI.updateDjiMessageElements = function(on) {
$('.display-field').each(function(index, element) { $('.display-field').each(function(index, element) {
var name = $(element).find('input').attr('name'); var name = $(element).find('input').attr('name');
@ -2699,6 +2703,15 @@ OSD.GUI.updateGuidesView = function(on) {
$('.hd_43_margin_left').toggleClass('dji_hd_43_left', (isDJIWTF && on)) $('.hd_43_margin_left').toggleClass('dji_hd_43_left', (isDJIWTF && on))
$('.hd_43_margin_right').toggleClass('dji_hd_43_right', (isDJIWTF && on)) $('.hd_43_margin_right').toggleClass('dji_hd_43_right', (isDJIWTF && on))
isAvatar = OSD.constants.VIDEO_TYPES[OSD.data.preferences.video_system] == 'AVATAR';
$('.hd_43_margin_left').toggleClass('hd_avatar_43_left', (isAvatar && on))
$('.hd_43_margin_right').toggleClass('hd_avatar_43_right', (isAvatar && on))
$('.hd_avatar_bottom_bar').toggleClass('hd_avatar_bottom', (isAvatar && on))
$('.hd_avatar_storage_box_top').toggleClass('hd_avatar_storagebox_t', (isAvatar && on))
$('.hd_avatar_storage_box_bottom').toggleClass('hd_avatar_storagebox_b', (isAvatar && 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))
isPAL = OSD.constants.VIDEO_TYPES[OSD.data.preferences.video_system] == 'PAL' || OSD.constants.VIDEO_TYPES[OSD.data.preferences.video_system] == 'AUTO'; isPAL = OSD.constants.VIDEO_TYPES[OSD.data.preferences.video_system] == 'PAL' || OSD.constants.VIDEO_TYPES[OSD.data.preferences.video_system] == 'AUTO';
$('.pal_ntsc_box_bottom').toggleClass('ntsc_bottom', (isPAL && on)) $('.pal_ntsc_box_bottom').toggleClass('ntsc_bottom', (isPAL && on))
}; };
@ -2836,7 +2849,7 @@ OSD.GUI.updatePreviews = function() {
var centerPosition = (OSD.data.display_size.x * OSD.data.display_size.y / 2); var centerPosition = (OSD.data.display_size.x * OSD.data.display_size.y / 2);
if (OSD.data.display_size.y % 2 == 0) { if (OSD.data.display_size.y % 2 == 0) {
centerPosition += OSD.data.display_size.x / 2; centerPosition += Math.floor(OSD.data.display_size.x / 2);
} }
let hudCenterPosition = centerPosition - (OSD.constants.VIDEO_COLS[video_type] * $('#osd_horizon_offset').val()); let hudCenterPosition = centerPosition - (OSD.constants.VIDEO_COLS[video_type] * $('#osd_horizon_offset').val());
@ -2970,7 +2983,7 @@ OSD.GUI.updateAll = function() {
OSD.GUI.updateUnits(); OSD.GUI.updateUnits();
OSD.GUI.updateFields(); OSD.GUI.updateFields();
OSD.GUI.updatePreviews(); OSD.GUI.updatePreviews();
OSD.GUI.updateGuidesView(false); OSD.GUI.updateGuidesView($('#videoGuides').find('input').is(':checked'));
OSD.GUI.updateDjiView(OSD.data.isDjiHdFpv && !OSD.data.isMspDisplay); OSD.GUI.updateDjiView(OSD.data.isDjiHdFpv && !OSD.data.isMspDisplay);
}; };
@ -3029,6 +3042,12 @@ TABS.osd.initialize = function (callback) {
}); });
}); });
// Initialise guides checkbox
chrome.storage.local.get('showOSDGuides', function (result) {
if (typeof result.showOSDGuides !== 'undefined') {
isGuidesChecked = result.showOSDGuides;
}
});
// Setup switch indicators // Setup switch indicators
$(".osdSwitchInd_channel option").each(function() { $(".osdSwitchInd_channel option").each(function() {

Write Preview
Loading…
Cancel
Save