Skip to content

Commit c9e1863

Browse files
authored
Fix semver (#858)
* Fix semver * Split parsing
1 parent 6653d1c commit c9e1863

File tree

5 files changed

+104
-107
lines changed

5 files changed

+104
-107
lines changed

src/flightlog.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1782,7 +1782,7 @@ FlightLog.prototype.isFieldDisabled = function () {
17821782

17831783
if (
17841784
this.getSysConfig().firmwareType == FIRMWARE_TYPE_BETAFLIGHT &&
1785-
semver.gte(this.getSysConfig().firmwareVersion, "4.6.0")
1785+
semver.gte(this.getSysConfig().firmwareVersion, "2025.12.0")
17861786
) {
17871787
disabledFieldsFlags.ATTITUDE = (disabledFields & (1 << 8)) !== 0;
17881788
disabledFieldsFlags.ACC = (disabledFields & (1 << 9)) !== 0;

src/flightlog_fielddefs.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -529,10 +529,10 @@ export function adjustFieldDefsList(firmwareType, firmwareVersion) {
529529
DEBUG_MODE.splice(DEBUG_MODE.indexOf("FF_INTERPOLATED"), 1, "FEEDFORWARD");
530530
DEBUG_MODE.splice(DEBUG_MODE.indexOf("FF_LIMIT"), 1, "FEEDFORWARD_LIMIT");
531531
}
532-
if (semver.lt(firmwareVersion, "4.6.0")) {
532+
if (semver.lt(firmwareVersion, "2025.12.0")) {
533533
DEBUG_MODE.splice(DEBUG_MODE.indexOf("D_MAX"), 1, "D_MIN");
534534
}
535-
if (semver.gte(firmwareVersion, "4.6.0")) {
535+
if (semver.gte(firmwareVersion, "2025.12.0")) {
536536
ACC_HARDWARE.splice(ACC_HARDWARE.indexOf("ADXL345"), 1);
537537
ACC_HARDWARE.splice(ACC_HARDWARE.indexOf("MMA8452"), 1);
538538
ACC_HARDWARE.splice(ACC_HARDWARE.indexOf("BMA280"), 1);
@@ -550,7 +550,7 @@ export function adjustFieldDefsList(firmwareType, firmwareVersion) {
550550
DEBUG_MODE.push('WING_SETPOINT');
551551
DEBUG_MODE.push('AUTOPILOT_POSITION');
552552
}
553-
if (semver.gte(firmwareVersion, "4.6.0")) {
553+
if (semver.gte(firmwareVersion, "2025.12.0")) {
554554
//rename DUAL_GYRO_ to MULTI_GYRO
555555
DEBUG_MODE.splice(DEBUG_MODE.indexOf("DUAL_GYRO_RAW"), 1, "MULTI_GYRO_RAW");
556556
DEBUG_MODE.splice(DEBUG_MODE.indexOf("DUAL_GYRO_DIFF"), 1, "MULTI_GYRO_DIFF");
@@ -561,7 +561,7 @@ export function adjustFieldDefsList(firmwareType, firmwareVersion) {
561561
DEBUG_MODE = makeReadOnly(DEBUG_MODE);
562562

563563
// Flight mode names
564-
if (semver.gte(firmwareVersion, "4.6.0")) {
564+
if (semver.gte(firmwareVersion, "2025.12.0")) {
565565
FLIGHT_LOG_FLIGHT_MODE_NAME = FLIGHT_LOG_FLIGHT_MODE_NAME_POST_4_5.slice(0);
566566
} else {
567567
FLIGHT_LOG_FLIGHT_MODE_NAME = FLIGHT_LOG_FLIGHT_MODE_NAME_POST_3_3.slice(0);

src/flightlog_fields_presenter.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,7 +1314,7 @@ FlightLogFieldPresenter.adjustDebugDefsList = function (
13141314
};
13151315
}
13161316

1317-
if (semver.gte(firmwareVersion, '4.6.0')) {
1317+
if (semver.gte(firmwareVersion, '2025.12.0')) {
13181318
// FFT_FREQ updated in firmware #13750
13191319
DEBUG_FRIENDLY_FIELD_NAMES.FFT_FREQ = {
13201320
'debug[all]':'Debug FFT FREQ',
@@ -1975,7 +1975,7 @@ FlightLogFieldPresenter.decodeDebugFieldToFriendly = function (
19751975
return value.toFixed(0);
19761976
}
19771977
case "FFT_FREQ":
1978-
if (semver.gte(flightLog.getSysConfig().firmwareVersion, '4.6.0')) {
1978+
if (semver.gte(flightLog.getSysConfig().firmwareVersion, '2025.12.0')) {
19791979
switch (fieldName) {
19801980
case 'debug[0]': // gyro pre dyn notch [for gyro debug axis]
19811981
return Math.round(flightLog.gyroRawToDegreesPerSecond(value)) + " °/s";
@@ -2727,7 +2727,7 @@ FlightLogFieldPresenter.ConvertDebugFieldValue = function (
27272727
return value;
27282728
}
27292729
case "FFT_FREQ":
2730-
if (semver.gte(flightLog.getSysConfig().firmwareVersion, '4.6.0')) {
2730+
if (semver.gte(flightLog.getSysConfig().firmwareVersion, '2025.12.0')) {
27312731
switch (fieldName) {
27322732
case 'debug[0]': // gyro pre dyn notch [for gyro debug axis]
27332733
return toFriendly

src/flightlog_parser.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -960,11 +960,8 @@ export function FlightLogParser(logData) {
960960
$("html").removeClass("isINAV");
961961
}
962962

963-
that.sysConfig.firmware = parseFloat(
964-
`${matches[2]}.${matches[3]}`
965-
).toFixed(1);
966-
that.sysConfig.firmwarePatch =
967-
matches[5] != null ? parseInt(matches[5]) : "0";
963+
that.sysConfig.firmware = `${parseInt(matches[2])}.${parseInt(matches[3])}`;
964+
that.sysConfig.firmwarePatch = matches[5] != null ? parseInt(matches[5]) : "0";
968965
that.sysConfig.firmwareVersion = `${that.sysConfig.firmware}.${that.sysConfig.firmwarePatch}`;
969966
} else {
970967
/*

0 commit comments

Comments
 (0)