Bring back kill switch #1511
Merged
Bring back kill switch #1511
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
closes #1433 |
|
Ready for merge. It should work fine for ArduPlane, but I don't have one to test with. |
| @@ -13,7 +13,7 @@ dependencies { | |||
| compile 'com.android.support:cardview-v7:22.1.0' | |||
| compile 'com.android.support:recyclerview-v7:22.1.0' | |||
|
|
|||
| compile 'com.o3dr.android:dronekit-android:2.3.32' | |||
| compile 'com.o3dr.android:dronekit-android:2.3.33' | |||
There was a problem hiding this comment.
upgrade to version 2.3.34. Version 2.3.33 has a bug that the newer version fixes.
| DroneStateApi.setVehicleMode(drone, VehicleMode.COPTER_STABILIZE); | ||
| } | ||
| } | ||
| DroneStateApi.arm(drone, false, true); |
There was a problem hiding this comment.
@squilter the version check logic can be removed. It's handled by 3DR Services in https://github.com/DroidPlanner/DroneKit-Android/blob/371cfd568046fc772726f9af3b2baf3e9e1dd866/ServiceApp/src/org/droidplanner/services/android/api/DroneApiUtils.java#L682-L748
There was a problem hiding this comment.
That logic is now up in the develop branch for 3DR Services.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Do not merge yet. I need to test with once more tomorrow.
Also, does APM:Plane support the emergency disarm command?