moved drone stream rates parameters to the CommonMavLinkDrone class.

Author: m4gr3d

ServiceApp/src/org/droidplanner/services/android/core/drone/autopilot/apm/ArduPilot.java

@@ -57,7 +57,7 @@
 import org.droidplanner.services.android.core.drone.DroneInterfaces;
 import org.droidplanner.services.android.core.drone.LogMessageListener;
 import org.droidplanner.services.android.core.drone.Preferences;
-import org.droidplanner.services.android.core.drone.autopilot.CommonMavLinkDrone;
+import org.droidplanner.services.android.core.drone.autopilot.generic.CommonMavLinkDrone;
 import org.droidplanner.services.android.core.drone.profiles.Parameters;
 import org.droidplanner.services.android.core.drone.profiles.VehicleProfile;
 import org.droidplanner.services.android.core.drone.variables.ApmModes;
@@ -69,7 +69,6 @@
 import org.droidplanner.services.android.core.drone.variables.Magnetometer;
 import org.droidplanner.services.android.core.drone.variables.MissionStats;
 import org.droidplanner.services.android.core.drone.variables.RC;
-import org.droidplanner.services.android.core.drone.variables.StreamRates;
 import org.droidplanner.services.android.core.drone.variables.calibration.AccelCalibration;
 import org.droidplanner.services.android.core.drone.variables.calibration.MagnetometerCalibrationImpl;
 import org.droidplanner.services.android.core.helpers.coordinates.Coord3D;
@@ -94,7 +93,6 @@ public abstract class ArduPilot extends CommonMavLinkDrone {
     private final Home home;
     private final Mission mission;
     private final MissionStats missionStats;
-    private final StreamRates streamRates;
     private final GuidedPoint guidedPoint;
     private final AccelCalibration accelCalibrationSetup;
     private final WaypointManager waypointManager;
@@ -129,7 +127,6 @@ public ArduPilot(Context context, MAVLinkStreams.MAVLinkOutputStream mavClient,
         this.home = new Home(this);
         this.mission = new Mission(this);
         this.missionStats = new MissionStats(this);
-        this.streamRates = new StreamRates(this);
         this.guidedPoint = new GuidedPoint(this, handler);
         this.accelCalibrationSetup = new AccelCalibration(this, handler);
         this.magCalibration = new MagnetometerCalibrationImpl(this);
@@ -235,11 +232,6 @@ public MissionStats getMissionStats() {
         return missionStats;
     }
 
-    @Override
-    public StreamRates getStreamRates() {
-        return streamRates;
-    }
-
     @Override
     public GuidedPoint getGuidedPoint() {
         return guidedPoint;

ServiceApp/src/org/droidplanner/services/android/core/drone/autopilot/CommonMavLinkDrone.java renamed to ServiceApp/src/org/droidplanner/services/android/core/drone/autopilot/generic/CommonMavLinkDrone.java

@@ -1,4 +1,4 @@
-package org.droidplanner.services.android.core.drone.autopilot;
+package org.droidplanner.services.android.core.drone.autopilot.generic;
 
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -31,7 +31,9 @@
 import org.droidplanner.services.android.core.MAVLink.command.doCmd.MavLinkDoCmds;
 import org.droidplanner.services.android.core.drone.DroneEvents;
 import org.droidplanner.services.android.core.drone.DroneInterfaces;
+import org.droidplanner.services.android.core.drone.autopilot.MavLinkDrone;
 import org.droidplanner.services.android.core.drone.variables.State;
+import org.droidplanner.services.android.core.drone.variables.StreamRates;
 import org.droidplanner.services.android.core.drone.variables.Type;
 import org.droidplanner.services.android.core.model.AutopilotWarningParser;
 import org.droidplanner.services.android.utils.CommonApiUtils;
@@ -49,6 +51,7 @@ public abstract class CommonMavLinkDrone implements MavLinkDrone {
     private final DroneEvents events;
     protected final Type type;
     private final State state;
+    private final StreamRates streamRates;
 
     private final DroneInterfaces.AttributeEventListener attributeListener;
 
@@ -64,6 +67,7 @@ protected CommonMavLinkDrone(DroneInterfaces.Handler handler, MAVLinkStreams.MAV
 
         events = new DroneEvents(this, handler);
         this.type = new Type(this);
+        this.streamRates = new StreamRates(this);
         this.state = new State(this, handler, warningParser);
 
         this.attributeListener = listener;
@@ -84,6 +88,11 @@ public void addDroneListener(DroneInterfaces.OnDroneListener listener) {
         events.addDroneListener(listener);
     }
 
+    @Override
+    public StreamRates getStreamRates() {
+        return streamRates;
+    }
+
     @Override
     public void removeDroneListener(DroneInterfaces.OnDroneListener listener) {
         events.removeDroneListener(listener);

ServiceApp/src/org/droidplanner/services/android/core/drone/autopilot/px4/Px4Native.java

@@ -1,13 +1,10 @@
 package org.droidplanner.services.android.core.drone.autopilot.px4;
 
-import com.o3dr.services.android.lib.model.ICommandListener;
-import com.o3dr.services.android.lib.model.action.Action;
-
 import org.droidplanner.services.android.core.MAVLink.MAVLinkStreams;
 import org.droidplanner.services.android.core.MAVLink.WaypointManager;
 import org.droidplanner.services.android.core.drone.DroneInterfaces;
 import org.droidplanner.services.android.core.drone.Preferences;
-import org.droidplanner.services.android.core.drone.autopilot.CommonMavLinkDrone;
+import org.droidplanner.services.android.core.drone.autopilot.generic.CommonMavLinkDrone;
 import org.droidplanner.services.android.core.drone.profiles.Parameters;
 import org.droidplanner.services.android.core.drone.profiles.VehicleProfile;
 import org.droidplanner.services.android.core.drone.variables.Camera;
@@ -16,7 +13,6 @@
 import org.droidplanner.services.android.core.drone.variables.Home;
 import org.droidplanner.services.android.core.drone.variables.Magnetometer;
 import org.droidplanner.services.android.core.drone.variables.MissionStats;
-import org.droidplanner.services.android.core.drone.variables.StreamRates;
 import org.droidplanner.services.android.core.drone.variables.calibration.AccelCalibration;
 import org.droidplanner.services.android.core.drone.variables.calibration.MagnetometerCalibrationImpl;
 import org.droidplanner.services.android.core.firmware.FirmwareType;
@@ -97,11 +93,6 @@ public Mission getMission() {
         return null;
     }
 
-    @Override
-    public StreamRates getStreamRates() {
-        return null;
-    }
-
     @Override
     public MissionStats getMissionStats() {
         return null;