mavlink: Allow user to decide on creating data-lake variables for non-main components

Author: rafaellehmkuhl

src/libs/vehicle/mavlink/vehicle.ts

@@ -94,6 +94,8 @@ export abstract class MAVLinkVehicle<Modes> extends Vehicle.AbstractVehicle<Mode
   onOutgoingMAVLinkMessage = new SignalTyped()
   _flying = false
 
+  shouldCreateDatalakeVariablesFromOtherSystems = false
+
   protected currentSystemId = 1
 
   /**
@@ -313,15 +315,20 @@ export abstract class MAVLinkVehicle<Modes> extends Vehicle.AbstractVehicle<Mode
       return
     }
 
-    // Inject variables from the MAVLink messages into the DataLake
-    this.addPackageVariablesToDataLake(mavlink_message)
-
     const { system_id, component_id } = mavlink_message.header
 
     if (system_id !== this.currentSystemId || component_id !== 1) {
+      // For non-main systems, only inject variables from the MAVLink messages into the DataLake if the user wants to
+      if (this.shouldCreateDatalakeVariablesFromOtherSystems) {
+        this.addPackageVariablesToDataLake(mavlink_message)
+      }
+
       return
     }
 
+    // For the main vehicle, always inject variables from the MAVLink messages into the DataLake
+    this.addPackageVariablesToDataLake(mavlink_message)
+
     // Update our internal messages
     this._messages.set(mavlink_message.message.type, { ...mavlink_message.message, epoch: new Date().getTime() })
 

src/stores/mainVehicle.ts

@@ -161,6 +161,12 @@ export const useMainVehicleStore = defineStore('main-vehicle', () => {
     defaultMessageIntervalsOptions
   )
 
+  // Store setting to enable/disable creation of datalake variables from other MAVLink systems
+  const enableDatalakeVariablesFromOtherSystems = useBlueOsStorage(
+    'cockpit-enable-datalake-variables-from-other-systems',
+    false
+  )
+
   const MAVLink2RestWebsocketURI = computed(() => {
     const queryURI = new URLSearchParams(window.location.search).get('MAVLink2RestWebsocketURI')
     const customURI = customMAVLink2RestWebsocketURI.value.enabled
@@ -193,6 +199,11 @@ export const useMainVehicleStore = defineStore('main-vehicle', () => {
     currentlyConnectedVehicleId.value = undefined
   })
 
+  watch(enableDatalakeVariablesFromOtherSystems, (newValue) => {
+    if (!mainVehicle.value) return
+    mainVehicle.value.shouldCreateDatalakeVariablesFromOtherSystems = newValue
+  })
+
   watch(
     globalAddress,
     (newAddress) => {
@@ -497,6 +508,9 @@ export const useMainVehicleStore = defineStore('main-vehicle', () => {
     icon.value = mainVehicle.value.icon()
     configurationPages.value = mainVehicle.value.configurationPages()
 
+    // Set callback to check if datalake variables from other systems should be created
+    mainVehicle.value.shouldCreateDatalakeVariablesFromOtherSystems = enableDatalakeVariablesFromOtherSystems.value
+
     mainVehicle.value.onAltitude.add((newAltitude: Altitude) => {
       Object.assign(altitude, newAltitude)
     })
@@ -932,5 +946,6 @@ export const useMainVehicleStore = defineStore('main-vehicle', () => {
     setHomeWaypoint,
     vehiclePayloadParameters,
     vehiclePositionMaxSampleRate,
+    enableDatalakeVariablesFromOtherSystems,
   }
 })

src/views/ConfigurationMAVLinkView.vue

@@ -2,8 +2,29 @@
   <BaseConfigurationView>
     <template #title>MAVLink configuration</template>
     <template #content>
-      <div class="max-h-[85vh] w-[710px] overflow-y-auto">
-        <ExpansiblePanel no-top-divider no-bottom-divider :is-expanded="!interfaceStore.isOnPhoneScreen">
+      <div class="max-h-[80vh] w-[710px] overflow-y-auto">
+        <ExpansiblePanel no-top-divider :is-expanded="!interfaceStore.isOnPhoneScreen">
+          <template #title>DataLake variables creation</template>
+          <template #info>
+            <p class="max-w-[500px]">
+              Enable the creation of DataLake variables from MAVLink messages originating from systems/components other
+              than the main vehicle (System ID {{ mainVehicleStore.mainVehicle?.systemId }}, Component ID 1). When
+              enabled, variables from all MAVLink systems on the network will be available in the DataLake. When
+              disabled, only variables from the main vehicle will be created.
+            </p>
+          </template>
+          <template #content>
+            <div class="flex w-full px-2 mb-3">
+              <v-switch
+                v-model="mainVehicleStore.enableDatalakeVariablesFromOtherSystems"
+                color="white"
+                label="Enable DataLake variables from other systems"
+                hide-details
+              />
+            </div>
+          </template>
+        </ExpansiblePanel>
+        <ExpansiblePanel no-bottom-divider :is-expanded="!interfaceStore.isOnPhoneScreen">
           <template #title>Message intervals</template>
           <template #info>
             <p class="max-w-[500px]">