Updated parser and field presenter for edt signals.

Found a workaround to plot esc signal 4

Added basic ESC plot functionality

updated project files

Implemented array fiels propagation over empty fields

Fixed bad FLIGHT_LOG_FIELD_ENCODING_PACK_1F_1F_1F_1G_4U_8U decoding

Removed tabs on changed files

Fixed some more review findings

Author: damosvil

js/flightlog.js

@@ -303,6 +303,35 @@ function FlightLog(logData) {
         return numMotors;
     };
 
+    /*
+     * Propagates array data fiels over empty fields
+     * Debug fields can be arrays with data, so it fills data gaps when no arrays are stored
+     */
+    function propagateArrayFields(chunks)
+    {
+        var k, j, i, previousFrame = 0, currentFrame;
+        
+        for (k = 0; k < chunks.length; k++)
+        {
+            for (j = 0; j < chunks[k].frames.length; j++)
+            {
+                currentFrame = chunks[k].frames[j]; 
+                if (previousFrame == 0)
+                    previousFrame = currentFrame;
+                    
+                for (i = 0; i < currentFrame.length; i++)
+                {
+                    if (!Array.isArray(currentFrame[i]) && Array.isArray(previousFrame[i]))
+                    {
+                        currentFrame[i] = previousFrame[i];
+                    }
+                }
+                
+                previousFrame = chunks[k].frames[j];
+            }
+        }
+    }
+
     /**
      * Get the raw chunks in the range [startIndex...endIndex] (inclusive)
      *
@@ -511,6 +540,7 @@ function FlightLog(logData) {
         }
 
         injectComputedFields(resultChunks, resultChunks);
+        propagateArrayFields(resultChunks);
 
         return resultChunks;
     }

js/flightlog_fielddefs.js

@@ -349,6 +349,15 @@ let
         "ATTITUDE",
         "VTX_MSP",
         "GPS_DOP",
+        "ANGLEMODE",
+        "FAILSAFE",
+        "DSHOT_STATUS_N_TEMPERATURE",
+        "DSHOT_STATUS_N_VOLTAGE",
+        "DSHOT_STATUS_N_CURRENT",
+        "DSHOT_STATUS_N_DEBUG1",
+        "DSHOT_STATUS_N_DEBUG2",
+        "DSHOT_STATUS_N_DEMAG_METRIC",
+        "DSHOT_STATUS_N_ERPM_FRACTION_18",
     ]),
 
     SUPER_EXPO_YAW = makeReadOnly([

js/flightlog_fields_presenter.js

@@ -690,6 +690,69 @@ function FlightLogFieldPresenter() {
             'debug[2]': 'hDOP (horizontal - 2D)',
             'debug[3]': 'vDOP (vertical - 1D)',
         },
+        'ANGLEMODE' : {
+            'debug[all]': 'ANGLEMODE',
+            'debug[0]': 'ANGLEMODE1',
+            'debug[1]': 'ANGLEMODE2',
+            'debug[2]': 'ANGLEMODE3',
+            'debug[3]': 'ANGLEMODE4',
+        },
+        'FAILSAFE' : {
+            'debug[all]': 'GPS Dilution of Precision',
+            'debug[0]': 'Number of Satellites',
+            'debug[1]': 'pDOP (positional - 3D)',
+            'debug[2]': 'hDOP (horizontal - 2D)',
+            'debug[3]': 'vDOP (vertical - 1D)',
+        },
+        'DSHOT_STATUS_N_TEMPERATURE' : {
+            'debug[all]': 'ESC Status & Temperature',
+            'debug[0]': 'ESC0',
+            'debug[1]': 'ESC1',
+            'debug[2]': 'ESC2',
+            'debug[3]': 'ESC3',
+        },
+        'DSHOT_STATUS_N_VOLTAGE' : {
+            'debug[all]': 'ESC Status & Voltage',
+            'debug[0]': 'ESC0',
+            'debug[1]': 'ESC1',
+            'debug[2]': 'ESC2',
+            'debug[3]': 'ESC3',
+        },
+        'DSHOT_STATUS_N_CURRENT' : {
+            'debug[all]': 'ESC Status & Current',
+            'debug[0]': 'ESC0',
+            'debug[1]': 'ESC1',
+            'debug[2]': 'ESC2',
+            'debug[3]': 'ESC3',
+        },
+        'DSHOT_STATUS_N_DEBUG1' : {
+            'debug[all]': 'ESC Status & Debug1',
+            'debug[0]': 'ESC0',
+            'debug[1]': 'ESC1',
+            'debug[2]': 'ESC2',
+            'debug[3]': 'ESC3',
+        },
+        'DSHOT_STATUS_N_DEBUG2' : {
+            'debug[all]': 'ESC Status & Debug2',
+            'debug[0]': 'ESC0',
+            'debug[1]': 'ESC1',
+            'debug[2]': 'ESC2',
+            'debug[3]': 'ESC3',
+        },
+        'DSHOT_STATUS_N_DEMAG_METRIC' : {
+            'debug[all]': 'ESC Status & Demag metric',
+            'debug[0]': 'ESC0',
+            'debug[1]': 'ESC1',
+            'debug[2]': 'ESC2',
+            'debug[3]': 'ESC3',
+        },
+        'DSHOT_STATUS_N_ERPM_FRACTION_18' : {
+            'debug[all]': 'ESC Status & RPM',
+            'debug[0]': 'ESC0',
+            'debug[1]': 'ESC1',
+            'debug[2]': 'ESC2',
+            'debug[3]': 'ESC3',
+        },
     };
 
     let DEBUG_FRIENDLY_FIELD_NAMES = null;
@@ -1354,7 +1417,41 @@ function FlightLogFieldPresenter() {
                         default:
                             return (value / 100).toFixed(2);
                     }
+                case 'ANGLEMODE':
+                    switch (fieldName) {
+                        case 'debug[0]': // packetCounter
+                        case 'debug[1]': // isCrsfPortConfig
+                        case 'debug[2]': // isLowPowerDisarmed
+                        case 'debug[3]': // mspTelemetryDescriptor
+                        default:
+                            return value.toFixed(0);
+                    }
+                case 'FAILSAFE':
+                    switch (fieldName) {
+                        case 'debug[0]': // packetCounter
+                        case 'debug[1]': // isCrsfPortConfig
+                        case 'debug[2]': // isLowPowerDisarmed
+                        case 'debug[3]': // mspTelemetryDescriptor
+                        default:
+                            return value.toFixed(0);
+                    }
+                case 'DSHOT_STATUS_N_TEMPERATURE':
+                    return (value[0] != null) ? "X" + value[0] + " D" + value[1] + " S" + value[2] + " MAX_DEMAG:" + value[3] + " " + value[4] + "ºC" : "---";
+                case 'DSHOT_STATUS_N_VOLTAGE':
+                    return (value[0] != null) ? "X" + value[0] + " D" + value[1] + " S" + value[2] + " MAX_DEMAG:" + value[3] + " " + value[4] + "V" : "---";
+                case 'DSHOT_STATUS_N_CURRENT':
+                    return (value[0] != null) ? "X" + value[0] + " D" + value[1] + " S" + value[2] + " MAX_DEMAG:" + value[3] + " " + value[4] + "A" : "---";
+                case 'DSHOT_STATUS_N_DEBUG1':
+                    return (value[0] != null) ? "X" + value[0] + " D" + value[1] + " S" + value[2] + " MAX_DEMAG:" + value[3] + " " + value[4] : "---";
+                case 'DSHOT_STATUS_N_DEBUG2':
+                    return (value[0] != null) ? "X" + value[0] + " D" + value[1] + " S" + value[2] + " MAX_DEMAG:" + value[3] + " " + value[4] : "---";
+                case 'DSHOT_STATUS_N_DEMAG_METRIC':
+                    return (value[0] != null) ? "X" + value[0] + " D" + value[1] + " S" + value[2] + " MAX_DEMAG:" + value[3] + " " + value[4] + "M" : "---";
+                case 'DSHOT_STATUS_N_ERPM_FRACTION_18':
+                    return (value[0] != null) ? "X" + value[0] + " D" + value[1] + " S" + value[2] + " MAX_DEMAG:" + value[3] + " " + (value[4] * 200 / flightLog.getSysConfig().motor_poles).toFixed() + "RPM" : "---";
+
             }
+
             return value.toFixed(0);
         }
         return "";

js/flightlog_parser.js

@@ -58,18 +58,23 @@ var FlightLogParser = function(logData) {
         //Predict that this field is minthrottle
         FLIGHT_LOG_FIELD_PREDICTOR_MINMOTOR       = 11,
 
+        //Predict that this field is dshot status and other data
+        FLIGHT_LOG_FIELD_PREDICTOR_DSHOT_STATUS_N_VOLTAGE           = 12,
+        FLIGHT_LOG_FIELD_PREDICTOR_DSHOT_STATUS_N_ERPM_FRACTION_18  = 13,
+
         //Home coord predictors appear in pairs (two copies of FLIGHT_LOG_FIELD_PREDICTOR_HOME_COORD). Rewrite the second
         //one we see to this to make parsing easier
         FLIGHT_LOG_FIELD_PREDICTOR_HOME_COORD_1   = 256,
 
-        FLIGHT_LOG_FIELD_ENCODING_SIGNED_VB       = 0, // Signed variable-byte
-        FLIGHT_LOG_FIELD_ENCODING_UNSIGNED_VB     = 1, // Unsigned variable-byte
-        FLIGHT_LOG_FIELD_ENCODING_NEG_14BIT       = 3, // Unsigned variable-byte but we negate the value before storing, value is 14 bits
-        FLIGHT_LOG_FIELD_ENCODING_TAG8_8SVB       = 6,
-        FLIGHT_LOG_FIELD_ENCODING_TAG2_3S32       = 7,
-        FLIGHT_LOG_FIELD_ENCODING_TAG8_4S16       = 8,
-        FLIGHT_LOG_FIELD_ENCODING_NULL            = 9, // Nothing is written to the file, take value to be zero
-        FLIGHT_LOG_FIELD_ENCODING_TAG2_3SVARIABLE = 10,
+        FLIGHT_LOG_FIELD_ENCODING_SIGNED_VB                 = 0, // Signed variable-byte
+        FLIGHT_LOG_FIELD_ENCODING_UNSIGNED_VB               = 1, // Unsigned variable-byte
+        FLIGHT_LOG_FIELD_ENCODING_NEG_14BIT                 = 3, // Unsigned variable-byte but we negate the value before storing, value is 14 bits
+        FLIGHT_LOG_FIELD_ENCODING_TAG8_8SVB                 = 6,
+        FLIGHT_LOG_FIELD_ENCODING_TAG2_3S32                 = 7,
+        FLIGHT_LOG_FIELD_ENCODING_TAG8_4S16                 = 8,
+        FLIGHT_LOG_FIELD_ENCODING_NULL                      = 9, // Nothing is written to the file, take value to be zero
+        FLIGHT_LOG_FIELD_ENCODING_TAG2_3SVARIABLE           = 10,
+        FLIGHT_LOG_FIELD_ENCODING_PACK_1F_1F_1F_1G_4U_8U    = 11, // 1 flagBit, 1 flagBit, 1 flagBit, 1 gapBit, 4 unsignedIntBit, 8 unsignedIntBit
 
         FLIGHT_LOG_EVENT_LOG_END = 255,
 
@@ -513,9 +518,9 @@ var FlightLogParser = function(logData) {
     function translateFieldName(fieldName) {
         var translation = translationValues[fieldName];
         if (typeof translation !== 'undefined') {
-        	return translation;
+            return translation;
         } else {
-        	return fieldName;
+            return fieldName;
         }
     }
 
@@ -585,14 +590,14 @@ var FlightLogParser = function(logData) {
                     case "Cleanflight":
                         that.sysConfig.firmwareType = FIRMWARE_TYPE_CLEANFLIGHT;
                         $('html').removeClass('isBaseF');
-    					$('html').addClass('isCF');
+                        $('html').addClass('isCF');
                         $('html').removeClass('isBF');
                         $('html').removeClass('isINAV');
                     break;
                     default:
                         that.sysConfig.firmwareType = FIRMWARE_TYPE_BASEFLIGHT;
                         $('html').addClass('isBaseF');
-    					$('html').removeClass('isCF');
+                        $('html').removeClass('isCF');
                         $('html').removeClass('isBF');
                         $('html').removeClass('isINAV');
                 }
@@ -919,7 +924,7 @@ var FlightLogParser = function(logData) {
                         $('html').addClass('isINAV');
                     } else {
 
-                    	// Cleanflight 1.x and others
+                        // Cleanflight 1.x and others
                         that.sysConfig.firmwareVersion = '0.0.0';
                         that.sysConfig.firmware        = 0.0;
                         that.sysConfig.firmwarePatch   = 0;
@@ -1080,6 +1085,40 @@ var FlightLogParser = function(logData) {
             % that.sysConfig.frameIntervalPDenom < that.sysConfig.frameIntervalPNum;
     }
 
+    /**
+     * Debug data interpretation depends on the chosen debug mode encodings and other parameters could need to be fixed  
+     */
+    function assimilateDebugMode(sysConfig, frameDef)
+    {
+        var k;
+        
+        console.log("Debug mode is " + DEBUG_MODE[sysConfig.debug_mode] + ":" + sysConfig.debug_mode);
+        
+        if (DEBUG_MODE[sysConfig.debug_mode].startsWith("DSHOT_STATUS_N_"))
+        {
+            for (k = 0; k < frameDef.name.length; k++)
+            {
+                if (frameDef.name[k].startsWith("debug")) {
+                    // Assimilate encoding depending on debug mode
+                    frameDef.encoding[k] = FLIGHT_LOG_FIELD_ENCODING_PACK_1F_1F_1F_1G_4U_8U;
+                    
+                    // Assimilate predictor depending on debug mode
+                    switch (DEBUG_MODE[sysConfig.debug_mode])
+                    {
+                    case "DSHOT_STATUS_N_VOLTAGE":
+                        frameDef.predictor[k] = FLIGHT_LOG_FIELD_PREDICTOR_DSHOT_STATUS_N_VOLTAGE;
+                        break;
+                    case "DSHOT_STATUS_N_ERPM_FRACTION_18":
+                        frameDef.predictor[k] = FLIGHT_LOG_FIELD_PREDICTOR_DSHOT_STATUS_N_ERPM_FRACTION_18;
+                        break;
+                    default:
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * Attempt to parse the frame of into the supplied `current` buffer using the encoding/predictor
      * definitions from `frameDefs`. The previous frame values are used for predictions.
@@ -1095,7 +1134,7 @@ var FlightLogParser = function(logData) {
             encoding = frameDef.encoding,
             values = new Array(8),
             i, j, groupCount;
-
+        
         i = 0;
         while (i < frameDef.count) {
             var
@@ -1164,6 +1203,19 @@ var FlightLogParser = function(logData) {
 
                         continue;
                     break;
+                    case FLIGHT_LOG_FIELD_ENCODING_PACK_1F_1F_1F_1G_4U_8U:
+                        value = stream.readSignedVB();
+
+                        current[i] = new Array(5);
+                        current[i][0] = ((value & 0x8000) != 0) ? 1 : 0;
+                        current[i][1] = ((value & 0x4000) != 0) ? 1 : 0;
+                        current[i][2] = ((value & 0x2000) != 0) ? 1 : 0;
+                        current[i][3] = (value >> 8) & 0x000F;
+                        current[i][4] = applyPrediction(i, raw ? FLIGHT_LOG_FIELD_PREDICTOR_0 : predictor[i], value & 0x00FF, current, previous, previous2);
+                        i++;
+
+                        continue;
+                    break;
                     case FLIGHT_LOG_FIELD_ENCODING_NULL:
                         //Nothing to read
                         value = 0;
@@ -1337,6 +1389,12 @@ var FlightLogParser = function(logData) {
                 if (mainHistory[1])
                     value += mainHistory[1][FlightLogParser.prototype.FLIGHT_LOG_FIELD_INDEX_TIME];
             break;
+            case FLIGHT_LOG_FIELD_PREDICTOR_DSHOT_STATUS_N_VOLTAGE:
+                value /= 4;
+            break;
+            case FLIGHT_LOG_FIELD_PREDICTOR_DSHOT_STATUS_N_ERPM_FRACTION_18:
+                value *= 18;
+            break;
             default:
                 throw "Unsupported field predictor " + predictor;
         }
@@ -1674,6 +1732,8 @@ var FlightLogParser = function(logData) {
         } else {
             lastSlow = [];
         }
+
+        assimilateDebugMode(that.sysConfig, this.frameDefs.I);
     };
 
     /**