Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature sololink integration #216

Merged
merged 55 commits into from
Jul 29, 2015
Merged

Feature sololink integration #216

merged 55 commits into from
Jul 29, 2015

Conversation

m4gr3d
Copy link
Member

@m4gr3d m4gr3d commented Jul 29, 2015

Add support for the SoloLink api.

m4gr3d and others added 30 commits July 9, 2015 16:12
Added sololink `actions` to support the `SoloLinkApi` implementation.
Made the `TLVPacket` parcelable to support sending over aidl.
Moved the `tlv` package to the client library.
Completed implementation of the `SoloLinkState` class.
Made `Actions` classes uninstantiable.
…age dispatch functionality to the SoloLink api.
bumped client library versions.
updated the sample app ui.
bug fixes.
….com:DroidPlanner/DroneKit-Android into feature_sololink_integration

Conflicts:
	ClientLib/libs/Mavlink.jar
…ss calibration, and sololink video streaming.
….com:DroidPlanner/DroneKit-Android into feature_sololink_integration

Conflicts:
	ClientLib/build.gradle
	ClientLib/src/main/res/values/version.xml
….com:DroidPlanner/DroneKit-Android into feature_sololink_integration
….com:DroidPlanner/DroneKit-Android into feature_sololink_integration

Conflicts:
	ClientLib/build.gradle
….com:DroidPlanner/DroneKit-Android into feature_sololink_integration
Expose do jump and mission item reverse lookup
Add current mission item to broadcast
m4gr3d and others added 25 commits July 23, 2015 08:35
….com:DroidPlanner/DroneKit-Android into feature_sololink_integration
….com:DroidPlanner/DroneKit-Android into feature_sololink_integration

Conflicts:
	ClientLib/build.gradle
…d (see diydrones/ardupilot) and added current mission item to current waypoint dispatch because waypoint reach is only supported by newest version of ardupoilot
client library version bump.
- Removed `CameraApi`: replaced by the `SoloLinkApi`.
- Removed the `GOPRO` drone attribute: it will be replaced by a video state field within the `SoloLinkState` attribute.
…to obsolete_api_cleanup

Conflicts:
	ClientLib/src/main/java/com/o3dr/services/android/lib/drone/camera/GoPro.java
	ServiceApp/src/org/droidplanner/core/MAVLink/MavLinkMsgHandler.java
	ServiceApp/src/org/droidplanner/core/drone/DroneImpl.java
	ServiceApp/src/org/droidplanner/core/model/Drone.java
	ServiceApp/src/org/droidplanner/services/android/api/DroneApi.java
	ServiceApp/src/org/droidplanner/services/android/core/drone/DroneManager.java
	ServiceApp/src/org/droidplanner/services/android/core/drone/camera/GoProImpl.java
	ServiceApp/src/org/droidplanner/services/android/utils/CommonApiUtils.java
…to obsolete_api_cleanup

Conflicts:
	ClientLib/src/main/java/com/o3dr/services/android/lib/drone/camera/GoPro.java
	ServiceApp/src/org/droidplanner/core/MAVLink/MavLinkMsgHandler.java
	ServiceApp/src/org/droidplanner/core/drone/DroneImpl.java
	ServiceApp/src/org/droidplanner/core/model/Drone.java
	ServiceApp/src/org/droidplanner/services/android/api/DroneApi.java
	ServiceApp/src/org/droidplanner/services/android/core/drone/DroneManager.java
	ServiceApp/src/org/droidplanner/services/android/core/drone/camera/GoProImpl.java
	ServiceApp/src/org/droidplanner/services/android/utils/CommonApiUtils.java
added `ArduSolo` overloaded `getAttribute(...)` method.
… github.com:DroidPlanner/DroneKit-Android into expose_do_jump

Conflicts:
	ClientLib/build.gradle
	ServiceApp/src/org/droidplanner/services/android/api/DroneApi.java
	ServiceApp/src/org/droidplanner/services/android/core/MAVLink/command/doCmd/MavLinkDoCmds.java
	ServiceApp/src/org/droidplanner/services/android/core/mission/Mission.java
	ServiceApp/src/org/droidplanner/services/android/utils/CommonApiUtils.java
… github.com:DroidPlanner/DroneKit-Android into expose_do_jump

Conflicts:
	ClientLib/build.gradle
	ServiceApp/src/org/droidplanner/services/android/api/DroneApi.java
	ServiceApp/src/org/droidplanner/services/android/core/MAVLink/command/doCmd/MavLinkDoCmds.java
	ServiceApp/src/org/droidplanner/services/android/core/mission/Mission.java
	ServiceApp/src/org/droidplanner/services/android/utils/CommonApiUtils.java
added gopro state updated event.
added support for retrieving the `SOLOLINK_GOPRO_STATE` attribute.
m4gr3d added a commit that referenced this pull request Jul 29, 2015
@m4gr3d m4gr3d merged commit 8a59837 into develop Jul 29, 2015
@m4gr3d m4gr3d deleted the feature_sololink_integration branch July 29, 2015 08:43
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