From f012248fd11141170b361616a4377f9b81adfd13 Mon Sep 17 00:00:00 2001 From: James Cotton Date: Sun, 12 Aug 2012 14:44:39 -0500 Subject: [PATCH] Updated android objects from merge --- .../uavtalk/uavobjects/FirmwareIAPObj.java | 2 +- .../uavobjects/ManualControlSettings.java | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FirmwareIAPObj.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FirmwareIAPObj.java index 48d211ae9..90a9e8893 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FirmwareIAPObj.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FirmwareIAPObj.java @@ -157,7 +157,7 @@ public class FirmwareIAPObj extends UAVDataObject { UAVObject.Metadata.AccessModeNum(UAVObject.AccessMode.ACCESS_READWRITE) << UAVOBJ_GCS_ACCESS_SHIFT | 1 << UAVOBJ_TELEMETRY_ACKED_SHIFT | 1 << UAVOBJ_GCS_TELEMETRY_ACKED_SHIFT | - UAVObject.Metadata.UpdateModeNum(UAVObject.UpdateMode.UPDATEMODE_MANUAL) << UAVOBJ_TELEMETRY_UPDATE_MODE_SHIFT | + UAVObject.Metadata.UpdateModeNum(UAVObject.UpdateMode.UPDATEMODE_ONCHANGE) << UAVOBJ_TELEMETRY_UPDATE_MODE_SHIFT | UAVObject.Metadata.UpdateModeNum(UAVObject.UpdateMode.UPDATEMODE_MANUAL) << UAVOBJ_GCS_TELEMETRY_UPDATE_MODE_SHIFT; metadata.flightTelemetryUpdatePeriod = 0; metadata.gcsTelemetryUpdatePeriod = 0; diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java index 0b47b3e10..e42662409 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java @@ -179,10 +179,17 @@ public class ManualControlSettings extends UAVDataObject { Stabilization3SettingsEnumOptions.add("VirtualBar"); fields.add( new UAVObjectField("Stabilization3Settings", "", UAVObjectField.FieldType.ENUM, Stabilization3SettingsElemNames, Stabilization3SettingsEnumOptions) ); + List FlightModeNumberElemNames = new ArrayList(); + FlightModeNumberElemNames.add("0"); + fields.add( new UAVObjectField("FlightModeNumber", "", UAVObjectField.FieldType.UINT8, FlightModeNumberElemNames, null) ); + List FlightModePositionElemNames = new ArrayList(); FlightModePositionElemNames.add("0"); FlightModePositionElemNames.add("1"); FlightModePositionElemNames.add("2"); + FlightModePositionElemNames.add("3"); + FlightModePositionElemNames.add("4"); + FlightModePositionElemNames.add("5"); List FlightModePositionEnumOptions = new ArrayList(); FlightModePositionEnumOptions.add("Manual"); FlightModePositionEnumOptions.add("Stabilized1"); @@ -196,10 +203,6 @@ public class ManualControlSettings extends UAVDataObject { FlightModePositionEnumOptions.add("Land"); fields.add( new UAVObjectField("FlightModePosition", "", UAVObjectField.FieldType.ENUM, FlightModePositionElemNames, FlightModePositionEnumOptions) ); - List FlightModeNumberElemNames = new ArrayList(); - FlightModeNumberElemNames.add("0"); - fields.add( new UAVObjectField("FlightModeNumber", "", UAVObjectField.FieldType.UINT8, FlightModeNumberElemNames, null) ); - List FailsafeBehaviorElemNames = new ArrayList(); FailsafeBehaviorElemNames.add("0"); List FailsafeBehaviorEnumOptions = new ArrayList(); @@ -308,10 +311,13 @@ public class ManualControlSettings extends UAVDataObject { getField("Stabilization3Settings").setValue("Attitude",0); getField("Stabilization3Settings").setValue("Attitude",1); getField("Stabilization3Settings").setValue("Rate",2); + getField("FlightModeNumber").setValue(3); getField("FlightModePosition").setValue("Manual",0); getField("FlightModePosition").setValue("Stabilized1",1); getField("FlightModePosition").setValue("Stabilized2",2); - getField("FlightModeNumber").setValue(3); + getField("FlightModePosition").setValue("Stabilized3",3); + getField("FlightModePosition").setValue("Stabilized1",4); + getField("FlightModePosition").setValue("Stabilized2",5); getField("FailsafeBehavior").setValue("None"); } @@ -341,7 +347,7 @@ public class ManualControlSettings extends UAVDataObject { } // Constants - protected static final long OBJID = 0x6C188320l; + protected static final long OBJID = 0xBA39E41Al; protected static final String NAME = "ManualControlSettings"; protected static String DESCRIPTION = "Settings to indicate how to decode receiver input by @ref ManualControlModule."; protected static final boolean ISSINGLEINST = 1 > 0;