From 70a64dea581a1926b7a101c7bbaafd842c2e3527 Mon Sep 17 00:00:00 2001 From: ne0fhyk Date: Mon, 9 Feb 2015 11:08:23 -0800 Subject: [PATCH] Reorder mission items list. Fixed state update logic for the GuidedPoint. --- .../lib/drone/mission/MissionItemType.java | 92 +++++++++--------- ClientLib/mobile/libs/AidlLib.jar | Bin 472904 -> 472985 bytes ServiceApp/build.gradle | 2 +- .../core/drone/variables/GuidedPoint.java | 1 + 4 files changed, 48 insertions(+), 47 deletions(-) diff --git a/AidlLib/src/com/o3dr/services/android/lib/drone/mission/MissionItemType.java b/AidlLib/src/com/o3dr/services/android/lib/drone/mission/MissionItemType.java index 3add7196e5..505aea7efb 100644 --- a/AidlLib/src/com/o3dr/services/android/lib/drone/mission/MissionItemType.java +++ b/AidlLib/src/com/o3dr/services/android/lib/drone/mission/MissionItemType.java @@ -51,15 +51,27 @@ protected Parcelable.Creator getMissionItemCreator() { } }, - TAKEOFF("Takeoff") { + CIRCLE("Circle") { @Override public MissionItem getNewItem() { - return new Takeoff(); + return new Circle(); } @Override - protected Parcelable.Creator getMissionItemCreator() { - return Takeoff.CREATOR; + protected Creator getMissionItemCreator() { + return Circle.CREATOR; + } + }, + + REGION_OF_INTEREST("Region of Interest") { + @Override + public MissionItem getNewItem() { + return new RegionOfInterest(); + } + + @Override + protected Creator getMissionItemCreator() { + return RegionOfInterest.CREATOR; } }, @@ -75,29 +87,28 @@ protected Parcelable.Creator getMissionItemCreator(){ } }, - CAMERA_TRIGGER("Camera Trigger") { + TAKEOFF("Takeoff") { @Override public MissionItem getNewItem() { - return new CameraTrigger(); + return new Takeoff(); } @Override - protected Creator getMissionItemCreator() { - return CameraTrigger.CREATOR; + protected Parcelable.Creator getMissionItemCreator() { + return Takeoff.CREATOR; } }, - EPM_GRIPPER("EPM Gripper") { + LAND("Land") { @Override public MissionItem getNewItem() { - return new EpmGripper(); + return new Land(); } @Override - protected Creator getMissionItemCreator() { - return EpmGripper.CREATOR; + protected Creator getMissionItemCreator() { + return Land.CREATOR; } - }, RETURN_TO_LAUNCH("Return to Launch") { @@ -112,63 +123,64 @@ protected Creator getMissionItemCreator() { } }, - LAND("Land") { + SURVEY("Survey") { @Override public MissionItem getNewItem() { - return new Land(); + return new Survey(); } @Override - protected Creator getMissionItemCreator() { - return Land.CREATOR; + protected Creator getMissionItemCreator() { + return Survey.CREATOR; } }, - CIRCLE("Circle") { + STRUCTURE_SCANNER("Structure Scanner") { @Override public MissionItem getNewItem() { - return new Circle(); + return new StructureScanner(); } @Override - protected Creator getMissionItemCreator() { - return Circle.CREATOR; + protected Creator getMissionItemCreator() { + return StructureScanner.CREATOR; } }, - REGION_OF_INTEREST("Region of Interest") { + CAMERA_TRIGGER("Camera Trigger") { @Override public MissionItem getNewItem() { - return new RegionOfInterest(); + return new CameraTrigger(); } @Override - protected Creator getMissionItemCreator() { - return RegionOfInterest.CREATOR; + protected Creator getMissionItemCreator() { + return CameraTrigger.CREATOR; } }, - SURVEY("Survey") { + EPM_GRIPPER("EPM Gripper") { @Override public MissionItem getNewItem() { - return new Survey(); + return new EpmGripper(); } @Override - protected Creator getMissionItemCreator() { - return Survey.CREATOR; + protected Creator getMissionItemCreator() { + return EpmGripper.CREATOR; } + }, - STRUCTURE_SCANNER("Structure Scanner") { + YAW_CONDITION("Set Yaw"){ @Override - public MissionItem getNewItem() { - return new StructureScanner(); + public MissionItem getNewItem(){ + return new YawCondition(); } @Override - protected Creator getMissionItemCreator() { - return StructureScanner.CREATOR; + protected Creator getMissionItemCreator() { + return YawCondition.CREATOR; } }, @@ -182,18 +194,6 @@ public MissionItem getNewItem() { protected Creator getMissionItemCreator() { return SetServo.CREATOR; } - }, - - YAW_CONDITION("Set Yaw"){ - @Override - public MissionItem getNewItem(){ - return new YawCondition(); - } - - @Override - protected Creator getMissionItemCreator() { - return YawCondition.CREATOR; - } }; private final static String EXTRA_MISSION_ITEM_TYPE = "extra_mission_item_type"; diff --git a/ClientLib/mobile/libs/AidlLib.jar b/ClientLib/mobile/libs/AidlLib.jar index 96b06a6d59402e3e92997445e922b70e73c1b99d..7143798fe81ba49e14a1c990d548a54232ce6625 100644 GIT binary patch delta 20823 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 Z6~|HiZ%+MtE_0rt;&(<@XF?om{|9zWh4KIZ delta 20735 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 diff --git a/ServiceApp/build.gradle b/ServiceApp/build.gradle index 6f9d12cbd0..8dac9dd5f9 100644 --- a/ServiceApp/build.gradle +++ b/ServiceApp/build.gradle @@ -27,7 +27,7 @@ android { applicationId 'org.droidplanner.services.android' minSdkVersion 14 targetSdkVersion 21 - versionCode 10204 + versionCode 10205 versionName getGitVersion() } 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 61196abfed..913cb6c39d 100644 --- a/dependencyLibs/Core/src/org/droidplanner/core/drone/variables/GuidedPoint.java +++ b/dependencyLibs/Core/src/org/droidplanner/core/drone/variables/GuidedPoint.java @@ -75,6 +75,7 @@ public void pauseAtCurrentLocation() { changeToGuidedMode(myDrone); }else{ newGuidedCoord(myDrone.getGps().getPosition()); + state = GuidedStates.IDLE; } }