deal with JsDataflashParser updates

ArduPilot · Jan 29, 2024 · 279034e · 279034e
1 parent 424be8a
commit 279034e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/components/Home.vue b/src/components/Home.vue
@@ -163,9 +163,16 @@ export default {
                 }
             }
             try {
-                this.state.metadata = { startTime: this.dataExtractor.extractStartTime(this.state.messages.GPS) }
-            } catch {
+                if (this.state.messages?.GPS?.time_boot_ms) {
+                    this.state.metadata = { startTime: this.dataExtractor.extractStartTime(this.state.messages.GPS) }
+                } else {
+                    this.state.metadata = {
+                        startTime: this.dataExtractor.extractStartTime(this.state.messages['GPS[0]'])
+                    }
+                }
+            } catch (error) {
                 console.log('unable to load metadata')
+                console.log(error)
             }
             Vue.delete(this.state.messages, 'AHR2')
             Vue.delete(this.state.messages, 'POS')

diff --git a/src/components/SideBarMessageMenu.vue b/src/components/SideBarMessageMenu.vue
@@ -183,11 +183,17 @@ export default {
             const newMessages = {}
             // populate list of message types
             for (const messageType of Object.keys(messageTypes)) {
+                if (messageTypes[messageType].instances !== undefined) {
+                    continue
+                }
                 this.$set(this.checkboxes, messageType, messageTypes[messageType].expressions.expressions)
                 newMessages[messageType] = messageTypes[messageType]
             }
             // populate checkbox status
             for (const messageType of Object.keys(messageTypes)) {
+                if (messageTypes[messageType].instances !== undefined) {
+                    continue
+                }
                 this.checkboxes[messageType] = { expressions: {} }
                 // for (let field of this.getMessageNumericField(this.state.messages[messageType][0])) {
                 for (const field of messageTypes[messageType].expressions) {