From 83c1bda7d435d137fdaefbb65d85a67c4aa2ff2a Mon Sep 17 00:00:00 2001 From: ne0fhyk Date: Wed, 4 Mar 2015 17:57:58 -0800 Subject: [PATCH 1/2] Improved support for rover. --- .../src/org/droidplanner/core/drone/variables/GuidedPoint.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencyLibs/Core/src/org/droidplanner/core/drone/variables/GuidedPoint.java b/dependencyLibs/Core/src/org/droidplanner/core/drone/variables/GuidedPoint.java index 913cb6c39d..efc15dfc26 100644 --- a/dependencyLibs/Core/src/org/droidplanner/core/drone/variables/GuidedPoint.java +++ b/dependencyLibs/Core/src/org/droidplanner/core/drone/variables/GuidedPoint.java @@ -64,7 +64,7 @@ public static boolean isGuidedMode(Drone drone){ } if(Type.isRover(droneType)){ - return droneMode == ApmModes.ROVER_GUIDED; + return droneMode == ApmModes.ROVER_GUIDED || droneMode == ApmModes.ROVER_HOLD; } return false; From 3457eb81372cff40ac895f58fc0534136d593d5d Mon Sep 17 00:00:00 2001 From: ne0fhyk Date: Wed, 4 Mar 2015 19:07:22 -0800 Subject: [PATCH 2/2] null pointer exception bug fix. --- .../core/MAVLink/connection/MavLinkConnection.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencyLibs/Core/src/org/droidplanner/core/MAVLink/connection/MavLinkConnection.java b/dependencyLibs/Core/src/org/droidplanner/core/MAVLink/connection/MavLinkConnection.java index f6f5bc88cb..122527de2b 100644 --- a/dependencyLibs/Core/src/org/droidplanner/core/MAVLink/connection/MavLinkConnection.java +++ b/dependencyLibs/Core/src/org/droidplanner/core/MAVLink/connection/MavLinkConnection.java @@ -7,7 +7,6 @@ import org.droidplanner.core.util.Pair; import java.io.BufferedOutputStream; -import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.nio.ByteBuffer; @@ -229,7 +228,8 @@ public void run() { for (Pair entry : loggingOutStreams.values()) { final String loggingFilePath = entry.first; try { - entry.second.close(); + if (entry.second != null) + entry.second.close(); } catch (IOException e) { mLogger.logErr(TAG, "IO Exception while closing " + loggingFilePath, e); }