|
1 | 1 | "use strict"; |
2 | 2 |
|
3 | 3 | function FlightLogFieldPresenter() { |
| 4 | + // this is intentional |
4 | 5 | } |
5 | 6 |
|
6 | 7 | (function() { |
@@ -777,7 +778,7 @@ function FlightLogFieldPresenter() { |
777 | 778 | }; |
778 | 779 |
|
779 | 780 | FlightLogFieldPresenter.presentFlags = function(flags, flagNames) { |
780 | | - var |
| 781 | + let |
781 | 782 | printedFlag = false, |
782 | 783 | i, |
783 | 784 | result = ""; |
@@ -808,23 +809,24 @@ function FlightLogFieldPresenter() { |
808 | 809 |
|
809 | 810 | // Only list events that have changed, flag with eirer go ON or OFF. |
810 | 811 | 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'); |
816 | 818 | found = true; |
817 | 819 | } |
818 | 820 | } |
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 |
820 | 822 | return eventState; |
821 | 823 | }; |
822 | 824 |
|
823 | 825 | FlightLogFieldPresenter.presentEnum = function presentEnum(value, enumNames) { |
824 | 826 | if (enumNames[value] === undefined) { |
825 | 827 | return value; |
826 | 828 | } |
827 | | - |
| 829 | + |
828 | 830 | return enumNames[value]; |
829 | 831 | }; |
830 | 832 |
|
@@ -919,20 +921,20 @@ function FlightLogFieldPresenter() { |
919 | 921 | return flightLog.accRawToGs(value).toFixed(2 + highResolutionAddPrecision) + "g"; |
920 | 922 |
|
921 | 923 | 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')) { |
923 | 925 | 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'))) { |
926 | 928 | return (value / 10).toFixed(2) + "V" + ", " + (value / 10 / flightLog.getNumCellsEstimate()).toFixed(2) + "V/cell"; |
927 | 929 | } else { |
928 | 930 | return (flightLog.vbatADCToMillivolts(value) / 1000).toFixed(2) + "V" + ", " + (flightLog.vbatADCToMillivolts(value) / 1000 / flightLog.getNumCellsEstimate()).toFixed(2) + "V/cell"; |
929 | 931 | } |
930 | 932 |
|
931 | 933 | 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')) || |
933 | 935 | (flightLog.getSysConfig().firmwareType == FIRMWARE_TYPE_CLEANFLIGHT && semver.gte(flightLog.getSysConfig().firmwareVersion, '2.0.0'))) { |
934 | 936 | 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')) { |
936 | 938 | return (value / 100).toFixed(2) + "A" + ", " + (value / 100 / flightLog.getNumMotors()).toFixed(2) + "A/motor"; |
937 | 939 | } else { |
938 | 940 | return (flightLog.amperageADCToMillivolts(value) / 1000).toFixed(2) + "A" + ", " + (flightLog.amperageADCToMillivolts(value) / 1000 / flightLog.getNumMotors()).toFixed(2) + "A/motor"; |
@@ -1260,8 +1262,9 @@ function FlightLogFieldPresenter() { |
1260 | 1262 | FlightLogFieldPresenter.fieldNameToFriendly = function(fieldName, debugMode) { |
1261 | 1263 | if (debugMode) { |
1262 | 1264 | if (fieldName.includes('debug')) { |
1263 | | - var debugModeName = DEBUG_MODE[debugMode]; |
1264 | | - var debugFields; |
| 1265 | + let debugModeName = DEBUG_MODE[debugMode]; |
| 1266 | + let debugFields; |
| 1267 | + |
1265 | 1268 | if (debugModeName) { |
1266 | 1269 | debugFields = DEBUG_FRIENDLY_FIELD_NAMES[debugModeName]; |
1267 | 1270 | } |
|
0 commit comments