Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-21 23:35:22 +03:00
Code Issues Wiki Activity

Merge pull request #1852 from fiam/agh_fix_font_manager

Browse source
This commit is contained in:
Michael Keller 2020-05-27 08:39:59 +12:00 • committed by GitHub
commit 3a5afe207c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
locales/en/messages.json
View file

@ -1550,6 +1550,9 @@
"portsFunction_RUNCAM_DEVICE_CONTROL": { "portsFunction_RUNCAM_DEVICE_CONTROL": {
"message": "Camera (RunCam Protocol)" "message": "Camera (RunCam Protocol)"
}, },
"portsFunction_FRSKY_OSD": {
"message": "OSD (FrSky Protocol)"
},
"pidTuningProfileOption": { "pidTuningProfileOption": {
"message": "Profile $1" "message": "Profile $1"
}, },

3
src/js/msp/MSPHelper.js
View file

@ -24,7 +24,8 @@ function MspHelper () {
'TELEMETRY_IBUS': 12, 'TELEMETRY_IBUS': 12,
'IRC_TRAMP': 13, 'IRC_TRAMP': 13,
'RUNCAM_DEVICE_CONTROL': 14, // support communitate with RunCam Device 'RUNCAM_DEVICE_CONTROL': 14, // support communitate with RunCam Device
'LIDAR_TF': 15 'LIDAR_TF': 15,
'FRSKY_OSD': 16,
}; };
self.REBOOT_TYPES = { self.REBOOT_TYPES = {

14
src/js/tabs/osd.js
View file

@ -1881,8 +1881,10 @@ OSD.msp = {
d.state = {}; d.state = {};
d.state.haveSomeOsd = (d.flags != 0) d.state.haveSomeOsd = (d.flags != 0)
d.state.haveMax7456Video = bit_check(d.flags, 4) || (d.flags == 1 && semver.lt(CONFIG.apiVersion, "1.34.0")); d.state.haveMax7456Configured = bit_check(d.flags, 4) || (d.flags == 1 && semver.lt(CONFIG.apiVersion, "1.34.0"));
d.state.isMax7456Detected = bit_check(d.flags, 5) || (d.state.haveMax7456Video && semver.lt(CONFIG.apiVersion, API_VERSION_1_43)); d.state.haveFrSkyOSDConfigured = semver.gte(CONFIG.apiVersion, API_VERSION_1_43) && bit_check(d.flags, 3);
d.state.haveMax7456FontDeviceConfigured = d.state.haveMax7456Configured || d.state.haveFrSkyOSDConfigured;
d.state.isMax7456FontDeviceDetected = bit_check(d.flags, 5) || (d.state.haveMax7456FontDeviceConfigured && semver.lt(CONFIG.apiVersion, API_VERSION_1_43));
d.state.haveOsdFeature = bit_check(d.flags, 0) || (d.flags == 1 && semver.lt(CONFIG.apiVersion, "1.34.0")); d.state.haveOsdFeature = bit_check(d.flags, 0) || (d.flags == 1 && semver.lt(CONFIG.apiVersion, "1.34.0"));
d.state.isOsdSlave = bit_check(d.flags, 1) && semver.gte(CONFIG.apiVersion, "1.34.0"); d.state.isOsdSlave = bit_check(d.flags, 1) && semver.gte(CONFIG.apiVersion, "1.34.0");
@ -2258,7 +2260,7 @@ TABS.osd.initialize = function (callback) {
OSD.msp.decode(info); OSD.msp.decode(info);
if (!OSD.data.state.haveMax7456Video || !OSD.data.state.isMax7456Detected) { if (OSD.data.state.haveMax7456FontDeviceConfigured && !OSD.data.state.isMax7456FontDeviceDetected) {
$('.noOsdChipDetect').show(); $('.noOsdChipDetect').show();
} }
@ -2495,12 +2497,12 @@ TABS.osd.initialize = function (callback) {
} }
} }
if (!OSD.data.state.haveMax7456Video) { if (!OSD.data.state.haveMax7456Configured) {
$('.requires-max7456').hide(); $('.requires-max7456').hide();
} }
if (!OSD.data.state.haveMax7456Video || !OSD.data.state.isMax7456Detected) { if (!OSD.data.state.isMax7456FontDeviceDetected || !OSD.data.state.haveMax7456FontDeviceConfigured) {
$('.requires-detected-max7456').addClass('disabled'); $('.requires-max7456-font-device-detected').addClass('disabled');
} }
if (!OSD.data.state.haveOsdFeature) { if (!OSD.data.state.haveOsdFeature) {

4
src/js/tabs/ports.js
View file

@ -53,6 +53,10 @@ TABS.ports.initialize = function (callback, scrollPosition) {
functionRules.push({ name: 'LIDAR_TF', groups: ['peripherals'], maxPorts: 1 }); functionRules.push({ name: 'LIDAR_TF', groups: ['peripherals'], maxPorts: 1 });
} }
if (semver.gte(CONFIG.apiVersion, API_VERSION_1_43)) {
functionRules.push({ name: 'FRSKY_OSD', groups: ['peripherals'], maxPorts: 1 });
}
for (var i = 0; i < functionRules.length; i++) { for (var i = 0; i < functionRules.length; i++) {
functionRules[i].displayName = i18n.getMessage('portsFunction_' + functionRules[i].name); functionRules[i].displayName = i18n.getMessage('portsFunction_' + functionRules[i].name);
} }

2
src/tabs/osd.html
View file

@ -202,7 +202,7 @@
<a class="active save" href="#" i18n="osdSetupSave"></a> <a class="active save" href="#" i18n="osdSetupSave"></a>
</div> </div>
<div class="btn"> <div class="btn">
<a class="fonts requires-detected-max7456" id="fontmanager" href="#" i18n="osdSetupFontManager"></a> <a class="requires-max7456-font-device-detected fonts" id="fontmanager" href="#" i18n="osdSetupFontManager"></a>
</div> </div>
</div> </div>
</div> </div>