Skip to content

Commit 886b3f8

Browse files
authored
Added ALTHOLD flight mode marker at the chart for 4.6 BF firmware (#767)
* added ALTHOLD flight mode for 4.6 BF firmware * code style improvement
1 parent 68b5b71 commit 886b3f8

File tree

1 file changed

+94
-46
lines changed

1 file changed

+94
-46
lines changed

src/flightlog_fielddefs.js

Lines changed: 94 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,49 @@ export const FLIGHT_LOG_FLIGHT_MODE_NAME_POST_3_3 = makeReadOnly([
134134
"LAUNCHCONTROL",
135135
]);
136136

137+
export const FLIGHT_LOG_FLIGHT_MODE_NAME_POST_4_5 = makeReadOnly([
138+
"ARM",
139+
"ANGLE",
140+
"HORIZON",
141+
"MAG",
142+
"ALTHOLD",
143+
"HEADFREE",
144+
"PASSTHRU",
145+
"FAILSAFE",
146+
"GPSRESCUE",
147+
"ANTIGRAVITY",
148+
"HEADADJ",
149+
"CAMSTAB",
150+
"BEEPER",
151+
"LEDLOW",
152+
"CALIB",
153+
"OSD",
154+
"TELEMETRY",
155+
"SERVO1",
156+
"SERVO2",
157+
"SERVO3",
158+
"BLACKBOX",
159+
"AIRMODE",
160+
"3D",
161+
"FPVANGLEMIX",
162+
"BLACKBOXERASE",
163+
"CAMERA1",
164+
"CAMERA2",
165+
"CAMERA3",
166+
"FLIPOVERAFTERCRASH",
167+
"PREARM",
168+
"BEEPGPSCOUNT",
169+
"VTXPITMODE",
170+
"USER1",
171+
"USER2",
172+
"USER3",
173+
"USER4",
174+
"PIDAUDIO",
175+
"ACROTRAINER",
176+
"VTXCONTROLDISABLE",
177+
"LAUNCHCONTROL",
178+
]);
179+
137180
export const FLIGHT_LOG_FEATURES = makeReadOnly([
138181
"RX_PPM",
139182
"VBAT",
@@ -488,53 +531,58 @@ export function adjustFieldDefsList(firmwareType, firmwareVersion) {
488531
DEBUG_MODE = makeReadOnly(DEBUG_MODE);
489532

490533
// Flight mode names
491-
FLIGHT_LOG_FLIGHT_MODE_NAME = FLIGHT_LOG_FLIGHT_MODE_NAME_POST_3_3.slice(0);
492-
if (semver.lt(firmwareVersion, "3.4.0")) {
493-
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
494-
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("GPSRESCUE"),
495-
1
496-
);
497-
}
498-
if (semver.gte(firmwareVersion, "3.5.0")) {
499-
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
500-
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("RANGEFINDER"),
501-
1
502-
);
503-
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
504-
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("CAMTRIG"),
505-
1
506-
);
507-
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
508-
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("LEDMAX"),
509-
1
510-
);
511-
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
512-
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("LLIGHTS"),
513-
1
514-
);
515-
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
516-
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("GOV"),
517-
1
518-
);
519-
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
520-
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("GTUNE"),
521-
1
522-
);
523-
}
524-
if (semver.gte(firmwareVersion, "4.0.0")) {
525-
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
526-
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("BARO"),
527-
1
528-
);
529-
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
530-
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("GPSHOME"),
531-
1
532-
);
533-
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
534-
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("GPSHOLD"),
535-
1
536-
);
534+
if (semver.gte(firmwareVersion, "4.6.0")) {
535+
FLIGHT_LOG_FLIGHT_MODE_NAME = FLIGHT_LOG_FLIGHT_MODE_NAME_POST_4_5.slice(0);
536+
} else {
537+
FLIGHT_LOG_FLIGHT_MODE_NAME = FLIGHT_LOG_FLIGHT_MODE_NAME_POST_3_3.slice(0);
538+
if (semver.lt(firmwareVersion, "3.4.0")) {
539+
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
540+
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("GPSRESCUE"),
541+
1
542+
);
543+
}
544+
if (semver.gte(firmwareVersion, "3.5.0")) {
545+
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
546+
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("RANGEFINDER"),
547+
1
548+
);
549+
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
550+
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("CAMTRIG"),
551+
1
552+
);
553+
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
554+
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("LEDMAX"),
555+
1
556+
);
557+
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
558+
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("LLIGHTS"),
559+
1
560+
);
561+
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
562+
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("GOV"),
563+
1
564+
);
565+
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
566+
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("GTUNE"),
567+
1
568+
);
569+
}
570+
if (semver.gte(firmwareVersion, "4.0.0")) {
571+
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
572+
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("BARO"),
573+
1
574+
);
575+
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
576+
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("GPSHOME"),
577+
1
578+
);
579+
FLIGHT_LOG_FLIGHT_MODE_NAME.splice(
580+
FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf("GPSHOLD"),
581+
1
582+
);
583+
}
537584
}
585+
538586
FLIGHT_LOG_FLIGHT_MODE_NAME = makeReadOnly(FLIGHT_LOG_FLIGHT_MODE_NAME);
539587
} else {
540588
DEBUG_MODE = DEBUG_MODE_COMPLETE;

0 commit comments

Comments
 (0)