The ATTITUDE log disabled flag code refactoring

Author: demvlad

src/flightlog.js

@@ -1745,31 +1745,8 @@ FlightLog.prototype.getFeatures = function (enabledFeatures) {
 
 FlightLog.prototype.isFieldDisabled = function () {
   const disabledFields = this.getSysConfig().fields_disabled_mask;
-  if (
-    this.getSysConfig().firmwareType == FIRMWARE_TYPE_BETAFLIGHT &&
-    semver.gte(this.getSysConfig().firmwareVersion, "4.6.0")
-  ) {   
-    return {
-      PID: (disabledFields & (1 << 0)) !== 0,
-      RC_COMMANDS: (disabledFields & (1 << 1)) !== 0,
-      SETPOINT: (disabledFields & (1 << 2)) !== 0,
-      BATTERY: (disabledFields & (1 << 3)) !== 0,
-      MAGNETOMETER: (disabledFields & (1 << 4)) !== 0,
-      ALTITUDE: (disabledFields & (1 << 5)) !== 0,
-      RSSI: (disabledFields & (1 << 6)) !== 0,
-      GYRO: (disabledFields & (1 << 7)) !== 0,
-      ATTITUDE: (disabledFields & (1 << 8)) !== 0,
-      ACC: (disabledFields & (1 << 9)) !== 0,
-      DEBUG: (disabledFields & (1 << 10)) !== 0,
-      MOTORS: (disabledFields & (1 << 11)) !== 0,
-      GPS: (disabledFields & (1 << 12)) !== 0,
-      RPM: (disabledFields & (1 << 13)) !== 0,
-      GYROUNFILT: (disabledFields & (1 << 14)) !== 0,
-    };
-  }
-  else {
-    return {
-      PID: (disabledFields & (1 << 0)) !== 0,
+  const disabledFieldsFlags = {
+    PID: (disabledFields & (1 << 0)) !== 0,
       RC_COMMANDS: (disabledFields & (1 << 1)) !== 0,
       SETPOINT: (disabledFields & (1 << 2)) !== 0,
       BATTERY: (disabledFields & (1 << 3)) !== 0,
@@ -1783,6 +1760,20 @@ FlightLog.prototype.isFieldDisabled = function () {
       GPS: (disabledFields & (1 << 11)) !== 0,
       RPM: (disabledFields & (1 << 12)) !== 0,
       GYROUNFILT: (disabledFields & (1 << 13)) !== 0,
-    };
+  };
+
+  if (
+    this.getSysConfig().firmwareType == FIRMWARE_TYPE_BETAFLIGHT &&
+    semver.gte(this.getSysConfig().firmwareVersion, "4.6.0")
+  ) {
+    disabledFieldsFlags.ATTITUDE = (disabledFields & (1 << 8)) !== 0;
+    disabledFieldsFlags.ACC = (disabledFields & (1 << 9)) !== 0;
+    disabledFieldsFlags.DEBUG = (disabledFields & (1 << 10)) !== 0;
+    disabledFieldsFlags.MOTORS = (disabledFields & (1 << 11)) !== 0;
+    disabledFieldsFlags.GPS = (disabledFields & (1 << 12)) !== 0;
+    disabledFieldsFlags.RPM = (disabledFields & (1 << 13)) !== 0;
+    disabledFieldsFlags.GYROUNFILT = (disabledFields & (1 << 14)) !== 0;
   }
+
+  return disabledFieldsFlags;
 };