Skip to content

Commit c086e3b

Browse files
committed
fix sonar issues
1 parent 07fa60c commit c086e3b

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

js/flightlog_fields_presenter.js

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"use strict";
22

33
function FlightLogFieldPresenter() {
4+
// this is intentional
45
}
56

67
(function() {
@@ -777,7 +778,7 @@ function FlightLogFieldPresenter() {
777778
};
778779

779780
FlightLogFieldPresenter.presentFlags = function(flags, flagNames) {
780-
var
781+
let
781782
printedFlag = false,
782783
i,
783784
result = "";
@@ -808,23 +809,24 @@ function FlightLogFieldPresenter() {
808809

809810
// Only list events that have changed, flag with eirer go ON or OFF.
810811
FlightLogFieldPresenter.presentChangeEvent = function presentChangeEvent(flags, lastFlags, flagNames) {
811-
var eventState = '';
812-
var found = false;
813-
for(var i = 0; i < flagNames.length; i++) {
814-
if((1<<i) & (flags ^ lastFlags)) { // State Changed
815-
eventState += '|' + flagNames[i] + ' ' + (((1<<i) & flags)?'ON':'OFF')
812+
let eventState = '';
813+
let found = false;
814+
815+
for (let i = 0; i < flagNames.length; i++) {
816+
if ((1 << i) & (flags ^ lastFlags)) { // State Changed
817+
eventState += '|' + flagNames[i] + ' ' + (((1 << i) & flags) ? 'ON' : 'OFF');
816818
found = true;
817819
}
818820
}
819-
if(!found) {eventState += ' | ACRO';} // Catch the state when all flags are off, which is ACRO of course
821+
if (!found) { eventState += ' | ACRO'; } // Catch the state when all flags are off, which is ACRO of course
820822
return eventState;
821823
};
822824

823825
FlightLogFieldPresenter.presentEnum = function presentEnum(value, enumNames) {
824826
if (enumNames[value] === undefined) {
825827
return value;
826828
}
827-
829+
828830
return enumNames[value];
829831
};
830832

@@ -919,20 +921,20 @@ function FlightLogFieldPresenter() {
919921
return flightLog.accRawToGs(value).toFixed(2 + highResolutionAddPrecision) + "g";
920922

921923
case 'vbatLatest':
922-
if(flightLog.getSysConfig().firmwareType == FIRMWARE_TYPE_BETAFLIGHT && semver.gte(flightLog.getSysConfig().firmwareVersion, '4.0.0')) {
924+
if (flightLog.getSysConfig().firmwareType === FIRMWARE_TYPE_BETAFLIGHT && semver.gte(flightLog.getSysConfig().firmwareVersion, '4.0.0')) {
923925
return (value / 100).toFixed(2) + "V" + ", " + (value / 100 / flightLog.getNumCellsEstimate()).toFixed(2) + "V/cell";
924-
} else if((flightLog.getSysConfig().firmwareType == FIRMWARE_TYPE_BETAFLIGHT && semver.gte(flightLog.getSysConfig().firmwareVersion, '3.1.0')) ||
925-
(flightLog.getSysConfig().firmwareType == FIRMWARE_TYPE_CLEANFLIGHT && semver.gte(flightLog.getSysConfig().firmwareVersion, '2.0.0'))) {
926+
} else if ((flightLog.getSysConfig().firmwareType === FIRMWARE_TYPE_BETAFLIGHT && semver.gte(flightLog.getSysConfig().firmwareVersion, '3.1.0')) ||
927+
(flightLog.getSysConfig().firmwareType === FIRMWARE_TYPE_CLEANFLIGHT && semver.gte(flightLog.getSysConfig().firmwareVersion, '2.0.0'))) {
926928
return (value / 10).toFixed(2) + "V" + ", " + (value / 10 / flightLog.getNumCellsEstimate()).toFixed(2) + "V/cell";
927929
} else {
928930
return (flightLog.vbatADCToMillivolts(value) / 1000).toFixed(2) + "V" + ", " + (flightLog.vbatADCToMillivolts(value) / 1000 / flightLog.getNumCellsEstimate()).toFixed(2) + "V/cell";
929931
}
930932

931933
case 'amperageLatest':
932-
if((flightLog.getSysConfig().firmwareType == FIRMWARE_TYPE_BETAFLIGHT && semver.gte(flightLog.getSysConfig().firmwareVersion, '3.1.7')) ||
934+
if ((flightLog.getSysConfig().firmwareType == FIRMWARE_TYPE_BETAFLIGHT && semver.gte(flightLog.getSysConfig().firmwareVersion, '3.1.7')) ||
933935
(flightLog.getSysConfig().firmwareType == FIRMWARE_TYPE_CLEANFLIGHT && semver.gte(flightLog.getSysConfig().firmwareVersion, '2.0.0'))) {
934936
return (value / 100).toFixed(2) + "A" + ", " + (value / 100 / flightLog.getNumMotors()).toFixed(2) + "A/motor";
935-
} else if(flightLog.getSysConfig().firmwareType == FIRMWARE_TYPE_BETAFLIGHT && semver.gte(flightLog.getSysConfig().firmwareVersion, '3.1.0')) {
937+
} else if (flightLog.getSysConfig().firmwareType == FIRMWARE_TYPE_BETAFLIGHT && semver.gte(flightLog.getSysConfig().firmwareVersion, '3.1.0')) {
936938
return (value / 100).toFixed(2) + "A" + ", " + (value / 100 / flightLog.getNumMotors()).toFixed(2) + "A/motor";
937939
} else {
938940
return (flightLog.amperageADCToMillivolts(value) / 1000).toFixed(2) + "A" + ", " + (flightLog.amperageADCToMillivolts(value) / 1000 / flightLog.getNumMotors()).toFixed(2) + "A/motor";
@@ -1260,8 +1262,9 @@ function FlightLogFieldPresenter() {
12601262
FlightLogFieldPresenter.fieldNameToFriendly = function(fieldName, debugMode) {
12611263
if (debugMode) {
12621264
if (fieldName.includes('debug')) {
1263-
var debugModeName = DEBUG_MODE[debugMode];
1264-
var debugFields;
1265+
let debugModeName = DEBUG_MODE[debugMode];
1266+
let debugFields;
1267+
12651268
if (debugModeName) {
12661269
debugFields = DEBUG_FRIENDLY_FIELD_NAMES[debugModeName];
12671270
}

0 commit comments

Comments
 (0)