Skip to content

Fix semver #858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 24, 2025
Merged

Fix semver #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ee1a41
Fix semver
haslinghuis Sep 23, 2025
f1041ff
Split parsing
haslinghuis Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/flightlog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1782,7 +1782,7 @@ FlightLog.prototype.isFieldDisabled = function () {

if (
this.getSysConfig().firmwareType == FIRMWARE_TYPE_BETAFLIGHT &&
semver.gte(this.getSysConfig().firmwareVersion, "4.6.0")
semver.gte(this.getSysConfig().firmwareVersion, "2025.12.0")
) {
disabledFieldsFlags.ATTITUDE = (disabledFields & (1 << 8)) !== 0;
disabledFieldsFlags.ACC = (disabledFields & (1 << 9)) !== 0;
Expand Down
8 changes: 4 additions & 4 deletions src/flightlog_fielddefs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,10 +529,10 @@ export function adjustFieldDefsList(firmwareType, firmwareVersion) {
DEBUG_MODE.splice(DEBUG_MODE.indexOf("FF_INTERPOLATED"), 1, "FEEDFORWARD");
DEBUG_MODE.splice(DEBUG_MODE.indexOf("FF_LIMIT"), 1, "FEEDFORWARD_LIMIT");
}
if (semver.lt(firmwareVersion, "4.6.0")) {
if (semver.lt(firmwareVersion, "2025.12.0")) {
DEBUG_MODE.splice(DEBUG_MODE.indexOf("D_MAX"), 1, "D_MIN");
}
if (semver.gte(firmwareVersion, "4.6.0")) {
if (semver.gte(firmwareVersion, "2025.12.0")) {
ACC_HARDWARE.splice(ACC_HARDWARE.indexOf("ADXL345"), 1);
ACC_HARDWARE.splice(ACC_HARDWARE.indexOf("MMA8452"), 1);
ACC_HARDWARE.splice(ACC_HARDWARE.indexOf("BMA280"), 1);
Expand All @@ -550,7 +550,7 @@ export function adjustFieldDefsList(firmwareType, firmwareVersion) {
DEBUG_MODE.push('WING_SETPOINT');
DEBUG_MODE.push('AUTOPILOT_POSITION');
}
if (semver.gte(firmwareVersion, "4.6.0")) {
if (semver.gte(firmwareVersion, "2025.12.0")) {
//rename DUAL_GYRO_ to MULTI_GYRO
DEBUG_MODE.splice(DEBUG_MODE.indexOf("DUAL_GYRO_RAW"), 1, "MULTI_GYRO_RAW");
DEBUG_MODE.splice(DEBUG_MODE.indexOf("DUAL_GYRO_DIFF"), 1, "MULTI_GYRO_DIFF");
Expand All @@ -561,7 +561,7 @@ export function adjustFieldDefsList(firmwareType, firmwareVersion) {
DEBUG_MODE = makeReadOnly(DEBUG_MODE);

// Flight mode names
if (semver.gte(firmwareVersion, "4.6.0")) {
if (semver.gte(firmwareVersion, "2025.12.0")) {
FLIGHT_LOG_FLIGHT_MODE_NAME = FLIGHT_LOG_FLIGHT_MODE_NAME_POST_4_5.slice(0);
} else {
FLIGHT_LOG_FLIGHT_MODE_NAME = FLIGHT_LOG_FLIGHT_MODE_NAME_POST_3_3.slice(0);
Expand Down
6 changes: 3 additions & 3 deletions src/flightlog_fields_presenter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1314,7 +1314,7 @@ FlightLogFieldPresenter.adjustDebugDefsList = function (
};
}

if (semver.gte(firmwareVersion, '4.6.0')) {
if (semver.gte(firmwareVersion, '2025.12.0')) {
// FFT_FREQ updated in firmware #13750
DEBUG_FRIENDLY_FIELD_NAMES.FFT_FREQ = {
'debug[all]':'Debug FFT FREQ',
Expand Down Expand Up @@ -1975,7 +1975,7 @@ FlightLogFieldPresenter.decodeDebugFieldToFriendly = function (
return value.toFixed(0);
}
case "FFT_FREQ":
if (semver.gte(flightLog.getSysConfig().firmwareVersion, '4.6.0')) {
if (semver.gte(flightLog.getSysConfig().firmwareVersion, '2025.12.0')) {
switch (fieldName) {
case 'debug[0]': // gyro pre dyn notch [for gyro debug axis]
return Math.round(flightLog.gyroRawToDegreesPerSecond(value)) + " °/s";
Expand Down Expand Up @@ -2727,7 +2727,7 @@ FlightLogFieldPresenter.ConvertDebugFieldValue = function (
return value;
}
case "FFT_FREQ":
if (semver.gte(flightLog.getSysConfig().firmwareVersion, '4.6.0')) {
if (semver.gte(flightLog.getSysConfig().firmwareVersion, '2025.12.0')) {
switch (fieldName) {
case 'debug[0]': // gyro pre dyn notch [for gyro debug axis]
return toFriendly
Expand Down
7 changes: 2 additions & 5 deletions src/flightlog_parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,11 +960,8 @@ export function FlightLogParser(logData) {
$("html").removeClass("isINAV");
}

that.sysConfig.firmware = parseFloat(
`${matches[2]}.${matches[3]}`
).toFixed(1);
that.sysConfig.firmwarePatch =
matches[5] != null ? parseInt(matches[5]) : "0";
that.sysConfig.firmware = `${parseInt(matches[2])}.${parseInt(matches[3])}`;
that.sysConfig.firmwarePatch = matches[5] != null ? parseInt(matches[5]) : "0";
that.sysConfig.firmwareVersion = `${that.sysConfig.firmware}.${that.sysConfig.firmwarePatch}`;
} else {
/*
Expand Down
Loading