Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-26 09:45:28 +03:00
Code Issues Wiki Activity

Refresh symbols depending on firmware version

Browse source
This commit is contained in:
Miguel Angel Mulero Martinez 2019-06-11 08:52:03 +02:00
parent c392f4abe9
commit 27b49a04d2
1 changed files with 75 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,8 @@
'use strict'; 'use strict';
var SYM = SYM || {}; var SYM = SYM || {};
SYM.loadSymbols = function() {
SYM.BLANK = 0x20; SYM.BLANK = 0x20;
SYM.VOLT = 0x06; SYM.VOLT = 0x06;
SYM.RSSI = 0x01; SYM.RSSI = 0x01;
@ -9,9 +11,9 @@ SYM.AH_LEFT = 0x03;
SYM.THR = 0x04; SYM.THR = 0x04;
SYM.FLY_M = 0x9C; SYM.FLY_M = 0x9C;
SYM.ON_M = 0x9B; SYM.ON_M = 0x9B;
SYM.AH_CENTER_LINE = function() { return semver.gte(CONFIG.apiVersion, "1.42.0") ? 0x72 : 0x26 }; SYM.AH_CENTER_LINE = 0x72;
SYM.AH_CENTER = function() { return semver.gte(CONFIG.apiVersion, "1.42.0") ? 0x73 : 0x7E }; SYM.AH_CENTER = 0x73;
SYM.AH_CENTER_LINE_RIGHT = function() { return semver.gte(CONFIG.apiVersion, "1.42.0") ? 0x74 : 0x27 }; SYM.AH_CENTER_LINE_RIGHT = 0x74;
SYM.AH_BAR9_0 = 0x80; SYM.AH_BAR9_0 = 0x80;
SYM.AH_DECORATION = 0x13; SYM.AH_DECORATION = 0x13;
SYM.LOGO = 0xA0; SYM.LOGO = 0xA0;
@ -21,7 +23,7 @@ SYM.METRE = 0xC;
SYM.FEET = 0xF; SYM.FEET = 0xF;
SYM.KPH = 0x9E; SYM.KPH = 0x9E;
SYM.MPH = 0x9D; SYM.MPH = 0x9D;
SYM.SPEED = function() { return semver.gte(CONFIG.apiVersion, "1.42.0") ? 0x70 : '' }; SYM.SPEED = 0x70;
SYM.TOTAL_DIST = 0x71; SYM.TOTAL_DIST = 0x71;
SYM.GPS_SAT_L = 0x1E; SYM.GPS_SAT_L = 0x1E;
SYM.GPS_SAT_R = 0x1F; SYM.GPS_SAT_R = 0x1F;
@ -57,6 +59,19 @@ SYM.ALTITUDE = 0x7F;
SYM.PITCH = 0x15; SYM.PITCH = 0x15;
SYM.ROLL = 0x14; SYM.ROLL = 0x14;
/* Versions before Betaflight 4.1 use font V1
* To maintain this list at minimum, we only add here:
* - Symbols used in this versions
* - That were moved or didn't exist in the font file
*/
if (semver.lt(CONFIG.apiVersion, "1.42.0")) {
SYM.AH_CENTER_LINE = 0x26;
SYM.AH_CENTER = 0x7E;
SYM.AH_CENTER_LINE_RIGHT = 0x27;
SYM.SPEED = null;
}
}
var STICK_OVERLAY_SPRITE = [ var STICK_OVERLAY_SPRITE = [
SYM.STICK_OVERLAY_SPRITE_HIGH, SYM.STICK_OVERLAY_SPRITE_HIGH,
SYM.STICK_OVERLAY_SPRITE_MID, SYM.STICK_OVERLAY_SPRITE_MID,
@ -242,13 +257,7 @@ FONT.preview = function ($el) {
}; };
FONT.symbol = function (hexVal) { FONT.symbol = function (hexVal) {
let charCode; return (hexVal == '' || hexVal == null)? '' : String.fromCharCode(hexVal);
if (typeof(hexVal) === 'function') {
charCode = hexVal();
} else {
charCode = hexVal;
}
return (charCode == '' || charCode == null)? '' : String.fromCharCode(charCode);
}; };
var OSD = OSD || {}; var OSD = OSD || {};
@ -1897,6 +1906,10 @@ TABS.osd.initialize = function (callback) {
} }
$('#content').load("./tabs/osd.html", function () { $('#content').load("./tabs/osd.html", function () {
// Prepare symbols depending on the version
SYM.loadSymbols();
// Generate font type select element // Generate font type select element
var fontPresetsElement = $('.fontpresets'); var fontPresetsElement = $('.fontpresets');
OSD.constants.FONT_TYPES.forEach(function (e, i) { OSD.constants.FONT_TYPES.forEach(function (e, i) {