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

Fix critical and major bugs from Sonar in JS files

Browse source
This commit is contained in:
Miguel Angel Mulero Martinez 2019-11-04 16:37:54 +01:00
parent 377149f06a
commit c8b4958e8c
8 changed files with 93 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -64,7 +64,7 @@ SYM.loadSymbols = function() {
SYM.ROLL = 0x14;
/* Versions before Betaflight 4.1 use font V1
* To maintain this list at minimum, we only add here:
* 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
*/
@ -277,7 +277,7 @@ OSD.getNumberOfProfiles = function() {
OSD.getCurrentPreviewProfile = function() {
let osdprofile_e = $('.osdprofile-selector');
if (osdprofile_e) {
if (osdprofile_e.length > 0) {
return osdprofile_e.val();
} else {
return 0;
@ -1598,7 +1598,7 @@ OSD.chooseFields = function () {
F.GPS_RESCUE_DISABLED
]);
}
OSD.constants.TIMER_TYPES = [
'ON_TIME',
'TOTAL_ARMED_TIME',
@ -1670,7 +1670,7 @@ OSD.msp = {
if (semver.gte(CONFIG.apiVersion, "1.21.0")) {
// size * y + x
display_item.position = positionable ? FONT.constants.SIZES.LINE * ((bits >> 5) & 0x001F) + (bits & 0x001F) : default_position;
display_item.isVisible = [];
for (let osd_profile = 0; osd_profile < OSD.getNumberOfProfiles(); osd_profile++) {
display_item.isVisible[osd_profile] = (bits & (OSD.constants.VISIBLE << osd_profile)) != 0;
@ -1740,7 +1740,7 @@ OSD.msp = {
result.push8(OSD.data.osd_profiles.selected + 1);
}
}
}
return result;
},
@ -1824,7 +1824,7 @@ OSD.msp = {
if (expectedStatsCount != OSD.constants.STATISTIC_FIELDS.length) {
console.error("Firmware is transmitting a different number of statistics (" + expectedStatsCount + ") to what the configurator is expecting (" + OSD.constants.STATISTIC_FIELDS.length + ")");
}
for (var i = 0; i < expectedStatsCount; i++) {
let v = view.readU8();
@ -2104,7 +2104,7 @@ TABS.osd.initialize = function (callback) {
$('.warnings-container div.cf_tip').attr('title', i18n.getMessage('osdSectionHelpWarnings'));
function titleizeField(field) {
let finalFieldName = null;
let finalFieldName = null;
if (field.text) {
if (Array.isArray(field.text) && i18n.existsMessage(field.text[0])) {
finalFieldName = i18n.getMessage(field.text[0], field.text.slice(1));
@ -2467,7 +2467,7 @@ TABS.osd.initialize = function (callback) {
);
}
let finalFieldName = titleizeField(field);
let finalFieldName = titleizeField(field);
$field.append('<label for="' + field.name + '" class="char-label">' + finalFieldName + '</label>');
if (field.positionable && field.isVisible[OSD.getCurrentPreviewProfile()]) {
$field.append(
@ -2542,7 +2542,7 @@ TABS.osd.initialize = function (callback) {
for (var i = 0; i < arrayElements.length; i++) {
var element = arrayElements[i];
//Add string to the preview.
if (element.constructor === String) {
if (element.constructor === String) {
for(var j = 0; j < element.length; j++) {
var charCode = element.charCodeAt(j);
OSD.drawByOrder(selectedPosition++, field, charCode, j, i);