vehicle: mavlink: only create legacy variables for the main autopilot

Other systems and components were not supported in this style previously, and doing so without the system and component prefix for disambiguation means the values would overwrite from any connected systems and components (which, from past experience, is quite confusing).

Author: ES-Alexander

src/libs/vehicle/mavlink/vehicle.ts

@@ -1463,27 +1463,32 @@ export abstract class MAVLinkVehicle<Modes> extends Vehicle.AbstractVehicle<Mode
       }
       setDataLakeVariableData(path, mavlinkPackage.message.value)
 
-      // Create duplicated variables for legacy purposes (that was how they were stored in the old generic-variables system)
-      const oldVariablePath = mavlinkPackage.message.name.join('').replaceAll('\x00', '')
-      if (getDataLakeVariableInfo(oldVariablePath) === undefined) {
-        createDataLakeVariable({ id: oldVariablePath, name: `(Legacy) ${oldVariablePath}`, type: 'number' })
+      if (messageSystemId !== this.currentSystemId || messageComponentId !== 1) {
+        // Create duplicated variables for legacy purposes (that was how they were stored in the old generic-variables system)
+        const oldVariablePath = mavlinkPackage.message.name.join('').replaceAll('\x00', '')
+        if (getDataLakeVariableInfo(oldVariablePath) === undefined) {
+          createDataLakeVariable({ id: oldVariablePath, name: `(Legacy) ${oldVariablePath}`, type: 'number' })
+        }
+        setDataLakeVariableData(oldVariablePath, mavlinkPackage.message.value)
       }
-      setDataLakeVariableData(oldVariablePath, mavlinkPackage.message.value)
     } else {
       // For all other messages, use the flattener
       const flattened = flattenData(mavlinkPackage.message)
       flattened.forEach(({ path, value }) => {
         if (value === null) return
         if (typeof value !== 'string' && typeof value !== 'number') return
 
-        // Create the variable in the old style path for legacy purposes (that was how they were stored in the old generic-variables system)
-        const oldStylePath = `${path}`
-        if (getDataLakeVariableInfo(oldStylePath) === undefined) {
-          createDataLakeVariable({
-            id: oldStylePath,
-            name: `(Legacy) ${path}`,
-            type: typeof value === 'string' ? 'string' : 'number',
-          })
+        if (messageSystemId !== this.currentSystemId || messageComponentId !== 1) {
+          // Create the variable in the old style path for legacy purposes (that was how they were stored in the old generic-variables system)
+          const oldStylePath = `${path}`
+          if (getDataLakeVariableInfo(oldStylePath) === undefined) {
+            createDataLakeVariable({
+              id: oldStylePath,
+              name: `(Legacy) ${path}`,
+              type: typeof value === 'string' ? 'string' : 'number',
+            })
+          }
+          setDataLakeVariableData(oldStylePath, value)
         }
 
         // Create the variable in the new style path
@@ -1495,9 +1500,6 @@ export abstract class MAVLinkVehicle<Modes> extends Vehicle.AbstractVehicle<Mode
             type: typeof value === 'string' ? 'string' : 'number',
           })
         }
-
-        // Set the value in the variables in both styles (legacy and new)
-        setDataLakeVariableData(oldStylePath, value)
         setDataLakeVariableData(newStylePath, value)
       })
     }