Skip to content

Commit 0197d5a

Browse files
committed
overload original method to avoid breaking old apps
1 parent 891e896 commit 0197d5a

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

ClientLib/src/main/java/com/o3dr/android/client/apis/drone/DroneStateApi.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,20 @@ public class DroneStateApi {
2222
*
2323
* @param arm true to arm, false to disarm.
2424
*/
25+
public static void arm(Drone drone, boolean arm) {
26+
Bundle params = new Bundle();
27+
params.putBoolean(EXTRA_ARM, arm);
28+
params.putBoolean(EXTRA_EMERGENCY_DISARM, false);
29+
drone.performAsyncAction(new Action(ACTION_ARM, params));
30+
}
31+
32+
/**
33+
* Arm or disarm the connected drone.
34+
*
35+
* @param arm true to arm, false to disarm.
36+
* @param emergencyDisarm true to skip landing check and disarm immediately,
37+
* false to disarm only if it is safe to do so.
38+
*/
2539
public static void arm(Drone drone, boolean arm, boolean emergencyDisarm) {
2640
Bundle params = new Bundle();
2741
params.putBoolean(EXTRA_ARM, arm);

ServiceApp/src/org/droidplanner/services/android/api/DroneApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ public void performAction(Action action) throws RemoteException {
400400
//DRONE STATE ACTIONS
401401
case StateActions.ACTION_ARM:
402402
boolean doArm = data.getBoolean(StateActions.EXTRA_ARM);
403-
DroneApiUtils.arm(getDrone(), doArm, false);
403+
DroneApiUtils.arm(getDrone(), doArm);
404404
break;
405405

406406
case StateActions.ACTION_SET_VEHICLE_MODE:

0 commit comments

Comments
 (0)