Implemented DO_SET_RELAY mission item.

Author: m4gr3d

AidlLib/build.gradle

@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 21
-        versionCode 20044
-        versionName '2.0.44'
+        versionCode 20046
+        versionName '2.0.46'
     }
 
     defaultPublishConfig "release"

AidlLib/src/com/o3dr/services/android/lib/drone/mission/MissionItemType.java

@@ -9,6 +9,7 @@
 import com.o3dr.services.android.lib.drone.mission.item.command.ChangeSpeed;
 import com.o3dr.services.android.lib.drone.mission.item.command.EpmGripper;
 import com.o3dr.services.android.lib.drone.mission.item.command.ReturnToLaunch;
+import com.o3dr.services.android.lib.drone.mission.item.command.SetRelay;
 import com.o3dr.services.android.lib.drone.mission.item.command.SetServo;
 import com.o3dr.services.android.lib.drone.mission.item.command.Takeoff;
 import com.o3dr.services.android.lib.drone.mission.item.command.YawCondition;
@@ -194,6 +195,18 @@ public MissionItem getNewItem() {
         protected Creator<SetServo> getMissionItemCreator() {
             return SetServo.CREATOR;
         }
+    },
+
+    SET_RELAY("Set Relay") {
+        @Override
+        public MissionItem getNewItem() {
+            return new SetRelay();
+        }
+
+        @Override
+        protected Creator<SetRelay> getMissionItemCreator() {
+            return SetRelay.CREATOR;
+        }
     };
 
     private final static String EXTRA_MISSION_ITEM_TYPE = "extra_mission_item_type";

AidlLib/src/com/o3dr/services/android/lib/drone/mission/item/command/SetRelay.java

@@ -0,0 +1,83 @@
+package com.o3dr.services.android.lib.drone.mission.item.command;
+
+import android.os.Parcel;
+
+import com.o3dr.services.android.lib.drone.mission.MissionItemType;
+import com.o3dr.services.android.lib.drone.mission.item.MissionItem;
+
+/**
+ * Set a Relay pin’s voltage high or low.
+ */
+public class SetRelay extends MissionItem implements MissionItem.Command, android.os.Parcelable {
+
+    private int relayNumber;
+    private boolean enabled;
+
+    public SetRelay() {
+        super(MissionItemType.SET_RELAY);
+    }
+
+    public SetRelay(SetRelay copy) {
+        this();
+        this.relayNumber = copy.relayNumber;
+        this.enabled = copy.enabled;
+    }
+
+    /**
+     * @return relay number
+     */
+    public int getRelayNumber() {
+        return relayNumber;
+    }
+
+    /**
+     * Set the relay number
+     *
+     * @param relayNumber
+     */
+    public void setRelayNumber(int relayNumber) {
+        this.relayNumber = relayNumber;
+    }
+
+    /**
+     * @return true if relay is on, false if relay if off.
+     */
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    /**
+     * @param enabled true for relay to be on, false for relay to be off.
+     */
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    @Override
+    public MissionItem clone() {
+        return new SetRelay(this);
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        super.writeToParcel(dest, flags);
+        dest.writeInt(this.relayNumber);
+        dest.writeByte(enabled ? (byte) 1 : (byte) 0);
+    }
+
+    private SetRelay(Parcel in) {
+        super(in);
+        this.relayNumber = in.readInt();
+        this.enabled = in.readByte() != 0;
+    }
+
+    public static final Creator<SetRelay> CREATOR = new Creator<SetRelay>() {
+        public SetRelay createFromParcel(Parcel source) {
+            return new SetRelay(source);
+        }
+
+        public SetRelay[] newArray(int size) {
+            return new SetRelay[size];
+        }
+    };
+}

ClientLib/mobile/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 ext {
     PUBLISH_ARTIFACT_ID = '3dr-services-lib'
-    PUBLISH_VERSION = '2.2.8'
+    PUBLISH_VERSION = '2.2.10'
     PROJECT_DESCRIPTION = "3DR Services Client Library"
     PROJECT_LABELS = ['3DR', '3DR Services', 'DroneAPI', 'Android']
     PROJECT_LICENSES = ['Apache-2.0']
@@ -15,7 +15,7 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 21
-        versionCode 20208
+        versionCode 20210
         versionName PUBLISH_VERSION
     }
 

ClientLib/mobile/libs/AidlLib.jar

@@ -599,7 +599,7 @@ public void setMission(Mission mission, boolean pushToDrone) {
 
         List<MissionItem> itemsList = mission.getMissionItems();
         for (MissionItem item : itemsList) {
-            droneMission.addMissionItem(ProxyUtils.getMissionItem(droneMission, item));
+            droneMission.addMissionItem(ProxyUtils.getMissionItemImpl(droneMission, item));
         }
 
         if (pushToDrone)
@@ -815,7 +815,7 @@ public void buildComplexMissionItem(Bundle itemBundle) {
 
     private Survey buildSurvey(Survey survey) {
         org.droidplanner.core.mission.Mission droneMission = this.droneMgr.getDrone().getMission();
-        org.droidplanner.core.mission.survey.Survey updatedSurvey = (org.droidplanner.core.mission.survey.Survey) ProxyUtils.getMissionItem
+        org.droidplanner.core.mission.survey.Survey updatedSurvey = (org.droidplanner.core.mission.survey.Survey) ProxyUtils.getMissionItemImpl
                 (droneMission, survey);
 
         return (Survey) ProxyUtils.getProxyMissionItem(updatedSurvey);
@@ -824,7 +824,7 @@ private Survey buildSurvey(Survey survey) {
     private StructureScanner buildStructureScanner(StructureScanner item) {
         org.droidplanner.core.mission.Mission droneMission = this.droneMgr.getDrone().getMission();
         org.droidplanner.core.mission.waypoints.StructureScanner updatedScan = (org.droidplanner.core.mission.waypoints.StructureScanner) ProxyUtils
-                .getMissionItem(droneMission, item);
+                .getMissionItemImpl(droneMission, item);
 
         StructureScanner proxyScanner = (StructureScanner) ProxyUtils.getProxyMissionItem(updatedScan);
         return proxyScanner;