dont return on non 1 vid

goasChris · Feb 6, 2024 · dc373e3 · dc373e3
1 parent 170f444
commit dc373e3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/src/libs/vehicle/ardupilot/ardupilot.ts b/src/libs/vehicle/ardupilot/ardupilot.ts
@@ -180,7 +180,7 @@ export abstract class ArduPilotVehicle<Modes> extends Vehicle.AbstractVehicle<Mo
 
     const { system_id, component_id } = mavlink_message.header
 
-    if (system_id != 1 || component_id != 1) {
+    if (component_id != 1) {
       return
     }
 

diff --git a/src/libs/vehicle/ardupilot/ardurover.ts b/src/libs/vehicle/ardupilot/ardurover.ts
@@ -70,7 +70,7 @@ export class ArduRover extends ArduPilotVehicle<CustomMode> {
    */
   onMAVLinkPackage(mavlink: Package): void {
     const { system_id, component_id } = mavlink.header
-    if (system_id != 1 || component_id !== 1) {
+    if (component_id !== 1) {
       return
     }
 

diff --git a/src/libs/vehicle/vehicle-factory.ts b/src/libs/vehicle/vehicle-factory.ts
@@ -102,6 +102,7 @@ function createVehicleFromMessage(message: Uint8Array): void {
   if (heartbeat.autopilot.type !== MavAutopilot.MAV_AUTOPILOT_ARDUPILOTMEGA) {
     console.warn(`Vehicle not supported: ${system_id}/${component_id}: ${heartbeat.autopilot.type}`)
   }
+  console.info("vid: ", system_id)
 
   switch (heartbeat.mavtype.type) {
     case MavType.MAV_TYPE_SUBMARINE:

diff --git a/src/stores/mainVehicle.ts b/src/stores/mainVehicle.ts
@@ -332,7 +332,7 @@ export const useMainVehicleStore = defineStore('main-vehicle', () => {
       Object.assign(genericVariables, newGenericVariablesState)
     })
     mainVehicle.value.onMAVLinkMessage.add(MAVLinkType.HEARTBEAT, (pack: Package) => {
-      if (pack.header.system_id != 1 || pack.header.component_id != 1) {
+      if (pack.header.component_id != 1) {
         return
       }
-Original file line number
+Diff line change
@@ Expand Up @@
         const { system_id, component_id } = mavlink_message.header
-        if (system_id != 1 || component_id != 1) {
+        if (component_id != 1) {
           return
         }
@@ Expand Down @@