Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-25 17:25:16 +03:00
Code Issues Wiki Activity

Merge pull request #725 from mikeller/make_osd_elements_robust

Browse source 
Make OSD elements robust to additional fields.
This commit is contained in:
Michael Keller 2017-11-14 07:36:20 +13:00 • committed by GitHub
commit 94cc79fff1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
_locales/en/messages.json
View file

@ -2520,6 +2520,9 @@
"osdDescElementTimer2" : { "osdDescElementTimer2" : {
"message": "Shows the value of timer 2" "message": "Shows the value of timer 2"
}, },
"osdDescElementUnknown" : {
"message": "Unknown element (details to be added in a future release)"
},
"osdDescStatMaxSpeed": { "osdDescStatMaxSpeed": {
"message": "Maximum recorded speed" "message": "Maximum recorded speed"

34
tabs/osd.js
View file

@ -639,6 +639,13 @@ OSD.constants = {
} }
}, },
}, },
UNKNOWN_DISPLAY_FIELD: {
name: 'UNKNOWN_',
desc: 'osdDescElementUnknown',
default_position: -1,
positionable: true,
preview: 'UNKNOWN '
},
ALL_STATISTIC_FIELDS: { ALL_STATISTIC_FIELDS: {
MAX_SPEED: { MAX_SPEED: {
name: 'MAX_SPEED', name: 'MAX_SPEED',
@ -981,6 +988,9 @@ OSD.msp = {
decode: function(payload) { decode: function(payload) {
var view = payload.data; var view = payload.data;
var d = OSD.data; var d = OSD.data;
var displayItemsCountActual = OSD.constants.DISPLAY_FIELDS.length;
d.flags = view.readU8(); d.flags = view.readU8();
if (d.flags > 0) { if (d.flags > 0) {
@ -994,9 +1004,14 @@ OSD.msp = {
if (semver.lt(CONFIG.apiVersion, "1.36.0")) { if (semver.lt(CONFIG.apiVersion, "1.36.0")) {
d.alarms['time'] = { display_name: 'Minutes', value: view.readU16() }; d.alarms['time'] = { display_name: 'Minutes', value: view.readU16() };
} else { } else {
// This value is unused in configurable timers // This value was obsoleted by the introduction of configurable timers, and has been reused to encode the number of display elements sent in this command
view.readU16(); view.readU8();
var tmp = view.readU8();
if (semver.gte(CONFIG.apiVersion, "1.36.0")) {
displayItemsCountActual = tmp;
}
} }
d.alarms['alt'] = { display_name: 'Altitude', value: view.readU16() }; d.alarms['alt'] = { display_name: 'Altitude', value: view.readU16() };
} }
} }
@ -1014,7 +1029,7 @@ OSD.msp = {
d.timers = []; d.timers = [];
// Parse display element positions // Parse display element positions
while (view.offset < view.byteLength && d.display_items.length < OSD.constants.DISPLAY_FIELDS.length) { while (view.offset < view.byteLength && d.display_items.length < displayItemsCountActual) {
var v = null; var v = null;
if (semver.gte(CONFIG.apiVersion, "1.21.0")) { if (semver.gte(CONFIG.apiVersion, "1.21.0")) {
v = view.readU16(); v = view.readU16();
@ -1022,13 +1037,20 @@ OSD.msp = {
v = view.read16(); v = view.read16();
} }
var j = d.display_items.length; var j = d.display_items.length;
var c = OSD.constants.DISPLAY_FIELDS[j]; var c;
var suffix;
if (d.display_items.length < OSD.constants.DISPLAY_FIELDS.length) {
c = OSD.constants.DISPLAY_FIELDS[j];
} else {
c = OSD.constants.UNKNOWN_DISPLAY_FIELD;
suffix = "" + (1 + d.display_items.length - OSD.constants.DISPLAY_FIELDS.length);
}
d.display_items.push($.extend({ d.display_items.push($.extend({
name: c.name, name: suffix ? c.name + suffix : c.name,
desc: c.desc, desc: c.desc,
index: j, index: j,
positionable: c.positionable, positionable: c.positionable,
preview: c.preview preview: suffix ? c.preview + suffix : c.preview
}, this.helpers.unpack.position(v, c))); }, this.helpers.unpack.position(v, c)));
} }