Merge pull request #1927 from Asizon/osdChipDetectWarning

Improving osd chip detection warnings
10.7.0-preview
Michael Keller 2020-03-22 11:22:54 +13:00 committed by GitHub
commit 43fe183d1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 4 deletions

View File

@ -4085,6 +4085,9 @@
"osdSetupTitle": {
"message": "OSD"
},
"osdSetupNoOsdChipDetectWarning": {
"message": "<span class=\"message-negative\"><b>WARNING:</b></span> No OSD chip was detected. Some flight controllers will not properly power the OSD chip unless connected to battery power. Please connect the battery before connecting the USB (PROPS REMOVED!)."
},
"osdSetupPreviewHelp": {
"message": "<strong>Note:</strong> OSD preview may not show the actual font that is installed on the flight controller. The layout of individual elements may look different when older versions of the firmware are used - please check the look through your goggles before flying."
},

View File

@ -1424,6 +1424,7 @@ dialog .dialog_toolbar .btn a.disabled {
display: block;
transition: all ease 0.2s;
text-decoration:none;
cursor: pointer;
}
.default_btn a.disabled {

View File

@ -2244,6 +2244,10 @@ TABS.osd.initialize = function (callback) {
OSD.msp.decode(info);
if (!OSD.data.state.haveMax7456Video || !OSD.data.state.isMax7456Detected) {
$('.noOsdChipDetect').show();
}
if (OSD.data.state.haveSomeOsd == 0) {
$('.unsupported').fadeIn();
return;
@ -2466,11 +2470,10 @@ TABS.osd.initialize = function (callback) {
if (!OSD.data.state.haveMax7456Video) {
$('.requires-max7456').hide();
$('.requires-detected-max7456').hide();
}
if (!OSD.data.state.haveMax7456Video || !OSD.data.state.isMax7456Detected) {
$('.requires-detected-max7456').hide();
$('.requires-detected-max7456').addClass('disabled');
}
if (!OSD.data.state.haveOsdFeature) {

View File

@ -6,6 +6,9 @@
<div class="cf_doc_version_bt">
<a id="button-documentation" href="" target="_blank"></a>
</div>
<div class="noOsdChipDetect hide">
<p class="note" i18n="osdSetupNoOsdChipDetectWarning"></p>
</div>
<div class="unsupported hide">
<p class="note" i18n="osdSetupUnsupportedNote1"></p>
<p class="note" i18n="osdSetupUnsupportedNote2"></p>
@ -198,8 +201,8 @@
<div class="btn save">
<a class="active save" href="#" i18n="osdSetupSave"></a>
</div>
<div class="btn requires-detected-max7456">
<a class="fonts" id="fontmanager" href="#" i18n="osdSetupFontManager"></a>
<div class="btn">
<a class="fonts requires-detected-max7456" id="fontmanager" href="#" i18n="osdSetupFontManager"></a>
</div>
</div>
</div>