Skip to content

Commit 418662c

Browse files
authored
Fix type error (#806)
1 parent 20def91 commit 418662c

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

src/flightlog_fielddefs.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,9 @@ export const GYRO_HARDWARE_LPF = makeReadOnly([
376376

377377
export const GYRO_32KHZ_HARDWARE_LPF = makeReadOnly(["NORMAL", "EXPERIMENTAL"]);
378378

379-
export const ACC_HARDWARE = makeReadOnly([
379+
export let ACC_HARDWARE = [];
380+
381+
export const ACC_HARDWARE_COMPLETE = makeReadOnly([
380382
"AUTO",
381383
"NONE",
382384
"ADXL345",
@@ -502,6 +504,8 @@ export function adjustFieldDefsList(firmwareType, firmwareVersion) {
502504
firmwareType === FIRMWARE_TYPE_BETAFLIGHT &&
503505
semver.gte(firmwareVersion, "3.3.0")
504506
) {
507+
// ACC hardware names
508+
ACC_HARDWARE = ACC_HARDWARE_COMPLETE.slice(0);
505509
// Debug names
506510
DEBUG_MODE = DEBUG_MODE_COMPLETE.slice(0);
507511
DEBUG_MODE.splice(DEBUG_MODE.indexOf("MIXER"), 1);
@@ -528,6 +532,11 @@ export function adjustFieldDefsList(firmwareType, firmwareVersion) {
528532
DEBUG_MODE.splice(DEBUG_MODE.indexOf("D_MAX"), 1, "D_MIN");
529533
}
530534
if (semver.gte(firmwareVersion, "4.6.0")) {
535+
ACC_HARDWARE.splice(ACC_HARDWARE.indexOf("ADXL345"), 1);
536+
ACC_HARDWARE.splice(ACC_HARDWARE.indexOf("MMA8452"), 1);
537+
ACC_HARDWARE.splice(ACC_HARDWARE.indexOf("BMA280"), 1);
538+
ACC_HARDWARE.splice(ACC_HARDWARE.indexOf("LSM303DLHC"), 1);
539+
531540
DEBUG_MODE.splice(DEBUG_MODE.indexOf('GPS_RESCUE_THROTTLE_PID'), 1, 'AUTOPILOT_ALTITUDE');
532541
DEBUG_MODE.splice(DEBUG_MODE.indexOf("GYRO_SCALED"), 1);
533542
DEBUG_MODE.splice(DEBUG_MODE.indexOf("RANGEFINDER_QUALITY") + 1, 0, "OPTICALFLOW");
@@ -540,15 +549,12 @@ export function adjustFieldDefsList(firmwareType, firmwareVersion) {
540549
DEBUG_MODE.push('AUTOPILOT_POSITION');
541550
}
542551

552+
ACC_HARDWARE = makeReadOnly(ACC_HARDWARE);
543553
DEBUG_MODE = makeReadOnly(DEBUG_MODE);
544554

545555
// Flight mode names
546556
if (semver.gte(firmwareVersion, "4.6.0")) {
547557
FLIGHT_LOG_FLIGHT_MODE_NAME = FLIGHT_LOG_FLIGHT_MODE_NAME_POST_4_5.slice(0);
548-
ACC_HARDWARE.splice(ACC_HARDWARE.indexOf("ADXL345"), 1);
549-
ACC_HARDWARE.splice(ACC_HARDWARE.indexOf("MMA8452"), 1);
550-
ACC_HARDWARE.splice(ACC_HARDWARE.indexOf("BMA280"), 1);
551-
ACC_HARDWARE.splice(ACC_HARDWARE.indexOf("LSM303DLHC"), 1);
552558
} else {
553559
FLIGHT_LOG_FLIGHT_MODE_NAME = FLIGHT_LOG_FLIGHT_MODE_NAME_POST_3_3.slice(0);
554560
if (semver.lt(firmwareVersion, "3.4.0")) {

0 commit comments

Comments
 (0)