From 6ad92e34692aa6e3ca3b259a170b3c1cb155e59e Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Wed, 19 Oct 2022 23:16:56 +0200 Subject: [PATCH 1/2] Update hardware and debug fields Rebase fielddefs.js --- js/flightlog_fielddefs.js | 499 ++++++++++++++++--------------- js/flightlog_fields_presenter.js | 16 + 2 files changed, 275 insertions(+), 240 deletions(-) diff --git a/js/flightlog_fielddefs.js b/js/flightlog_fielddefs.js index f6fcc332..eb793048 100644 --- a/js/flightlog_fielddefs.js +++ b/js/flightlog_fielddefs.js @@ -18,7 +18,7 @@ const DSHOT_RANGE = DSHOT_MAX_VALUE - DSHOT_MIN_VALUE; const ANALOG_MIN_VALUE = 1000; // Fields definitions for lists -var +let FlightLogEvent = makeReadOnly({ SYNC_BEEP: 0, @@ -35,56 +35,56 @@ var CUSTOM : 250, // Virtual Event Code - Never part of Log File. CUSTOM_BLANK : 251, // Virtual Event Code - Never part of Log File. - No line shown - LOG_END: 255 + LOG_END: 255, }), // Add a general axis index. AXIS = makeReadOnly({ - ROLL: 0, - PITCH: 1, - YAW: 2 + ROLL: 0, + PITCH: 1, + YAW: 2, }), FLIGHT_LOG_FLIGHT_MODE_NAME = [], FLIGHT_LOG_FLIGHT_MODE_NAME_PRE_3_3 = makeReadOnly([ - 'ARM', - 'ANGLE', - 'HORIZON', - 'BARO', - 'ANTIGRAVITY', - 'MAG', - 'HEADFREE', - 'HEADADJ', - 'CAMSTAB', - 'CAMTRIG', - 'GPSHOME', - 'GPSHOLD', - 'PASSTHRU', - 'BEEPER', - 'LEDMAX', - 'LEDLOW', - 'LLIGHTS', - 'CALIB', - 'GOV', - 'OSD', - 'TELEMETRY', - 'GTUNE', - 'SONAR', - 'SERVO1', - 'SERVO2', - 'SERVO3', - 'BLACKBOX', - 'FAILSAFE', - 'AIRMODE', - '3DDISABLE', - 'FPVANGLEMIX', - 'BLACKBOXERASE', - 'CAMERA1', - 'CAMERA2', - 'CAMERA3', - 'FLIPOVERAFTERCRASH', - 'PREARM', + 'ARM', + 'ANGLE', + 'HORIZON', + 'BARO', + 'ANTIGRAVITY', + 'MAG', + 'HEADFREE', + 'HEADADJ', + 'CAMSTAB', + 'CAMTRIG', + 'GPSHOME', + 'GPSHOLD', + 'PASSTHRU', + 'BEEPER', + 'LEDMAX', + 'LEDLOW', + 'LLIGHTS', + 'CALIB', + 'GOV', + 'OSD', + 'TELEMETRY', + 'GTUNE', + 'SONAR', + 'SERVO1', + 'SERVO2', + 'SERVO3', + 'BLACKBOX', + 'FAILSAFE', + 'AIRMODE', + '3DDISABLE', + 'FPVANGLEMIX', + 'BLACKBOXERASE', + 'CAMERA1', + 'CAMERA2', + 'CAMERA3', + 'FLIPOVERAFTERCRASH', + 'PREARM', ]), FLIGHT_LOG_FLIGHT_MODE_NAME_POST_3_3 = makeReadOnly([ @@ -139,121 +139,121 @@ var ]), FLIGHT_LOG_FEATURES = makeReadOnly([ - 'RX_PPM', - 'VBAT', - 'INFLIGHT_ACC_CAL', - 'RX_SERIAL', - 'MOTOR_STOP', - 'SERVO_TILT', - 'SOFTSERIAL', - 'GPS', - 'FAILSAFE', - 'SONAR', - 'TELEMETRY', - 'CURRENT_METER', - '3D', - 'RX_PARALLEL_PWM', - 'RX_MSP', - 'RSSI_ADC', - 'LED_STRIP', - 'DISPLAY', - 'ONESHOT125', - 'BLACKBOX', - 'CHANNEL_FORWARDING', - 'TRANSPONDER', - 'AIRMODE', - 'SUPEREXPO_RATES' + 'RX_PPM', + 'VBAT', + 'INFLIGHT_ACC_CAL', + 'RX_SERIAL', + 'MOTOR_STOP', + 'SERVO_TILT', + 'SOFTSERIAL', + 'GPS', + 'FAILSAFE', + 'SONAR', + 'TELEMETRY', + 'CURRENT_METER', + '3D', + 'RX_PARALLEL_PWM', + 'RX_MSP', + 'RSSI_ADC', + 'LED_STRIP', + 'DISPLAY', + 'ONESHOT125', + 'BLACKBOX', + 'CHANNEL_FORWARDING', + 'TRANSPONDER', + 'AIRMODE', + 'SUPEREXPO_RATES', ]), PID_CONTROLLER_TYPE = ([ - 'UNUSED', - 'MWREWRITE', - 'LUXFLOAT' + 'UNUSED', + 'MWREWRITE', + 'LUXFLOAT', ]), PID_DELTA_TYPE = makeReadOnly([ - 'ERROR', - 'MEASUREMENT' + 'ERROR', + 'MEASUREMENT', ]), OFF_ON = makeReadOnly([ - "OFF", - "ON" + "OFF", + "ON", ]), FAST_PROTOCOL = makeReadOnly([ - "PWM", - "ONESHOT125", - "ONESHOT42", - "MULTISHOT", - "BRUSHED", - "DSHOT150", - "DSHOT300", - "DSHOT600", - "DSHOT1200", - "PROSHOT1000", + "PWM", + "ONESHOT125", + "ONESHOT42", + "MULTISHOT", + "BRUSHED", + "DSHOT150", + "DSHOT300", + "DSHOT600", + "DSHOT1200", //deprecated + "PROSHOT1000", ]), MOTOR_SYNC = makeReadOnly([ - "SYNCED", - "UNSYNCED" + "SYNCED", + "UNSYNCED", ]), SERIALRX_PROVIDER = makeReadOnly([ - "SPEK1024", - "SPEK2048", - "SBUS", - "SUMD", - "SUMH", - "XB-B", - "XB-B-RJ01", - "IBUS", - "JETIEXBUS", - "CRSF", - "SRXL", - "CUSTOM", - "FPORT", - "SRXL2", - "GHST" + "SPEK1024", + "SPEK2048", + "SBUS", + "SUMD", + "SUMH", + "XB-B", + "XB-B-RJ01", + "IBUS", + "JETIEXBUS", + "CRSF", + "SRXL", + "CUSTOM", + "FPORT", + "SRXL2", + "GHST", ]), ANTI_GRAVITY_MODE = makeReadOnly([ "SMOOTH", - "STEP" + "STEP", ]), RC_SMOOTHING_TYPE = makeReadOnly([ "INTERPOLATION", - "FILTER" + "FILTER", ]), RC_SMOOTHING_INPUT_TYPE = makeReadOnly([ "PT1", - "BIQUAD" + "BIQUAD", ]), RC_SMOOTHING_DERIVATIVE_TYPE = makeReadOnly([ "PT1", - "BIQUAD" + "BIQUAD", ]), RC_SMOOTHING_MODE = makeReadOnly([ "OFF", - "ON" + "ON", ]), RC_SMOOTHING_DEBUG_AXIS = makeReadOnly([ "ROLL", "PITCH", "YAW", - "THROTTLE" + "THROTTLE", ]), RC_INTERPOLATION = makeReadOnly([ - "OFF", - "DEFAULT", - "AUTO", - "MANUAL" + "OFF", + "DEFAULT", + "AUTO", + "MANUAL", ]), FILTER_TYPE = makeReadOnly([ @@ -266,149 +266,168 @@ var DEBUG_MODE = [], DEBUG_MODE_COMPLETE = makeReadOnly([ - "NONE", - "CYCLETIME", - "BATTERY", - "GYRO", - "ACCELEROMETER", - "MIXER", - "AIRMODE", - "PIDLOOP", - "NOTCH", - "RC_INTERPOLATION", - "VELOCITY", - "DTERM_FILTER", - "ANGLERATE", - "ESC_SENSOR", - "SCHEDULER", - "STACK", - "ESC_SENSOR_RPM", - "ESC_SENSOR_TMP", - "ALTITUDE", - "FFT", - "FFT_TIME", - "FFT_FREQ", - "RX_FRSKY_SPI", - "GYRO_RAW", - "DUAL_GYRO", - "DUAL_GYRO_RAW", - "DUAL_GYRO_COMBINED", - "DUAL_GYRO_DIFF", - "MAX7456_SIGNAL", - "MAX7456_SPICLOCK", - "SBUS", - "FPORT", - "RANGEFINDER", - "RANGEFINDER_QUALITY", - "LIDAR_TF", - "ADC_INTERNAL", - "RUNAWAY_TAKEOFF", - "SDIO", - "CURRENT_SENSOR", - "USB", - "SMARTAUDIO", - "RTH", - "ITERM_RELAX", - "ACRO_TRAINER", - "RC_SMOOTHING", - "RX_SIGNAL_LOSS", - "RC_SMOOTHING_RATE", - "ANTI_GRAVITY", - "DYN_LPF", - "RX_SPECTRUM_SPI", - "DSHOT_RPM_TELEMETRY", - "RPM_FILTER", - "D_MIN", - "AC_CORRECTION", - "AC_ERROR", - "DUAL_GYRO_SCALED", - "DSHOT_RPM_ERRORS", - "CRSF_LINK_STATISTICS_UPLINK", - "CRSF_LINK_STATISTICS_PWR", - "CRSF_LINK_STATISTICS_DOWN", - "BARO", - "GPS_RESCUE_THROTTLE_PID", - "DYN_IDLE", - "FF_LIMIT", - "FF_INTERPOLATED", - "BLACKBOX_OUTPUT", - "GYRO_SAMPLE", - "RX_TIMING", - "D_LPF", - "VTX_TRAMP", - "GHST", - "GHST_MSP", - "SCHEDULER_DETERMINISM", - "TIMING_ACCURACY", - "RX_EXPRESSLRS_SPI", - "RX_EXPRESSLRS_PHASELOCK", - "RX_STATE_TIME", - "GPS_RESCUE_VELOCITY", - "GPS_RESCUE_HEADING", - "GPS_RESCUE_TRACKING", - "ATTITUDE", + "NONE", + "CYCLETIME", + "BATTERY", + "GYRO", + "ACCELEROMETER", + "MIXER", + "AIRMODE", + "PIDLOOP", + "NOTCH", + "RC_INTERPOLATION", + "VELOCITY", + "DTERM_FILTER", + "ANGLERATE", + "ESC_SENSOR", + "SCHEDULER", + "STACK", + "ESC_SENSOR_RPM", + "ESC_SENSOR_TMP", + "ALTITUDE", + "FFT", + "FFT_TIME", + "FFT_FREQ", + "RX_FRSKY_SPI", + "GYRO_RAW", + "DUAL_GYRO", + "DUAL_GYRO_RAW", + "DUAL_GYRO_COMBINED", + "DUAL_GYRO_DIFF", + "MAX7456_SIGNAL", + "MAX7456_SPICLOCK", + "SBUS", + "FPORT", + "RANGEFINDER", + "RANGEFINDER_QUALITY", + "LIDAR_TF", + "ADC_INTERNAL", + "RUNAWAY_TAKEOFF", + "SDIO", + "CURRENT_SENSOR", + "USB", + "SMARTAUDIO", + "RTH", + "ITERM_RELAX", + "ACRO_TRAINER", + "RC_SMOOTHING", + "RX_SIGNAL_LOSS", + "RC_SMOOTHING_RATE", + "ANTI_GRAVITY", + "DYN_LPF", + "RX_SPECTRUM_SPI", + "DSHOT_RPM_TELEMETRY", + "RPM_FILTER", + "D_MIN", + "AC_CORRECTION", + "AC_ERROR", + "DUAL_GYRO_SCALED", + "DSHOT_RPM_ERRORS", + "CRSF_LINK_STATISTICS_UPLINK", + "CRSF_LINK_STATISTICS_PWR", + "CRSF_LINK_STATISTICS_DOWN", + "BARO", + "GPS_RESCUE_THROTTLE_PID", + "DYN_IDLE", + "FF_LIMIT", + "FF_INTERPOLATED", + "BLACKBOX_OUTPUT", + "GYRO_SAMPLE", + "RX_TIMING", + "D_LPF", + "VTX_TRAMP", + "GHST", + "GHST_MSP", + "SCHEDULER_DETERMINISM", + "TIMING_ACCURACY", + "RX_EXPRESSLRS_SPI", + "RX_EXPRESSLRS_PHASELOCK", + "RX_STATE_TIME", + "GPS_RESCUE_VELOCITY", + "GPS_RESCUE_HEADING", + "GPS_RESCUE_TRACKING", + "ATTITUDE", + "VTX_MSP", ]), SUPER_EXPO_YAW = makeReadOnly([ - "OFF", - "ON", - "ALWAYS" + "OFF", + "ON", + "ALWAYS", ]), DTERM_DIFFERENTIATOR = makeReadOnly([ - "STANDARD", - "ENHANCED" + "STANDARD", + "ENHANCED", ]), GYRO_LPF = makeReadOnly([ - "OFF", - "188HZ", - "98HZ", - "42HZ", - "20HZ", - "10HZ", - "5HZ", - "EXPERIMENTAL" + "OFF", + "188HZ", + "98HZ", + "42HZ", + "20HZ", + "10HZ", + "5HZ", + "EXPERIMENTAL", ]), GYRO_HARDWARE_LPF = makeReadOnly([ - "NORMAL", - "EXPERIMENTAL", - "1KHZ_SAMPLING" + "NORMAL", + "EXPERIMENTAL", + "1KHZ_SAMPLING", ]), GYRO_32KHZ_HARDWARE_LPF = makeReadOnly([ - "NORMAL", - "EXPERIMENTAL" + "NORMAL", + "EXPERIMENTAL", ]), ACC_HARDWARE = makeReadOnly([ - "AUTO", - "NONE", - "ADXL345", - "MPU6050", - "MMA8452", - "BMA280", - "LSM303DLHC", - "MPU6000", - "MPU6500", - "FAKE" + "AUTO", + "NONE", + "ADXL345", + "MPU6050", + "MMA8452", + "BMA280", + "LSM303DLHC", + "MPU6000", + "MPU6500", + "MPU9250", + "ICM20601", + "ICM20602", + "ICM20608G", + "ICM20649", + "ICM20689", + "ICM42605", + "ICM42688P", + "BMI160", + "BMI270", + "LSM6DSO", + "FAKE", ]), BARO_HARDWARE = makeReadOnly([ - "AUTO", - "NONE", - "BMP085", - "MS5611", - "BMP280" + "AUTO", + "NONE", + "BMP085", + "MS5611", + "BMP280", + "LPS", + "QMP6988", + "BMP388", + "DPS310", ]), MAG_HARDWARE = makeReadOnly([ - "AUTO", - "NONE", - "HMC5883", - "AK8975", - "AK8963" + "AUTO", + "NONE", + "HMC5883", + "AK8975", + "AK8963", + "QMC5883", + "LIS3MDL", + "MAG_MPU925X_AK8963", ]), FLIGHT_LOG_FLIGHT_STATE_NAME = makeReadOnly([ @@ -416,14 +435,14 @@ var "GPS_FIX", "CALIBRATE_MAG", "SMALL_ANGLE", - "FIXED_WING" + "FIXED_WING", ]), FLIGHT_LOG_FAILSAFE_PHASE_NAME = makeReadOnly([ "IDLE", "RX_LOSS_DETECTED", "LANDING", - "LANDED" + "LANDED", ]), FFT_CALC_STEPS = makeReadOnly([ @@ -433,15 +452,15 @@ var "ARM_CMPLX_MAG_F32", "CALC_FREQUENCIES", "UPDATE_FILTERS", - "HANNING" + "HANNING", ]), ITERM_RELAX = makeReadOnly([ "OFF", "RP", - "RPY", + "RPY", "RP_INC", - "RPY_INC", + "RPY_INC", ]), ITERM_RELAX_TYPE = makeReadOnly([ @@ -502,7 +521,7 @@ var ]); function adjustFieldDefsList(firmwareType, firmwareVersion) { - if((firmwareType == FIRMWARE_TYPE_BETAFLIGHT) && semver.gte(firmwareVersion, '3.3.0')) { + if (firmwareType === FIRMWARE_TYPE_BETAFLIGHT && semver.gte(firmwareVersion, '3.3.0')) { // Debug names DEBUG_MODE = DEBUG_MODE_COMPLETE.slice(0); @@ -511,18 +530,18 @@ function adjustFieldDefsList(firmwareType, firmwareVersion) { DEBUG_MODE.splice(DEBUG_MODE.indexOf('VELOCITY'), 1); DEBUG_MODE.splice(DEBUG_MODE.indexOf('DTERM_FILTER'), 1); - if(semver.gte(firmwareVersion, '3.4.0')) { + if (semver.gte(firmwareVersion, '3.4.0')) { DEBUG_MODE.splice(DEBUG_MODE.indexOf('GYRO'), 1, 'GYRO_FILTERED'); DEBUG_MODE.splice(DEBUG_MODE.indexOf('NOTCH'), 1, 'GYRO_SCALED'); } - if(semver.gte(firmwareVersion, '4.0.0')) { + if (semver.gte(firmwareVersion, '4.0.0')) { DEBUG_MODE.splice(DEBUG_MODE.indexOf('GYRO_RAW'), 0, 'RX_SFHSS_SPI'); } - if(semver.gte(firmwareVersion, '4.1.0')) { + if (semver.gte(firmwareVersion, '4.1.0')) { DEBUG_MODE.splice(DEBUG_MODE.indexOf('DUAL_GYRO'), 1); DEBUG_MODE.splice(DEBUG_MODE.indexOf('DUAL_GYRO_COMBINED'), 1); } - if(semver.gte(firmwareVersion, '4.3.0')) { + if (semver.gte(firmwareVersion, '4.3.0')) { DEBUG_MODE.splice(DEBUG_MODE.indexOf('FF_INTERPOLATED'), 1, 'FEEDFORWARD'); DEBUG_MODE.splice(DEBUG_MODE.indexOf('FF_LIMIT'), 1, 'FEEDFORWARD_LIMIT'); } @@ -553,7 +572,7 @@ function adjustFieldDefsList(firmwareType, firmwareVersion) { FLIGHT_LOG_FLIGHT_MODE_NAME = FLIGHT_LOG_FLIGHT_MODE_NAME_PRE_3_3.slice(0); - if((firmwareType == FIRMWARE_TYPE_BETAFLIGHT) && semver.lte(firmwareVersion, '3.1.6')) { + if (firmwareType === FIRMWARE_TYPE_BETAFLIGHT && semver.lte(firmwareVersion, '3.1.6')) { FLIGHT_LOG_FLIGHT_MODE_NAME.splice(FLIGHT_LOG_FLIGHT_MODE_NAME.indexOf('ANTIGRAVITY'), 1); } diff --git a/js/flightlog_fields_presenter.js b/js/flightlog_fields_presenter.js index 3bdc8317..9c94808f 100644 --- a/js/flightlog_fields_presenter.js +++ b/js/flightlog_fields_presenter.js @@ -693,6 +693,13 @@ function FlightLogFieldPresenter() { 'debug[2]':'Altitude', 'debug[3]':'Target altitude', }; + DEBUG_FRIENDLY_FIELD_NAMES.VTX_MSP = { + 'debug[all]': 'VTX MSP', + 'debug[0]': 'packetCounter', + 'debug[1]': 'isCrsfPortConfig', + 'debug[2]': 'isLowPowerDisarmed', + 'debug[3]': 'mspTelemetryDescriptor', + }; } else if (semver.gte(firmwareVersion, '4.3.0')) { DEBUG_FRIENDLY_FIELD_NAMES.FEEDFORWARD = { 'debug[all]':'Feedforward [roll]', @@ -1265,6 +1272,15 @@ function FlightLogFieldPresenter() { default: return value.toFixed(0); } + case 'VTX_MSP': + switch (fieldName) { + case 'debug[0]': // packetCounter + case 'debug[1]': // isCrsfPortConfig + case 'debug[2]': // isLowPowerDisarmed + case 'debug[3]': // mspTelemetryDescriptor + default: + return value.toFixed(0); + } } return value.toFixed(0); } From ad78de36c0b9c2cf3aa527f092a722db96ae639e Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Thu, 20 Oct 2022 22:31:14 +0200 Subject: [PATCH 2/2] Rebasing flightlog field presenter --- js/flightlog_fields_presenter.js | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/js/flightlog_fields_presenter.js b/js/flightlog_fields_presenter.js index 9c94808f..0d6ef9cd 100644 --- a/js/flightlog_fields_presenter.js +++ b/js/flightlog_fields_presenter.js @@ -758,13 +758,6 @@ function FlightLogFieldPresenter() { 'debug[2]':'Acceleration, clipped [roll]', 'debug[3]':'Duplicate Counter [roll]', }; - DEBUG_FRIENDLY_FIELD_NAMES.FF_LIMIT = { - 'debug[all]':'Feedforward Limit [roll]', - 'debug[0]':'FF limit input [roll]', - 'debug[1]':'FF limit input [pitch]', - 'debug[2]':'FF limited [roll]', - 'debug[3]':'Not Used', - }; } else if (semver.gte(firmwareVersion, '4.1.0')) { DEBUG_FRIENDLY_FIELD_NAMES.FF_INTERPOLATED = { 'debug[all]':'Feedforward [roll]', @@ -981,7 +974,7 @@ function FlightLogFieldPresenter() { } }; - FlightLogFieldPresenter.decodeDebugFieldToFriendly = function(flightLog, fieldName, value, currentFlightMode) { + FlightLogFieldPresenter.decodeDebugFieldToFriendly = function(flightLog, fieldName, value) { if (flightLog) { const debugModeName = DEBUG_MODE[flightLog.getSysConfig().debug_mode]; // convert to recognisable name switch (debugModeName) {