rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Code Issues Releases Activity

Updated android objects from merge

Browse Source
This commit is contained in:
James Cotton 2012-08-12 14:44:39 -05:00
parent ef581342ac
commit f012248fd1
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
androidgcs/src/org/openpilot/uavtalk/uavobjects/FirmwareIAPObj.java
View File

@ -157,7 +157,7 @@ public class FirmwareIAPObj extends UAVDataObject {
UAVObject.Metadata.AccessModeNum(UAVObject.AccessMode.ACCESS_READWRITE) << UAVOBJ_GCS_ACCESS_SHIFT | UAVObject.Metadata.AccessModeNum(UAVObject.AccessMode.ACCESS_READWRITE) << UAVOBJ_GCS_ACCESS_SHIFT |
1 << UAVOBJ_TELEMETRY_ACKED_SHIFT | 1 << UAVOBJ_TELEMETRY_ACKED_SHIFT |
1 << UAVOBJ_GCS_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; UAVObject.Metadata.UpdateModeNum(UAVObject.UpdateMode.UPDATEMODE_MANUAL) << UAVOBJ_GCS_TELEMETRY_UPDATE_MODE_SHIFT;
metadata.flightTelemetryUpdatePeriod = 0; metadata.flightTelemetryUpdatePeriod = 0;
metadata.gcsTelemetryUpdatePeriod = 0; metadata.gcsTelemetryUpdatePeriod = 0;

18
androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java
View File

@ -179,10 +179,17 @@ public class ManualControlSettings extends UAVDataObject {
Stabilization3SettingsEnumOptions.add("VirtualBar"); Stabilization3SettingsEnumOptions.add("VirtualBar");
fields.add( new UAVObjectField("Stabilization3Settings", "", UAVObjectField.FieldType.ENUM, Stabilization3SettingsElemNames, Stabilization3SettingsEnumOptions) ); fields.add( new UAVObjectField("Stabilization3Settings", "", UAVObjectField.FieldType.ENUM, Stabilization3SettingsElemNames, Stabilization3SettingsEnumOptions) );
List<String> FlightModeNumberElemNames = new ArrayList<String>();
FlightModeNumberElemNames.add("0");
fields.add( new UAVObjectField("FlightModeNumber", "", UAVObjectField.FieldType.UINT8, FlightModeNumberElemNames, null) );
List<String> FlightModePositionElemNames = new ArrayList<String>(); List<String> FlightModePositionElemNames = new ArrayList<String>();
FlightModePositionElemNames.add("0"); FlightModePositionElemNames.add("0");
FlightModePositionElemNames.add("1"); FlightModePositionElemNames.add("1");
FlightModePositionElemNames.add("2"); FlightModePositionElemNames.add("2");
FlightModePositionElemNames.add("3");
FlightModePositionElemNames.add("4");
FlightModePositionElemNames.add("5");
List<String> FlightModePositionEnumOptions = new ArrayList<String>(); List<String> FlightModePositionEnumOptions = new ArrayList<String>();
FlightModePositionEnumOptions.add("Manual"); FlightModePositionEnumOptions.add("Manual");
FlightModePositionEnumOptions.add("Stabilized1"); FlightModePositionEnumOptions.add("Stabilized1");
@ -196,10 +203,6 @@ public class ManualControlSettings extends UAVDataObject {
FlightModePositionEnumOptions.add("Land"); FlightModePositionEnumOptions.add("Land");
fields.add( new UAVObjectField("FlightModePosition", "", UAVObjectField.FieldType.ENUM, FlightModePositionElemNames, FlightModePositionEnumOptions) ); fields.add( new UAVObjectField("FlightModePosition", "", UAVObjectField.FieldType.ENUM, FlightModePositionElemNames, FlightModePositionEnumOptions) );
List<String> FlightModeNumberElemNames = new ArrayList<String>();
FlightModeNumberElemNames.add("0");
fields.add( new UAVObjectField("FlightModeNumber", "", UAVObjectField.FieldType.UINT8, FlightModeNumberElemNames, null) );
List<String> FailsafeBehaviorElemNames = new ArrayList<String>(); List<String> FailsafeBehaviorElemNames = new ArrayList<String>();
FailsafeBehaviorElemNames.add("0"); FailsafeBehaviorElemNames.add("0");
List<String> FailsafeBehaviorEnumOptions = new ArrayList<String>(); List<String> FailsafeBehaviorEnumOptions = new ArrayList<String>();
@ -308,10 +311,13 @@ public class ManualControlSettings extends UAVDataObject {
getField("Stabilization3Settings").setValue("Attitude",0); getField("Stabilization3Settings").setValue("Attitude",0);
getField("Stabilization3Settings").setValue("Attitude",1); getField("Stabilization3Settings").setValue("Attitude",1);
getField("Stabilization3Settings").setValue("Rate",2); getField("Stabilization3Settings").setValue("Rate",2);
getField("FlightModeNumber").setValue(3);
getField("FlightModePosition").setValue("Manual",0); getField("FlightModePosition").setValue("Manual",0);
getField("FlightModePosition").setValue("Stabilized1",1); getField("FlightModePosition").setValue("Stabilized1",1);
getField("FlightModePosition").setValue("Stabilized2",2); 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"); getField("FailsafeBehavior").setValue("None");
} }
@ -341,7 +347,7 @@ public class ManualControlSettings extends UAVDataObject {
} }
// Constants // Constants
protected static final long OBJID = 0x6C188320l; protected static final long OBJID = 0xBA39E41Al;
protected static final String NAME = "ManualControlSettings"; protected static final String NAME = "ManualControlSettings";
protected static String DESCRIPTION = "Settings to indicate how to decode receiver input by @ref ManualControlModule."; protected static String DESCRIPTION = "Settings to indicate how to decode receiver input by @ref ManualControlModule.";
protected static final boolean ISSINGLEINST = 1 > 0; protected static final boolean ISSINGLEINST = 1 > 0;