Skip to content

Added ALTHOLD flight mode marker at the chart for 4.6 BF firmware #767

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 4, 2024
Merged

Added ALTHOLD flight mode marker at the chart for 4.6 BF firmware #767

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71895b1
added ALTHOLD flight mode for 4.6 BF firmware
demvlad Aug 22, 2024
82d5572
code style improvement
demvlad Aug 22, 2024
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
140 changes: 94 additions & 46 deletions src/flightlog_fielddefs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,49 @@ export const FLIGHT_LOG_FLIGHT_MODE_NAME_POST_3_3 = makeReadOnly([
"LAUNCHCONTROL",
]);

export const FLIGHT_LOG_FLIGHT_MODE_NAME_POST_4_5 = makeReadOnly([
"ARM",
"ANGLE",
"HORIZON",
"MAG",
"ALTHOLD",
"HEADFREE",
"PASSTHRU",
"FAILSAFE",
"GPSRESCUE",
"ANTIGRAVITY",
"HEADADJ",
"CAMSTAB",
"BEEPER",
"LEDLOW",
"CALIB",
"OSD",
"TELEMETRY",
"SERVO1",
"SERVO2",
"SERVO3",
"BLACKBOX",
"AIRMODE",
"3D",
"FPVANGLEMIX",
"BLACKBOXERASE",
"CAMERA1",
"CAMERA2",
"CAMERA3",
"FLIPOVERAFTERCRASH",
"PREARM",
"BEEPGPSCOUNT",
"VTXPITMODE",
"USER1",
"USER2",
"USER3",
"USER4",
"PIDAUDIO",
"ACROTRAINER",
"VTXCONTROLDISABLE",
"LAUNCHCONTROL",
]);

export const FLIGHT_LOG_FEATURES = makeReadOnly([
"RX_PPM",
"VBAT",
Expand Down Expand Up @@ -488,53 +531,58 @@ export function adjustFieldDefsList(firmwareType, firmwareVersion) {
DEBUG_MODE = makeReadOnly(DEBUG_MODE);

// Flight mode names
FLIGHT_LOG_FLIGHT_MODE_NAME = FLIGHT_LOG_FLIGHT_MODE_NAME_POST_3_3.slice(0);
if (semver.lt(firmwareVersion, "3.4.0")) {
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("GPSRESCUE"),
1
);
}
if (semver.gte(firmwareVersion, "3.5.0")) {
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("RANGEFINDER"),
1
);
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("CAMTRIG"),
1
);
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("LEDMAX"),
1
);
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("LLIGHTS"),
1
);
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("GOV"),
1
);
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("GTUNE"),
1
);
}
if (semver.gte(firmwareVersion, "4.0.0")) {
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("BARO"),
1
);
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("GPSHOME"),
1
);
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("GPSHOLD"),
1
);
if (semver.gte(firmwareVersion, "4.6.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);
if (semver.lt(firmwareVersion, "3.4.0")) {
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("GPSRESCUE"),
1
);
}
if (semver.gte(firmwareVersion, "3.5.0")) {
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("RANGEFINDER"),
1
);
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("CAMTRIG"),
1
);
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("LEDMAX"),
1
);
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("LLIGHTS"),
1
);
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("GOV"),
1
);
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("GTUNE"),
1
);
}
if (semver.gte(firmwareVersion, "4.0.0")) {
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("BARO"),
1
);
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("GPSHOME"),
1
);
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("GPSHOLD"),
1
);
}
}

FLIGHT_LOG_FLIGHT_MODE_NAME = makeReadOnly(FLIGHT_LOG_FLIGHT_MODE_NAME);
} else {
DEBUG_MODE = DEBUG_MODE_COMPLETE;
Expand Down