Skip to content

Conversation

squilter
Copy link
Member

This adds a new feature for AC3.3 which Randy explains at ArduPilot/ardupilot#2353. It sends a special command which disarms a vehicle immediately, even if it is still flying.

Don't merge yet. Still needs testing.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@squilter No need to add a corresponding method in the Drone class. Their uses are being deprecated (the deprecated javadocs should be in latest from develop).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are not using the emergencyDisarm value here.

@squilter squilter force-pushed the add_emergency_disarm branch from 076849f to 0197d5a Compare June 24, 2015 02:02
@squilter
Copy link
Member Author

once this is done, we can fix DroidPlanner/Tower#1494

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@squilter since the original method signature is still available, this change can be reverted.

@squilter squilter force-pushed the add_emergency_disarm branch from b443e33 to 5507d0d Compare June 24, 2015 17:04
@m4gr3d
Copy link
Member

m4gr3d commented Jun 25, 2015

@squilter looks good to merge. are you still doing tests?

@squilter
Copy link
Member Author

@ne0fhyk I can't figure out how to test anything. I can't figure out how to import the compiled aar into the Tower project, so I can't actually test this on a copter.

@m4gr3d
Copy link
Member

m4gr3d commented Jun 25, 2015

In the gradle build file for tower, there are a couple of dependencies that
use a 'aar' file (i.e: compile(name:'shimmer-android-release', ext:'aar')).

You can follow the same format to load the dronekit aar file. The file
itself should be in the libs directory, and the original dependency
statement should be commented to avoid conflict.

Fredia Huya-Kouadio
Android Tech Lead, 3D Robotics
fredia@3dr.com
On Jun 25, 2015 10:30 AM, "squilter" notifications@github.com wrote:

@ne0fhyk https://github.com/ne0fhyk I can't figure out how to test
anything. I can't figure out how to import the compiled aar into the Tower
project, so I can't actually test this on a copter.


Reply to this email directly or view it on GitHub
#172 (comment)
.

@squilter
Copy link
Member Author

Got it. Yes, it works.

@m4gr3d
Copy link
Member

m4gr3d commented Jun 25, 2015

Great, merging!

m4gr3d added a commit that referenced this pull request Jun 25, 2015
add magic number for emergency disarm
@m4gr3d m4gr3d merged commit 522290c into dronekit:develop Jun 25, 2015
@squilter squilter deleted the add_emergency_disarm branch July 7, 2015 18:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants