Skip to content

Commit 2c48126

Browse files
committed
Added ATTITUDE log disabled flag for BF gte 4.6
1 parent 0c54fca commit 2c48126

File tree

1 file changed

+40
-16
lines changed

1 file changed

+40
-16
lines changed

src/flightlog.js

Lines changed: 40 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1745,20 +1745,44 @@ FlightLog.prototype.getFeatures = function (enabledFeatures) {
17451745

17461746
FlightLog.prototype.isFieldDisabled = function () {
17471747
const disabledFields = this.getSysConfig().fields_disabled_mask;
1748-
return {
1749-
PID: (disabledFields & (1 << 0)) !== 0,
1750-
RC_COMMANDS: (disabledFields & (1 << 1)) !== 0,
1751-
SETPOINT: (disabledFields & (1 << 2)) !== 0,
1752-
BATTERY: (disabledFields & (1 << 3)) !== 0,
1753-
MAGNETOMETER: (disabledFields & (1 << 4)) !== 0,
1754-
ALTITUDE: (disabledFields & (1 << 5)) !== 0,
1755-
RSSI: (disabledFields & (1 << 6)) !== 0,
1756-
GYRO: (disabledFields & (1 << 7)) !== 0,
1757-
ACC: (disabledFields & (1 << 8)) !== 0,
1758-
DEBUG: (disabledFields & (1 << 9)) !== 0,
1759-
MOTORS: (disabledFields & (1 << 10)) !== 0,
1760-
GPS: (disabledFields & (1 << 11)) !== 0,
1761-
RPM: (disabledFields & (1 << 12)) !== 0,
1762-
GYROUNFILT: (disabledFields & (1 << 13)) !== 0,
1763-
};
1748+
if (
1749+
this.getSysConfig().firmwareType == FIRMWARE_TYPE_BETAFLIGHT &&
1750+
semver.gte(this.getSysConfig().firmwareVersion, "4.6.0")
1751+
) {
1752+
return {
1753+
PID: (disabledFields & (1 << 0)) !== 0,
1754+
RC_COMMANDS: (disabledFields & (1 << 1)) !== 0,
1755+
SETPOINT: (disabledFields & (1 << 2)) !== 0,
1756+
BATTERY: (disabledFields & (1 << 3)) !== 0,
1757+
MAGNETOMETER: (disabledFields & (1 << 4)) !== 0,
1758+
ALTITUDE: (disabledFields & (1 << 5)) !== 0,
1759+
RSSI: (disabledFields & (1 << 6)) !== 0,
1760+
GYRO: (disabledFields & (1 << 7)) !== 0,
1761+
ATTITUDE: (disabledFields & (1 << 8)) !== 0,
1762+
ACC: (disabledFields & (1 << 9)) !== 0,
1763+
DEBUG: (disabledFields & (1 << 10)) !== 0,
1764+
MOTORS: (disabledFields & (1 << 11)) !== 0,
1765+
GPS: (disabledFields & (1 << 12)) !== 0,
1766+
RPM: (disabledFields & (1 << 13)) !== 0,
1767+
GYROUNFILT: (disabledFields & (1 << 14)) !== 0,
1768+
};
1769+
}
1770+
else {
1771+
return {
1772+
PID: (disabledFields & (1 << 0)) !== 0,
1773+
RC_COMMANDS: (disabledFields & (1 << 1)) !== 0,
1774+
SETPOINT: (disabledFields & (1 << 2)) !== 0,
1775+
BATTERY: (disabledFields & (1 << 3)) !== 0,
1776+
MAGNETOMETER: (disabledFields & (1 << 4)) !== 0,
1777+
ALTITUDE: (disabledFields & (1 << 5)) !== 0,
1778+
RSSI: (disabledFields & (1 << 6)) !== 0,
1779+
GYRO: (disabledFields & (1 << 7)) !== 0,
1780+
ACC: (disabledFields & (1 << 8)) !== 0,
1781+
DEBUG: (disabledFields & (1 << 9)) !== 0,
1782+
MOTORS: (disabledFields & (1 << 10)) !== 0,
1783+
GPS: (disabledFields & (1 << 11)) !== 0,
1784+
RPM: (disabledFields & (1 << 12)) !== 0,
1785+
GYROUNFILT: (disabledFields & (1 << 13)) !== 0,
1786+
};
1787+
}
17641788
};

0 commit comments

Comments
 (0)