fix:FATAL flight mode unknown

HefnySco · Nov 13, 2022 · 3c968ae · 3c968ae
1 parent 96a25c3
commit 3c968ae
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -20,9 +20,9 @@ android {
         applicationId 'arudpilot.andruav'
         minSdkVersion android_build_min_sdk_version
         targetSdkVersion android_build_target_sdk_version
-        versionName '5.04.12'
+        versionName '5.04.13'
         signingConfig signingConfigs.config
-        versionCode 50412
+        versionCode 50413
         multiDexEnabled true
 
         //testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/app/src/main/java/ap/andruav_ap/communication/controlBoard/ControlBoard_DroneKit.java b/app/src/main/java/ap/andruav_ap/communication/controlBoard/ControlBoard_DroneKit.java
@@ -748,7 +748,7 @@ public void onDroneEvent_HeartBeat (final int sysid, final short type, final int
         mAndruavUnitBase.setVehicleType(MavLink_Helpers.setCommonVehicleType (type));
         canFly = MavLink_Helpers.isCanFly (type);
 
-        isArmed = ((base_mode & MAV_MODE_FLAG.MAV_MODE_FLAG_SAFETY_ARMED) == MAV_MODE_FLAG.MAV_MODE_FLAG_SAFETY_ARMED) || (App.droneKitServer.getAPM_VehicleType() == VehicleTypes.VEHICLE_ROVER);
+        isArmed = ((base_mode & MAV_MODE_FLAG.MAV_MODE_FLAG_SAFETY_ARMED) == MAV_MODE_FLAG.MAV_MODE_FLAG_SAFETY_ARMED) || (mAndruavUnitBase.getVehicleType() == VehicleTypes.VEHICLE_ROVER);
         this.mAndruavUnitBase.IsArmed(isArmed);
 
         final int vehicle_type = AndruavSettings.andruavWe7daBase.getVehicleType();
@@ -1149,15 +1149,15 @@ public void onDroneEvent_MissionItemReached (final int  missionItemIndex)
     public void onDroneEvent_VehicleMode (final VehicleMode vehicleMode)
     {
 
-        mAndruavUnitBase.setFlightModeFromBoard (MavLink_Helpers.getAndruavStandardFlightMode(App.droneKitServer.getAPM_VehicleType(), (short) vehicleMode.getMode()));
+        mAndruavUnitBase.setFlightModeFromBoard (MavLink_Helpers.getAndruavStandardFlightMode(mType, (short) vehicleMode.getMode()));
 
         mAndruavUnitBase.setManualTXBlockedSubAction(adjustRCActionByMode (mAndruavUnitBase.getManualTXBlockedSubAction(), mAndruavUnitBase.getFlightModeFromBoard()));
     }
 
 
     public void onDroneEvent_StateArming (final State vehicleState)
     {
-        isArmed = vehicleState.isArmed() || (App.droneKitServer.getAPM_VehicleType() == VehicleTypes.VEHICLE_ROVER);
+        isArmed = vehicleState.isArmed() || (mType == VehicleTypes.VEHICLE_ROVER);
         this.mAndruavUnitBase.IsArmed(isArmed);
     }
 

diff --git a/app/src/main/java/ap/andruav_ap/communication/telemetry/DroneKit/DroneKitServer.java b/app/src/main/java/ap/andruav_ap/communication/telemetry/DroneKit/DroneKitServer.java
@@ -161,12 +161,6 @@ public int getCompID ()
     final MAVLinkPacket  msg_command_ack = new msg_command_ack().pack();
     //////////BUS EVENT
 
-
-    public int getAPM_VehicleType()
-    {
-        return APM_VehicleType;
-    }
-
     @Override
     public void onSocketData(final Event_SocketData event)
     {