Skip to content

Commit f672808

Browse files
fgiudice98fgiudice98
committed
Fix sonarcloud and move field check to function
1 parent a475abf commit f672808

File tree

3 files changed

+41
-33
lines changed

3 files changed

+41
-33
lines changed

‎js/flightlog.js

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,6 @@ function FlightLog(logData) {
209209
};
210210

211211
function buildFieldNames() {
212-
const disabledFields=that.getSysConfig().fields_disabled_mask;
213-
214212
// Make an independent copy
215213
fieldNames = parser.frameDefs.I.name.slice(0);
216214

@@ -222,16 +220,16 @@ function FlightLog(logData) {
222220
}
223221

224222
// Add names for our ADDITIONAL_COMPUTED_FIELDS
225-
if (!(disabledFields & 1<<7)) { //if GYRO disabled
223+
if (!that.isFieldDisabled().GYRO) {
226224
fieldNames.push("heading[0]", "heading[1]", "heading[2]");
227225
}
228-
if (!(disabledFields & 1<<0)) {//if PID disabled
226+
if (!that.isFieldDisabled().PID) {
229227
fieldNames.push("axisSum[0]", "axisSum[1]", "axisSum[2]");
230228
}
231-
if (!(disabledFields & 1<<2)) {//if setpoint disabled
229+
if (!that.isFieldDisabled().SETPOINT) {
232230
fieldNames.push("rcCommands[0]", "rcCommands[1]", "rcCommands[2]", "rcCommands[3]"); // Custom calculated scaled rccommand
233231
}
234-
if (!((disabledFields & 1<<7) || (disabledFields & 1<<0))) {//if GYRO or PID disabled
232+
if (!(that.isFieldDisabled().GYRO || that.isFieldDisabled().PID)) {
235233
fieldNames.push("axisError[0]", "axisError[1]", "axisError[2]"); // Custom calculated error field
236234
}
237235

@@ -1254,3 +1252,21 @@ FlightLog.prototype.getFeatures = function(enabledFeatures) {
12541252
ANTI_GRAVITY : (enabledFeatures & (1 << 24))!=0,
12551253
};
12561254
};
1255+
1256+
FlightLog.prototype.isFieldDisabled = function() {
1257+
const disabledFields=this.getSysConfig().fields_disabled_mask;
1258+
return {
1259+
PID : (disabledFields & (1 << 0))!==0,
1260+
RC_COMMANDS : (disabledFields & (1 << 1))!==0,
1261+
SETPOINT : (disabledFields & (1 << 2))!==0,
1262+
BATTERY : (disabledFields & (1 << 3))!==0,
1263+
MAGNETOMETER : (disabledFields & (1 << 4))!==0,
1264+
ALTITUDE : (disabledFields & (1 << 5))!==0,
1265+
RSSI : (disabledFields & (1 << 6))!==0,
1266+
GYRO : (disabledFields & (1 << 7))!==0,
1267+
ACC : (disabledFields & (1 << 8))!==0,
1268+
DEBUG : (disabledFields & (1 << 9))!==0,
1269+
MOTORS : (disabledFields & (1 << 10))!==0,
1270+
GPS : (disabledFields & (1 << 11))!==0,
1271+
};
1272+
};

‎js/graph_config.js

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -551,34 +551,33 @@ GraphConfig.load = function(config) {
551551
result = [],
552552
i, j;
553553

554-
const disabledFields=flightLog.getSysConfig().fields_disabled_mask;
555-
let EXAMPLE_GRAPHS = [];
556-
557-
if (!(disabledFields & 1<<10)) {
554+
const EXAMPLE_GRAPHS = [];
555+
556+
if (!flightLog.isFieldDisabled().MOTORS) {
558557
EXAMPLE_GRAPHS.push({label: "Motors",fields: ["motor[all]", "servo[5]"]});
559558
}
560-
if (!(disabledFields & 1<<7)) {
559+
if (!flightLog.isFieldDisabled().GYRO) {
561560
EXAMPLE_GRAPHS.push({label: "Gyros",fields: ["gyroADC[all]"]});
562561
}
563-
if (!(disabledFields & 1<<2)) {
562+
if (!flightLog.isFieldDisabled().SETPOINT) {
564563
EXAMPLE_GRAPHS.push({label: "RC Rates",fields: ["rcCommands[all]"]});
565564
}
566-
if (!(disabledFields & 1<<1)) {
565+
if (!flightLog.isFieldDisabled().RC_COMMANDS) {
567566
EXAMPLE_GRAPHS.push({label: "RC Command",fields: ["rcCommand[all]"]});
568567
}
569-
if (!(disabledFields & 1<<0)) {
568+
if (!flightLog.isFieldDisabled().PID) {
570569
EXAMPLE_GRAPHS.push({label: "PIDs",fields: ["axisSum[all]"]});
571570
}
572-
if (!((disabledFields & 1<<7) || (disabledFields & 1<<0))) {
571+
if (!(flightLog.isFieldDisabled().GYRO || flightLog.isFieldDisabled().PID)) {
573572
EXAMPLE_GRAPHS.push({label: "PID Error",fields: ["axisError[all]"]},
574573
{label: "Gyro + PID roll",fields: ["axisP[0]", "axisI[0]", "axisD[0]", "axisF[0]", "gyroADC[0]"]},
575574
{label: "Gyro + PID pitch",fields: ["axisP[1]", "axisI[1]", "axisD[1]", "axisF[1]", "gyroADC[1]"]},
576575
{label: "Gyro + PID yaw",fields: ["axisP[2]", "axisI[2]", "axisD[2]", "axisF[2]", "gyroADC[2]"]});
577576
}
578-
if (!(disabledFields & 1<<8)) {
577+
if (!flightLog.isFieldDisabled().ACC) {
579578
EXAMPLE_GRAPHS.push({label: "Accelerometers",fields: ["accSmooth[all]"]});
580579
}
581-
if (!(disabledFields & 1<<9)) {
580+
if (!flightLog.isFieldDisabled().DEBUG) {
582581
EXAMPLE_GRAPHS.push({label: "Debug",fields: ["debug[all]"]});
583582
}
584583

‎js/header_dialog.js

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -411,21 +411,14 @@ function HeaderDialog(dialog, onSave) {
411411
const fieldsList_e = $('.fields_list');
412412

413413
for (let i = 0; i < fields.length; i++) {
414-
let row_e;
415-
416-
row_e = $('<tr><td><label class="option"><input class="field '
417-
+ i
418-
+ ' ios-switch" name="'
419-
+ fields[i].name
420-
+ '" title="field ' + ((value & 1<<i)?'':'-')
421-
+ fields[i].name
422-
+ '" type="checkbox" /><div><div></div></div></label></td><td><label for="field-'
423-
+ i
424-
+ '">'
425-
+ fields[i].name
426-
+ '</label></td><td><span>' + fields[i].description + '</span></td></tr>');
427-
428-
let field_e = row_e.find('input.field');
414+
const row_e = $(`<tr><td><label class="option"><input class="field ${i}
415+
ios-switch" name="${fields[i].name}
416+
" title="field ${((value & 1<<i)?'':'-')} ${fields[i].name}
417+
" type="checkbox" /><div><div></div></div></label></td><td><label for="field-
418+
${i}">${fields[i].name}</label></td><td><span>
419+
${fields[i].description}</span></td></tr>`);
420+
421+
const field_e = row_e.find('input.field');
429422

430423
field_e.prop('checked', (value & 1<<i));
431424
field_e.data('bit', i);
@@ -776,7 +769,7 @@ function HeaderDialog(dialog, onSave) {
776769
setCheckbox('use_integrated_yaw' ,sysConfig.use_integrated_yaw);
777770

778771
/* Selected Fields */
779-
if(activeSysConfig.firmwareType == FIRMWARE_TYPE_BETAFLIGHT && semver.gte(activeSysConfig.firmwareVersion, '4.3.0')) {
772+
if(activeSysConfig.firmwareType === FIRMWARE_TYPE_BETAFLIGHT && semver.gte(activeSysConfig.firmwareVersion, '4.3.0')) {
780773
builtSelectedFieldsList(sysConfig);
781774
$(".disabled_fields").css("display","table-header-group");
782775
} else {

0 commit comments

Comments
 (0)