Add support for dataflash logging array instances

Author: Williangalvani

src/components/Plotly.vue

@@ -309,11 +309,10 @@ export default {
         },
 
         addPlots (plots) {
-            console.log(plots)
             this.state.plot_loading = true
             let requested = new Set()
-            const RE = /[A-Z][A-Z0-9_]+\.[a-zA-Z0-9]+/g
-            let RE2 = /[A-Z][A-Z0-9_]+\b/g
+            const RE = /[A-Z][A-Z0-9_]+(\[[0-9]\])\.[a-zA-Z0-9]+/g
+            let RE2 = /[A-Z][A-Z0-9_]+(\[[0-9]\])/g
             for (let plot of plots) {
                 let expression = plot[0]
                 // ensure we have the data
@@ -448,7 +447,7 @@ export default {
             // delete all expressions after dots (and dots)
             let toDelete = /\.[A-Za-z-0-9_]+/g
             let name = expression.replace(toDelete, '')
-            let RE = /[A-Z][A-Z0-9_]+/g
+            let RE = /[A-Z][A-Z0-9_]+(\[[0-9]\])?/g
             let fields = name.match(RE)
             return fields
         },

src/components/SideBarMessageMenu.vue

@@ -25,7 +25,7 @@
             <template v-for="key of Object.keys(this.messageTypesFiltered).sort()">
                 <li class="type" v-bind:key="key">
                     <div v-b-toggle="'type' + key">
-                        <a class="section">{{key}}
+                        <a class="section">{{key}} <span v-if="messageTypes[key].isArray">{{"[...]"}}</span>
                             <i class="expand fas fa-caret-down"></i></a>
                     </div>
                 </li>
@@ -217,7 +217,7 @@ export default {
             // delete all expressions after dots (and dots)
             let toDelete = /\.[A-Za-z-0-9_]+/g
             let name = expression.replace(toDelete, '')
-            let RE = /[A-Z][A-Z0-9_]+/g
+            let RE = /[A-Z][A-Z0-9_]+(\[0-9\])?/g
             let fields = name.match(RE)
             if (fields === null) {
                 return []

src/tools/parsers/dataflashParser.js

@@ -389,15 +389,70 @@ export class DataflashParser {
             }
         }
         delete this.messages[name]
+        console.log(parsed)
         this.messages[name] = parsed
-        this.fixDataOnce(name)
-        this.simplifyData(name)
+
         self.postMessage({percentage: 100})
-        self.postMessage({messageType: name, messageList: this.messages[name]})
+        if (parsed.length && Object.keys(parsed[0]).includes('C')) {
+            let instances = []
+            for (let msg of parsed) {
+                try {
+                    instances[msg.C].push(msg)
+                } catch (e) {
+                    instances[msg.C] = [ msg ]
+                }
+            }
+            let i = 0
+            for (let instance of instances) {
+                let newName = name + '[' + i + ']'
+                this.messages[newName] = instance
+                console.log(instance)
+                this.fixDataOnce(newName)
+                console.log(this.messages[newName])
+                this.simplifyData(newName)
+                self.postMessage({messageType: newName,
+                    messageList: this.messages[newName]})
+                console.log(this.messages[newName])
+                i += 1
+            }
+            console.log(instances)
+        } else {
+            this.fixDataOnce(name)
+            this.simplifyData(name)
+            self.postMessage({messageType: name, messageList: this.messages[name]})
+        }
         this.alreadyParsed.push(name)
         return parsed
     }
 
+    checkNumberOfInstances (name) {
+        // Similar to parseOffset, but finishes earlier and updates messageTypes
+        let type = this.getMsgType(name)
+        let numberOfInstances = 1
+        for (var i = 0; i < this.msgType.length; i++) {
+            if (type === this.msgType[i]) {
+                this.offset = this.offsetArray[i]
+                try {
+                    let temp = this.FORMAT_TO_STRUCT(this.FMT[this.msgType[i]])
+                    if (temp['name'] != null) {
+                        let msg = temp
+                        if (!msg.hasOwnProperty('C')) {
+                            break
+                        }
+                        if ((msg['C'] + 1) < numberOfInstances) {
+                            return numberOfInstances
+                        } else {
+                            numberOfInstances = msg['C'] + 1
+                        }
+                    }
+                } catch (e) {
+                    console.log(e)
+                }
+            }
+        }
+        return numberOfInstances
+    }
+
     timestamp (TimeUs) {
         let temp = this.timebase + TimeUs * 0.000001
         if (temp > 0) {
@@ -527,7 +582,9 @@ export class DataflashParser {
         if (['FMTU'].indexOf(name) === -1) {
             if (this.messageTypes.hasOwnProperty(name)) {
                 let fields = this.messageTypes[name].expressions
-                fields.push('time_boot_ms')
+                if (!fields.includes('time_boot_ms')) {
+                    fields.push('time_boot_ms')
+                }
                 let mergedData = {}
                 for (let field of fields) {
                     mergedData[field] = []
@@ -600,11 +657,23 @@ export class DataflashParser {
                             }
                         }
                     }
-                    messageTypes[msg.Name] = {
-                        expressions: fields,
-                        units: msg.units,
-                        multipiers: msg.multipliers,
-                        complexFields: complexFields
+                    let numberOfInstances = this.checkNumberOfInstances(msg.Name)
+                    if (numberOfInstances > 1) {
+                        for (let instance = 0; instance < numberOfInstances; instance++) {
+                            messageTypes[msg.Name + '[' + instance + ']'] = {
+                                expressions: fields,
+                                units: msg.units,
+                                multipiers: msg.multipliers,
+                                complexFields: complexFields
+                            }
+                        }
+                    } else {
+                        messageTypes[msg.Name] = {
+                            expressions: fields,
+                            units: msg.units,
+                            multipiers: msg.multipliers,
+                            complexFields: complexFields
+                        }
                     }
                 }
             }

src/tools/parsers/parser.worker.js

@@ -17,6 +17,6 @@ self.addEventListener('message', function (event) {
         let data = event.data.file
         parser.processData(data)
     } else if (event.data.action === 'loadType') {
-        parser.loadType(event.data.type)
+        parser.loadType(event.data.type.split('[')[0])
     }
 })