diff --git a/androidgcs/src/org/openpilot/androidgcs/ObjectEditor.java b/androidgcs/src/org/openpilot/androidgcs/ObjectEditor.java index b662cf122..16256a975 100644 --- a/androidgcs/src/org/openpilot/androidgcs/ObjectEditor.java +++ b/androidgcs/src/org/openpilot/androidgcs/ObjectEditor.java @@ -22,31 +22,112 @@ public class ObjectEditor extends ObjectManagerActivity { // TODO: Figure out why this line is required so it doesn't // have to be set programmatically setTheme(android.R.style.Theme_Holo); - - Bundle extras = getIntent().getExtras(); - if(extras != null){ - objectName = extras.getString("org.openpilot.androidgcs.ObjectName"); - objectID = extras.getInt("org.openpilot.androidgcs.ObjectId"); - instID = extras.getInt("org.openpilot.androidgcs.InstId"); - - setTitle(objectName); - } - - } - + + Bundle extras = getIntent().getExtras(); + if (extras == null) + return; + + objectName = extras.getString("org.openpilot.androidgcs.ObjectName"); + objectID = extras.getLong("org.openpilot.androidgcs.ObjectId"); + instID = extras.getLong("org.openpilot.androidgcs.InstId"); + + setTitle(objectName); + + Button sendButton = (Button) findViewById(R.id.object_edit_send_button); + sendButton.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + updateObject(); + } + }); + + Button saveButton = (Button) findViewById(R.id.object_edit_save_button); + saveButton.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + saveObject(); + } + }); + } + public void onOPConnected() { UAVObject obj = objMngr.getObject(objectID, instID); - if (obj == null) + if (obj == null) { + Log.d(TAG, "Object not found:" + objectID); return; + } ObjectEditView editView = (ObjectEditView) findViewById(R.id.object_edit_view); editView.setName(obj.getName()); - + List fields = obj.getFields(); ListIterator li = fields.listIterator(); - while(li.hasNext()) { + while (li.hasNext()) { editView.addField(li.next()); } } + /** + * Fetch the data back from the view and then send it to the UAV + */ + private void saveObject() { + + UAVObject objPer = objMngr.getObject("ObjectPersistence"); + + if( !updateObject() || objPer == null) { + Toast.makeText(this, "Save failed", Toast.LENGTH_LONG).show(); + return; + } + + long thisId = objectID < 0 ? ((Long) 0x100000000l) + objectID : objectID; + objPer.getField("Operation").setValue("Save"); + objPer.getField("Selection").setValue("SingleObject"); + Log.d(TAG,"Saving with object id: " + objectID + " swapped to " + thisId); + objPer.getField("ObjectID").setValue(thisId); + objPer.getField("InstanceID").setValue(instID); + objPer.updated(); + + Toast.makeText(this, "Save succeeded", Toast.LENGTH_LONG).show(); + } + + /** + * Fetch the data back from the view and then send it to the UAV + */ + private boolean updateObject() { + UAVObject obj = objMngr.getObject(objectID, instID); + if (obj == null) + return false; + + ObjectEditView editView = (ObjectEditView) findViewById(R.id.object_edit_view); + + int field_idx = 0; + + List fields = obj.getFields(); + ListIterator li = fields.listIterator(); + while (li.hasNext()) { + UAVObjectField field = li.next(); + int num_fields = field.getNumElements(); + for (int i = 0; i < num_fields; i++) { + switch (field.getType()) { + case ENUM: + int selected = ((Spinner)editView.fields.get(field_idx)).getSelectedItemPosition(); + field.setValue(selected, i); + break; + default: + String val = ((EditText) editView.fields.get(field_idx)).getText().toString(); + Double num = Double.parseDouble(val); + + Log.e(TAG, "Updating field: " + field.getName() + " value: " + num); + field.setValue(num, i); + break; + } + + field_idx++; + } + } + obj.updated(); + + return true; + } + } diff --git a/androidgcs/src/org/openpilot/uavtalk/UAVDataObject.java b/androidgcs/src/org/openpilot/uavtalk/UAVDataObject.java index 0acc02226..e8ae6e50e 100644 --- a/androidgcs/src/org/openpilot/uavtalk/UAVDataObject.java +++ b/androidgcs/src/org/openpilot/uavtalk/UAVDataObject.java @@ -9,7 +9,7 @@ public abstract class UAVDataObject extends UAVObject { * @param isSet * @param name */ - public UAVDataObject(int objID, Boolean isSingleInst, Boolean isSet, String name) { + public UAVDataObject(long objID, Boolean isSingleInst, Boolean isSet, String name) { super(objID, isSingleInst, name); mobj = null; this.isSet = isSet; @@ -17,7 +17,7 @@ public abstract class UAVDataObject extends UAVObject { /** * Initialize instance ID and assign a metaobject */ - public void initialize(int instID, UAVMetaObject mobj) + public void initialize(long instID, UAVMetaObject mobj) { //QMutexLocker locker(mutex); this.mobj = mobj; @@ -77,7 +77,7 @@ public abstract class UAVDataObject extends UAVObject { } // TODO: Make abstract - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { return (UAVDataObject) super.clone(); } diff --git a/androidgcs/src/org/openpilot/uavtalk/UAVMetaObject.java b/androidgcs/src/org/openpilot/uavtalk/UAVMetaObject.java index 98a3bf8df..5f938bbac 100644 --- a/androidgcs/src/org/openpilot/uavtalk/UAVMetaObject.java +++ b/androidgcs/src/org/openpilot/uavtalk/UAVMetaObject.java @@ -7,7 +7,7 @@ import java.util.ListIterator; public class UAVMetaObject extends UAVObject { - public UAVMetaObject(int objID, String name, UAVDataObject parent) throws Exception { + public UAVMetaObject(long objID, String name, UAVDataObject parent) throws Exception { super(objID, true, name); this.parent = parent; diff --git a/androidgcs/src/org/openpilot/uavtalk/UAVObject.java b/androidgcs/src/org/openpilot/uavtalk/UAVObject.java index 087d2b808..da93e9889 100644 --- a/androidgcs/src/org/openpilot/uavtalk/UAVObject.java +++ b/androidgcs/src/org/openpilot/uavtalk/UAVObject.java @@ -363,7 +363,7 @@ public abstract class UAVObject { }; - public UAVObject(int objID, Boolean isSingleInst, String name) { + public UAVObject(long objID, Boolean isSingleInst, String name) { this.objID = objID; this.instID = 0; this.isSingleInst = isSingleInst; @@ -371,7 +371,7 @@ public abstract class UAVObject { // this.mutex = new QMutex(QMutex::Recursive); }; - public synchronized void initialize(int instID) { + public synchronized void initialize(long instID) { this.instID = instID; } @@ -402,14 +402,14 @@ public abstract class UAVObject { /** * Get the object ID */ - public int getObjID() { + public long getObjID() { return objID; } /** * Get the instance ID */ - public int getInstID() { + public long getInstID() { return instID; } @@ -794,8 +794,8 @@ public abstract class UAVObject { /** * Private data for the object, common to all */ - protected int objID; - protected int instID; + protected long objID; + protected long instID; protected boolean isSingleInst; protected String name; protected String description; diff --git a/androidgcs/src/org/openpilot/uavtalk/UAVObjectManager.java b/androidgcs/src/org/openpilot/uavtalk/UAVObjectManager.java index 3ec588879..bbd637651 100644 --- a/androidgcs/src/org/openpilot/uavtalk/UAVObjectManager.java +++ b/androidgcs/src/org/openpilot/uavtalk/UAVObjectManager.java @@ -95,8 +95,8 @@ public class UAVObjectManager { // If the instance ID is specified and not at the default value (0) then we need to make sure // that there are no gaps in the instance list. If gaps are found then then additional instances // will be created. - for(int instID = instList.size(); instID < obj.getInstID(); instID++) { - UAVDataObject newObj = obj.clone(instID); + for(long instId = instList.size(); instId < obj.getInstID(); instId++) { + UAVDataObject newObj = obj.clone(instId); newObj.initialize(mobj); instList.add(newObj); newInstance.event(newObj); @@ -116,7 +116,7 @@ public class UAVObjectManager { // Check if there are any gaps between the requested instance ID and the ones in the list, // if any then create the missing instances. - for (int instId = instList.size(); instId < obj.getInstID(); ++instId) + for (long instId = instList.size(); instId < obj.getInstID(); ++instId) { UAVDataObject cobj = obj.clone(instId); cobj.initialize(mobj); @@ -247,7 +247,7 @@ public class UAVObjectManager { * Get a specific object given its name and instance ID * @returns The object is found or NULL if not */ - public UAVObject getObject(String name, int instId) + public UAVObject getObject(String name, long instId) { return getObject(name, 0, instId); } @@ -257,7 +257,7 @@ public class UAVObjectManager { * @param objId the object id * @returns The object is found or NULL if not */ - public UAVObject getObject(int objId) + public UAVObject getObject(long objId) { return getObject(null, objId, 0); } @@ -266,7 +266,7 @@ public class UAVObjectManager { * Get a specific object given its object and instance ID * @returns The object is found or NULL if not */ - public UAVObject getObject(int objId, int instId) + public UAVObject getObject(long objId, long instId) { return getObject(null, objId, instId); } @@ -274,7 +274,7 @@ public class UAVObjectManager { /** * Helper function for the public getObject() functions. */ - public synchronized UAVObject getObject(String name, int objId, int instId) + public synchronized UAVObject getObject(String name, long objId, long instId) { // Check if this object type is already in the list ListIterator> objIter = objects.listIterator(); @@ -308,7 +308,7 @@ public class UAVObjectManager { /** * Get all the instances of the object specified by its ID */ - public List getObjectInstances(int objId) + public List getObjectInstances(long objId) { return getObjectInstances(null, objId); } @@ -316,7 +316,7 @@ public class UAVObjectManager { /** * Helper function for the public getObjectInstances() */ - public synchronized List getObjectInstances(String name, int objId) + public synchronized List getObjectInstances(String name, long objId) { // Check if this object type is already in the list ListIterator> objIter = objects.listIterator(); @@ -343,7 +343,7 @@ public class UAVObjectManager { /** * Get the number of instances for an object given its ID */ - public int getNumInstances(int objId) + public int getNumInstances(long objId) { return getNumInstances(null, objId); } @@ -351,7 +351,7 @@ public class UAVObjectManager { /** * Helper function for public getNumInstances */ - public int getNumInstances(String name, int objId) + public int getNumInstances(String name, long objId) { return getObjectInstances(name,objId).size(); } diff --git a/androidgcs/src/org/openpilot/uavtalk/UAVTalk.java b/androidgcs/src/org/openpilot/uavtalk/UAVTalk.java index 9cdd11ccb..e16bf6c17 100644 --- a/androidgcs/src/org/openpilot/uavtalk/UAVTalk.java +++ b/androidgcs/src/org/openpilot/uavtalk/UAVTalk.java @@ -686,7 +686,7 @@ public class UAVTalk extends Observable { bbuf .putShort((short) (length + 2 /* SYNC, Type */+ 2 /* Size */+ 4 /* ObjID */+ (obj .isSingleInstance() ? 0 : 2))); - bbuf.putInt(obj.getObjID()); + bbuf.putInt((int)obj.getObjID()); // Setup instance ID if one is required if (!obj.isSingleInstance()) { diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/Accels.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/Accels.java index 32437e63e..167e1f151 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/Accels.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/Accels.java @@ -119,7 +119,7 @@ public class Accels extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { Accels obj = new Accels(); @@ -133,13 +133,13 @@ public class Accels extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public Accels GetInstance(UAVObjectManager objMngr, int instID) + public Accels GetInstance(UAVObjectManager objMngr, long instID) { return (Accels)(objMngr.getObject(Accels.OBJID, instID)); } // Constants - protected static final int OBJID = 0xDD9D5FC0; + protected static final long OBJID = 0xDD9D5FC0; protected static final String NAME = "Accels"; protected static String DESCRIPTION = "The accel data."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -147,4 +147,4 @@ public class Accels extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/AccessoryDesired.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/AccessoryDesired.java index 4b7c875a7..69d8989e0 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/AccessoryDesired.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/AccessoryDesired.java @@ -107,7 +107,7 @@ public class AccessoryDesired extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { AccessoryDesired obj = new AccessoryDesired(); @@ -121,13 +121,13 @@ public class AccessoryDesired extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public AccessoryDesired GetInstance(UAVObjectManager objMngr, int instID) + public AccessoryDesired GetInstance(UAVObjectManager objMngr, long instID) { return (AccessoryDesired)(objMngr.getObject(AccessoryDesired.OBJID, instID)); } // Constants - protected static final int OBJID = 0xC409985A; + protected static final long OBJID = 0xC409985A; protected static final String NAME = "AccessoryDesired"; protected static String DESCRIPTION = "Desired Auxillary actuator settings. Comes from @ref ManualControlModule."; protected static final boolean ISSINGLEINST = 0 == 1; @@ -135,4 +135,4 @@ public class AccessoryDesired extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorCommand.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorCommand.java index 0120e0ce7..d48bd0c2c 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorCommand.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorCommand.java @@ -128,7 +128,7 @@ public class ActuatorCommand extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { ActuatorCommand obj = new ActuatorCommand(); @@ -142,13 +142,13 @@ public class ActuatorCommand extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public ActuatorCommand GetInstance(UAVObjectManager objMngr, int instID) + public ActuatorCommand GetInstance(UAVObjectManager objMngr, long instID) { return (ActuatorCommand)(objMngr.getObject(ActuatorCommand.OBJID, instID)); } // Constants - protected static final int OBJID = 0x5324CB8; + protected static final long OBJID = 0x5324CB8; protected static final String NAME = "ActuatorCommand"; protected static String DESCRIPTION = "Contains the pulse duration sent to each of the channels. Set by @ref ActuatorModule"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -156,4 +156,4 @@ public class ActuatorCommand extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorDesired.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorDesired.java index a00517906..ff1329ad6 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorDesired.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorDesired.java @@ -127,7 +127,7 @@ public class ActuatorDesired extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { ActuatorDesired obj = new ActuatorDesired(); @@ -141,13 +141,13 @@ public class ActuatorDesired extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public ActuatorDesired GetInstance(UAVObjectManager objMngr, int instID) + public ActuatorDesired GetInstance(UAVObjectManager objMngr, long instID) { return (ActuatorDesired)(objMngr.getObject(ActuatorDesired.OBJID, instID)); } // Constants - protected static final int OBJID = 0xCA4BC4A4; + protected static final long OBJID = 0xCA4BC4A4; protected static final String NAME = "ActuatorDesired"; protected static String DESCRIPTION = "Desired raw, pitch and yaw actuator settings. Comes from either @ref StabilizationModule or @ref ManualControlModule depending on FlightMode."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -155,4 +155,4 @@ public class ActuatorDesired extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorSettings.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorSettings.java index 2257da346..5c587d31a 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorSettings.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorSettings.java @@ -242,7 +242,7 @@ public class ActuatorSettings extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { ActuatorSettings obj = new ActuatorSettings(); @@ -256,13 +256,13 @@ public class ActuatorSettings extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public ActuatorSettings GetInstance(UAVObjectManager objMngr, int instID) + public ActuatorSettings GetInstance(UAVObjectManager objMngr, long instID) { return (ActuatorSettings)(objMngr.getObject(ActuatorSettings.OBJID, instID)); } // Constants - protected static final int OBJID = 0x7D555646; + protected static final long OBJID = 0x7D555646; protected static final String NAME = "ActuatorSettings"; protected static String DESCRIPTION = "Settings for the @ref ActuatorModule that controls the channel assignments for the mixer based on AircraftType"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -270,4 +270,4 @@ public class ActuatorSettings extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/AltHoldSmoothed.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/AltHoldSmoothed.java index 46d03a544..d2ac0b36d 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/AltHoldSmoothed.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/AltHoldSmoothed.java @@ -115,7 +115,7 @@ public class AltHoldSmoothed extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { AltHoldSmoothed obj = new AltHoldSmoothed(); @@ -129,13 +129,13 @@ public class AltHoldSmoothed extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public AltHoldSmoothed GetInstance(UAVObjectManager objMngr, int instID) + public AltHoldSmoothed GetInstance(UAVObjectManager objMngr, long instID) { return (AltHoldSmoothed)(objMngr.getObject(AltHoldSmoothed.OBJID, instID)); } // Constants - protected static final int OBJID = 0x2BC6B9D2; + protected static final long OBJID = 0x2BC6B9D2; protected static final String NAME = "AltHoldSmoothed"; protected static String DESCRIPTION = "The output on the kalman filter on altitude."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -143,4 +143,4 @@ public class AltHoldSmoothed extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldDesired.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldDesired.java index efe860340..a53a18a1c 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldDesired.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldDesired.java @@ -119,7 +119,7 @@ public class AltitudeHoldDesired extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { AltitudeHoldDesired obj = new AltitudeHoldDesired(); @@ -133,13 +133,13 @@ public class AltitudeHoldDesired extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public AltitudeHoldDesired GetInstance(UAVObjectManager objMngr, int instID) + public AltitudeHoldDesired GetInstance(UAVObjectManager objMngr, long instID) { return (AltitudeHoldDesired)(objMngr.getObject(AltitudeHoldDesired.OBJID, instID)); } // Constants - protected static final int OBJID = 0x495BAD6E; + protected static final long OBJID = 0x495BAD6E; protected static final String NAME = "AltitudeHoldDesired"; protected static String DESCRIPTION = "Holds the desired altitude (from manual control) as well as the desired attitude to pass through"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -147,4 +147,4 @@ public class AltitudeHoldDesired extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldSettings.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldSettings.java index 77b6774b9..241ae4299 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldSettings.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldSettings.java @@ -138,7 +138,7 @@ public class AltitudeHoldSettings extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { AltitudeHoldSettings obj = new AltitudeHoldSettings(); @@ -152,13 +152,13 @@ public class AltitudeHoldSettings extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public AltitudeHoldSettings GetInstance(UAVObjectManager objMngr, int instID) + public AltitudeHoldSettings GetInstance(UAVObjectManager objMngr, long instID) { return (AltitudeHoldSettings)(objMngr.getObject(AltitudeHoldSettings.OBJID, instID)); } // Constants - protected static final int OBJID = 0xFEC55B42; + protected static final long OBJID = 0xFEC55B42; protected static final String NAME = "AltitudeHoldSettings"; protected static String DESCRIPTION = "Settings for the @ref AltitudeHold module"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -166,4 +166,4 @@ public class AltitudeHoldSettings extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/AttitudeActual.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/AttitudeActual.java index b117e501a..e72019311 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/AttitudeActual.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/AttitudeActual.java @@ -131,7 +131,7 @@ public class AttitudeActual extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { AttitudeActual obj = new AttitudeActual(); @@ -145,13 +145,13 @@ public class AttitudeActual extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public AttitudeActual GetInstance(UAVObjectManager objMngr, int instID) + public AttitudeActual GetInstance(UAVObjectManager objMngr, long instID) { return (AttitudeActual)(objMngr.getObject(AttitudeActual.OBJID, instID)); } // Constants - protected static final int OBJID = 0x33DAD5E6; + protected static final long OBJID = 0x33DAD5E6; protected static final String NAME = "AttitudeActual"; protected static String DESCRIPTION = "The updated Attitude estimation from @ref AHRSCommsModule."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -159,4 +159,4 @@ public class AttitudeActual extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/AttitudeSettings.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/AttitudeSettings.java index 9bcce7bf3..4507e83dc 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/AttitudeSettings.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/AttitudeSettings.java @@ -175,7 +175,7 @@ public class AttitudeSettings extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { AttitudeSettings obj = new AttitudeSettings(); @@ -189,13 +189,13 @@ public class AttitudeSettings extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public AttitudeSettings GetInstance(UAVObjectManager objMngr, int instID) + public AttitudeSettings GetInstance(UAVObjectManager objMngr, long instID) { return (AttitudeSettings)(objMngr.getObject(AttitudeSettings.OBJID, instID)); } // Constants - protected static final int OBJID = 0xC307BC4A; + protected static final long OBJID = 0xC307BC4A; protected static final String NAME = "AttitudeSettings"; protected static String DESCRIPTION = "Settings for the @ref Attitude module used on CopterControl"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -203,4 +203,4 @@ public class AttitudeSettings extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/AttitudeSimulated.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/AttitudeSimulated.java index 3a713ab04..c3ca10e91 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/AttitudeSimulated.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/AttitudeSimulated.java @@ -143,7 +143,7 @@ public class AttitudeSimulated extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { AttitudeSimulated obj = new AttitudeSimulated(); @@ -157,13 +157,13 @@ public class AttitudeSimulated extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public AttitudeSimulated GetInstance(UAVObjectManager objMngr, int instID) + public AttitudeSimulated GetInstance(UAVObjectManager objMngr, long instID) { return (AttitudeSimulated)(objMngr.getObject(AttitudeSimulated.OBJID, instID)); } // Constants - protected static final int OBJID = 0x9266CE74; + protected static final long OBJID = 0x9266CE74; protected static final String NAME = "AttitudeSimulated"; protected static String DESCRIPTION = "The simulated Attitude estimation from @ref Sensors."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -171,4 +171,4 @@ public class AttitudeSimulated extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/BaroAirspeed.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/BaroAirspeed.java index 439915741..430974aec 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/BaroAirspeed.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/BaroAirspeed.java @@ -122,7 +122,7 @@ public class BaroAirspeed extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { BaroAirspeed obj = new BaroAirspeed(); @@ -136,13 +136,13 @@ public class BaroAirspeed extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public BaroAirspeed GetInstance(UAVObjectManager objMngr, int instID) + public BaroAirspeed GetInstance(UAVObjectManager objMngr, long instID) { return (BaroAirspeed)(objMngr.getObject(BaroAirspeed.OBJID, instID)); } // Constants - protected static final int OBJID = 0x169EA4A; + protected static final long OBJID = 0x169EA4A; protected static final String NAME = "BaroAirspeed"; protected static String DESCRIPTION = "The raw data from the dynamic pressure sensor with pressure, temperature and airspeed."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -150,4 +150,4 @@ public class BaroAirspeed extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/BaroAltitude.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/BaroAltitude.java index cd649f84c..27f5d667b 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/BaroAltitude.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/BaroAltitude.java @@ -115,7 +115,7 @@ public class BaroAltitude extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { BaroAltitude obj = new BaroAltitude(); @@ -129,13 +129,13 @@ public class BaroAltitude extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public BaroAltitude GetInstance(UAVObjectManager objMngr, int instID) + public BaroAltitude GetInstance(UAVObjectManager objMngr, long instID) { return (BaroAltitude)(objMngr.getObject(BaroAltitude.OBJID, instID)); } // Constants - protected static final int OBJID = 0x99622E6A; + protected static final long OBJID = 0x99622E6A; protected static final String NAME = "BaroAltitude"; protected static String DESCRIPTION = "The raw data from the barometric sensor with pressure, temperature and altitude estimate."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -143,4 +143,4 @@ public class BaroAltitude extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/CameraDesired.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/CameraDesired.java index 34c23e612..bcd009b18 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/CameraDesired.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/CameraDesired.java @@ -115,7 +115,7 @@ public class CameraDesired extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { CameraDesired obj = new CameraDesired(); @@ -129,13 +129,13 @@ public class CameraDesired extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public CameraDesired GetInstance(UAVObjectManager objMngr, int instID) + public CameraDesired GetInstance(UAVObjectManager objMngr, long instID) { return (CameraDesired)(objMngr.getObject(CameraDesired.OBJID, instID)); } // Constants - protected static final int OBJID = 0x531F544E; + protected static final long OBJID = 0x531F544E; protected static final String NAME = "CameraDesired"; protected static String DESCRIPTION = "Desired camera outputs. Comes from @ref CameraStabilization module."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -143,4 +143,4 @@ public class CameraDesired extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/CameraStabSettings.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/CameraStabSettings.java index 0b2f3b3f5..d3b5acfa8 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/CameraStabSettings.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/CameraStabSettings.java @@ -173,7 +173,7 @@ public class CameraStabSettings extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { CameraStabSettings obj = new CameraStabSettings(); @@ -187,13 +187,13 @@ public class CameraStabSettings extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public CameraStabSettings GetInstance(UAVObjectManager objMngr, int instID) + public CameraStabSettings GetInstance(UAVObjectManager objMngr, long instID) { return (CameraStabSettings)(objMngr.getObject(CameraStabSettings.OBJID, instID)); } // Constants - protected static final int OBJID = 0x3B95DDBA; + protected static final long OBJID = 0x3B95DDBA; protected static final String NAME = "CameraStabSettings"; protected static String DESCRIPTION = "Settings for the @ref CameraStab mmodule"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -201,4 +201,4 @@ public class CameraStabSettings extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FaultSettings.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FaultSettings.java index 8da58f793..31b5a8ad9 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FaultSettings.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FaultSettings.java @@ -115,7 +115,7 @@ public class FaultSettings extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { FaultSettings obj = new FaultSettings(); @@ -129,13 +129,13 @@ public class FaultSettings extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public FaultSettings GetInstance(UAVObjectManager objMngr, int instID) + public FaultSettings GetInstance(UAVObjectManager objMngr, long instID) { return (FaultSettings)(objMngr.getObject(FaultSettings.OBJID, instID)); } // Constants - protected static final int OBJID = 0x2778BA3C; + protected static final long OBJID = 0x2778BA3C; protected static final String NAME = "FaultSettings"; protected static String DESCRIPTION = "Allows testers to simulate various fault scenarios."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -143,4 +143,4 @@ public class FaultSettings extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FirmwareIAPObj.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FirmwareIAPObj.java index 58fadcee5..3b0c4da20 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FirmwareIAPObj.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FirmwareIAPObj.java @@ -181,7 +181,7 @@ public class FirmwareIAPObj extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { FirmwareIAPObj obj = new FirmwareIAPObj(); @@ -195,13 +195,13 @@ public class FirmwareIAPObj extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public FirmwareIAPObj GetInstance(UAVObjectManager objMngr, int instID) + public FirmwareIAPObj GetInstance(UAVObjectManager objMngr, long instID) { return (FirmwareIAPObj)(objMngr.getObject(FirmwareIAPObj.OBJID, instID)); } // Constants - protected static final int OBJID = 0x3CCDFB68; + protected static final long OBJID = 0x3CCDFB68; protected static final String NAME = "FirmwareIAPObj"; protected static String DESCRIPTION = "Queries board for SN, model, revision, and sends reset command"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -209,4 +209,4 @@ public class FirmwareIAPObj extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FixedWingPathFollowerSettings.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FixedWingPathFollowerSettings.java index 00419bc4c..e35e744e4 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FixedWingPathFollowerSettings.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FixedWingPathFollowerSettings.java @@ -208,7 +208,7 @@ public class FixedWingPathFollowerSettings extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { FixedWingPathFollowerSettings obj = new FixedWingPathFollowerSettings(); @@ -222,13 +222,13 @@ public class FixedWingPathFollowerSettings extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public FixedWingPathFollowerSettings GetInstance(UAVObjectManager objMngr, int instID) + public FixedWingPathFollowerSettings GetInstance(UAVObjectManager objMngr, long instID) { return (FixedWingPathFollowerSettings)(objMngr.getObject(FixedWingPathFollowerSettings.OBJID, instID)); } // Constants - protected static final int OBJID = 0x8A3F1E02; + protected static final long OBJID = 0x8A3F1E02; protected static final String NAME = "FixedWingPathFollowerSettings"; protected static String DESCRIPTION = "Settings for the @ref FixedWingPathFollowerModule"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -236,4 +236,4 @@ public class FixedWingPathFollowerSettings extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FixedWingPathFollowerStatus.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FixedWingPathFollowerStatus.java index a40be35cf..9766ca1fe 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FixedWingPathFollowerStatus.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FixedWingPathFollowerStatus.java @@ -133,7 +133,7 @@ public class FixedWingPathFollowerStatus extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { FixedWingPathFollowerStatus obj = new FixedWingPathFollowerStatus(); @@ -147,13 +147,13 @@ public class FixedWingPathFollowerStatus extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public FixedWingPathFollowerStatus GetInstance(UAVObjectManager objMngr, int instID) + public FixedWingPathFollowerStatus GetInstance(UAVObjectManager objMngr, long instID) { return (FixedWingPathFollowerStatus)(objMngr.getObject(FixedWingPathFollowerStatus.OBJID, instID)); } // Constants - protected static final int OBJID = 0xA0D6F6D4; + protected static final long OBJID = 0xA0D6F6D4; protected static final String NAME = "FixedWingPathFollowerStatus"; protected static String DESCRIPTION = "Object Storing Debugging Information on PID internals"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -161,4 +161,4 @@ public class FixedWingPathFollowerStatus extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatterySettings.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatterySettings.java index 850f64103..dd6c95f1f 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatterySettings.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatterySettings.java @@ -150,7 +150,7 @@ public class FlightBatterySettings extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { FlightBatterySettings obj = new FlightBatterySettings(); @@ -164,13 +164,13 @@ public class FlightBatterySettings extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public FlightBatterySettings GetInstance(UAVObjectManager objMngr, int instID) + public FlightBatterySettings GetInstance(UAVObjectManager objMngr, long instID) { return (FlightBatterySettings)(objMngr.getObject(FlightBatterySettings.OBJID, instID)); } // Constants - protected static final int OBJID = 0x94AC6AD2; + protected static final long OBJID = 0x94AC6AD2; protected static final String NAME = "FlightBatterySettings"; protected static String DESCRIPTION = "Flight Battery configuration."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -178,4 +178,4 @@ public class FlightBatterySettings extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatteryState.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatteryState.java index d54648ad5..5a94df0d9 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatteryState.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatteryState.java @@ -138,7 +138,7 @@ public class FlightBatteryState extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { FlightBatteryState obj = new FlightBatteryState(); @@ -152,13 +152,13 @@ public class FlightBatteryState extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public FlightBatteryState GetInstance(UAVObjectManager objMngr, int instID) + public FlightBatteryState GetInstance(UAVObjectManager objMngr, long instID) { return (FlightBatteryState)(objMngr.getObject(FlightBatteryState.OBJID, instID)); } // Constants - protected static final int OBJID = 0xD2083596; + protected static final long OBJID = 0xD2083596; protected static final String NAME = "FlightBatteryState"; protected static String DESCRIPTION = "Battery status information."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -166,4 +166,4 @@ public class FlightBatteryState extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightPlanControl.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightPlanControl.java index cdea28a0f..353531e97 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightPlanControl.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightPlanControl.java @@ -112,7 +112,7 @@ public class FlightPlanControl extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { FlightPlanControl obj = new FlightPlanControl(); @@ -126,13 +126,13 @@ public class FlightPlanControl extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public FlightPlanControl GetInstance(UAVObjectManager objMngr, int instID) + public FlightPlanControl GetInstance(UAVObjectManager objMngr, long instID) { return (FlightPlanControl)(objMngr.getObject(FlightPlanControl.OBJID, instID)); } // Constants - protected static final int OBJID = 0x53E3F180; + protected static final long OBJID = 0x53E3F180; protected static final String NAME = "FlightPlanControl"; protected static String DESCRIPTION = "Control the flight plan script"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -140,4 +140,4 @@ public class FlightPlanControl extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightPlanSettings.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightPlanSettings.java index 184bbd1b7..b7a8955fd 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightPlanSettings.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightPlanSettings.java @@ -108,7 +108,7 @@ public class FlightPlanSettings extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { FlightPlanSettings obj = new FlightPlanSettings(); @@ -122,13 +122,13 @@ public class FlightPlanSettings extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public FlightPlanSettings GetInstance(UAVObjectManager objMngr, int instID) + public FlightPlanSettings GetInstance(UAVObjectManager objMngr, long instID) { return (FlightPlanSettings)(objMngr.getObject(FlightPlanSettings.OBJID, instID)); } // Constants - protected static final int OBJID = 0x92E9FF76; + protected static final long OBJID = 0x92E9FF76; protected static final String NAME = "FlightPlanSettings"; protected static String DESCRIPTION = "Settings for the flight plan module, control the execution of the script"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -136,4 +136,4 @@ public class FlightPlanSettings extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightPlanStatus.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightPlanStatus.java index 8aa152789..ea5d0bec4 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightPlanStatus.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightPlanStatus.java @@ -152,7 +152,7 @@ public class FlightPlanStatus extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { FlightPlanStatus obj = new FlightPlanStatus(); @@ -166,13 +166,13 @@ public class FlightPlanStatus extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public FlightPlanStatus GetInstance(UAVObjectManager objMngr, int instID) + public FlightPlanStatus GetInstance(UAVObjectManager objMngr, long instID) { return (FlightPlanStatus)(objMngr.getObject(FlightPlanStatus.OBJID, instID)); } // Constants - protected static final int OBJID = 0x2206EE46; + protected static final long OBJID = 0x2206EE46; protected static final String NAME = "FlightPlanStatus"; protected static String DESCRIPTION = "Status of the flight plan script"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -180,4 +180,4 @@ public class FlightPlanStatus extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightStatus.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightStatus.java index 38697e573..fe6bcdc8b 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightStatus.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightStatus.java @@ -126,7 +126,7 @@ public class FlightStatus extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { FlightStatus obj = new FlightStatus(); @@ -140,13 +140,13 @@ public class FlightStatus extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public FlightStatus GetInstance(UAVObjectManager objMngr, int instID) + public FlightStatus GetInstance(UAVObjectManager objMngr, long instID) { return (FlightStatus)(objMngr.getObject(FlightStatus.OBJID, instID)); } // Constants - protected static final int OBJID = 0x884FEF66; + protected static final long OBJID = 0x884FEF66; protected static final String NAME = "FlightStatus"; protected static String DESCRIPTION = "Contains major flight status information for other modules."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -154,4 +154,4 @@ public class FlightStatus extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightTelemetryStats.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightTelemetryStats.java index 3a042f52e..27e2ce394 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightTelemetryStats.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightTelemetryStats.java @@ -132,7 +132,7 @@ public class FlightTelemetryStats extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { FlightTelemetryStats obj = new FlightTelemetryStats(); @@ -146,13 +146,13 @@ public class FlightTelemetryStats extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public FlightTelemetryStats GetInstance(UAVObjectManager objMngr, int instID) + public FlightTelemetryStats GetInstance(UAVObjectManager objMngr, long instID) { return (FlightTelemetryStats)(objMngr.getObject(FlightTelemetryStats.OBJID, instID)); } // Constants - protected static final int OBJID = 0x2F7E2902; + protected static final long OBJID = 0x2F7E2902; protected static final String NAME = "FlightTelemetryStats"; protected static String DESCRIPTION = "Maintains the telemetry statistics from the OpenPilot flight computer."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -160,4 +160,4 @@ public class FlightTelemetryStats extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/GCSReceiver.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/GCSReceiver.java index 05fa87efb..28b88933a 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/GCSReceiver.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/GCSReceiver.java @@ -114,7 +114,7 @@ public class GCSReceiver extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { GCSReceiver obj = new GCSReceiver(); @@ -128,13 +128,13 @@ public class GCSReceiver extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public GCSReceiver GetInstance(UAVObjectManager objMngr, int instID) + public GCSReceiver GetInstance(UAVObjectManager objMngr, long instID) { return (GCSReceiver)(objMngr.getObject(GCSReceiver.OBJID, instID)); } // Constants - protected static final int OBJID = 0xCC7E1470; + protected static final long OBJID = 0xCC7E1470; protected static final String NAME = "GCSReceiver"; protected static String DESCRIPTION = "A receiver channel group carried over the telemetry link."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -142,4 +142,4 @@ public class GCSReceiver extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/GCSTelemetryStats.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/GCSTelemetryStats.java index 754272c8c..1bea3355b 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/GCSTelemetryStats.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/GCSTelemetryStats.java @@ -132,7 +132,7 @@ public class GCSTelemetryStats extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { GCSTelemetryStats obj = new GCSTelemetryStats(); @@ -146,13 +146,13 @@ public class GCSTelemetryStats extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public GCSTelemetryStats GetInstance(UAVObjectManager objMngr, int instID) + public GCSTelemetryStats GetInstance(UAVObjectManager objMngr, long instID) { return (GCSTelemetryStats)(objMngr.getObject(GCSTelemetryStats.OBJID, instID)); } // Constants - protected static final int OBJID = 0xABC72744; + protected static final long OBJID = 0xABC72744; protected static final String NAME = "GCSTelemetryStats"; protected static String DESCRIPTION = "The telemetry statistics from the ground computer"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -160,4 +160,4 @@ public class GCSTelemetryStats extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSPosition.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSPosition.java index c2c8544a9..d58b758a8 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSPosition.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSPosition.java @@ -152,7 +152,7 @@ public class GPSPosition extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { GPSPosition obj = new GPSPosition(); @@ -166,13 +166,13 @@ public class GPSPosition extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public GPSPosition GetInstance(UAVObjectManager objMngr, int instID) + public GPSPosition GetInstance(UAVObjectManager objMngr, long instID) { return (GPSPosition)(objMngr.getObject(GPSPosition.OBJID, instID)); } // Constants - protected static final int OBJID = 0xE2A323B6; + protected static final long OBJID = 0xE2A323B6; protected static final String NAME = "GPSPosition"; protected static String DESCRIPTION = "Raw GPS data from @ref GPSModule. Should only be used by @ref AHRSCommsModule."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -180,4 +180,4 @@ public class GPSPosition extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSSatellites.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSSatellites.java index 0f5b0161a..81b5be464 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSSatellites.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSSatellites.java @@ -183,7 +183,7 @@ public class GPSSatellites extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { GPSSatellites obj = new GPSSatellites(); @@ -197,13 +197,13 @@ public class GPSSatellites extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public GPSSatellites GetInstance(UAVObjectManager objMngr, int instID) + public GPSSatellites GetInstance(UAVObjectManager objMngr, long instID) { return (GPSSatellites)(objMngr.getObject(GPSSatellites.OBJID, instID)); } // Constants - protected static final int OBJID = 0x920D998; + protected static final long OBJID = 0x920D998; protected static final String NAME = "GPSSatellites"; protected static String DESCRIPTION = "Contains information about the GPS satellites in view from @ref GPSModule."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -211,4 +211,4 @@ public class GPSSatellites extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSSettings.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSSettings.java index f534fc89c..254543efb 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSSettings.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSSettings.java @@ -111,7 +111,7 @@ public class GPSSettings extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { GPSSettings obj = new GPSSettings(); @@ -125,13 +125,13 @@ public class GPSSettings extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public GPSSettings GetInstance(UAVObjectManager objMngr, int instID) + public GPSSettings GetInstance(UAVObjectManager objMngr, long instID) { return (GPSSettings)(objMngr.getObject(GPSSettings.OBJID, instID)); } // Constants - protected static final int OBJID = 0xAC5F6370; + protected static final long OBJID = 0xAC5F6370; protected static final String NAME = "GPSSettings"; protected static String DESCRIPTION = "Settings for the GPS"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -139,4 +139,4 @@ public class GPSSettings extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSTime.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSTime.java index 7095aa18e..0fa7dd6b8 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSTime.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSTime.java @@ -127,7 +127,7 @@ public class GPSTime extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { GPSTime obj = new GPSTime(); @@ -141,13 +141,13 @@ public class GPSTime extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public GPSTime GetInstance(UAVObjectManager objMngr, int instID) + public GPSTime GetInstance(UAVObjectManager objMngr, long instID) { return (GPSTime)(objMngr.getObject(GPSTime.OBJID, instID)); } // Constants - protected static final int OBJID = 0xD4478084; + protected static final long OBJID = 0xD4478084; protected static final String NAME = "GPSTime"; protected static String DESCRIPTION = "Contains the GPS time from @ref GPSModule. Required to compute the world magnetic model correctly when setting the home location."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -155,4 +155,4 @@ public class GPSTime extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSVelocity.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSVelocity.java index 2ce4a3c62..409f31b41 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSVelocity.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSVelocity.java @@ -115,7 +115,7 @@ public class GPSVelocity extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { GPSVelocity obj = new GPSVelocity(); @@ -129,13 +129,13 @@ public class GPSVelocity extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public GPSVelocity GetInstance(UAVObjectManager objMngr, int instID) + public GPSVelocity GetInstance(UAVObjectManager objMngr, long instID) { return (GPSVelocity)(objMngr.getObject(GPSVelocity.OBJID, instID)); } // Constants - protected static final int OBJID = 0x8245DC80; + protected static final long OBJID = 0x8245DC80; protected static final String NAME = "GPSVelocity"; protected static String DESCRIPTION = "Raw GPS data from @ref GPSModule."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -143,4 +143,4 @@ public class GPSVelocity extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/Gyros.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/Gyros.java index 5c960d2e6..176cab896 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/Gyros.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/Gyros.java @@ -119,7 +119,7 @@ public class Gyros extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { Gyros obj = new Gyros(); @@ -133,13 +133,13 @@ public class Gyros extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public Gyros GetInstance(UAVObjectManager objMngr, int instID) + public Gyros GetInstance(UAVObjectManager objMngr, long instID) { return (Gyros)(objMngr.getObject(Gyros.OBJID, instID)); } // Constants - protected static final int OBJID = 0x4228AF6; + protected static final long OBJID = 0x4228AF6; protected static final String NAME = "Gyros"; protected static String DESCRIPTION = "The gyro data."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -147,4 +147,4 @@ public class Gyros extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/GyrosBias.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/GyrosBias.java index 00bc7da2d..dbfd6b376 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/GyrosBias.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/GyrosBias.java @@ -115,7 +115,7 @@ public class GyrosBias extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { GyrosBias obj = new GyrosBias(); @@ -129,13 +129,13 @@ public class GyrosBias extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public GyrosBias GetInstance(UAVObjectManager objMngr, int instID) + public GyrosBias GetInstance(UAVObjectManager objMngr, long instID) { return (GyrosBias)(objMngr.getObject(GyrosBias.OBJID, instID)); } // Constants - protected static final int OBJID = 0xE4B6F980; + protected static final long OBJID = 0xE4B6F980; protected static final String NAME = "GyrosBias"; protected static String DESCRIPTION = "The gyro data."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -143,4 +143,4 @@ public class GyrosBias extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/HomeLocation.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/HomeLocation.java index 0cd45db1b..7ec829ddf 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/HomeLocation.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/HomeLocation.java @@ -140,7 +140,7 @@ public class HomeLocation extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { HomeLocation obj = new HomeLocation(); @@ -154,13 +154,13 @@ public class HomeLocation extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public HomeLocation GetInstance(UAVObjectManager objMngr, int instID) + public HomeLocation GetInstance(UAVObjectManager objMngr, long instID) { return (HomeLocation)(objMngr.getObject(HomeLocation.OBJID, instID)); } // Constants - protected static final int OBJID = 0x6185DC6E; + protected static final long OBJID = 0x6185DC6E; protected static final String NAME = "HomeLocation"; protected static String DESCRIPTION = "HomeLocation setting which contains the constants to tranlate from longitutde and latitude to NED reference frame. Automatically set by @ref GPSModule after acquiring a 3D lock. Used by @ref AHRSCommsModule."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -168,4 +168,4 @@ public class HomeLocation extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/HwSettings.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/HwSettings.java index 9d8113846..9dd7d0cce 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/HwSettings.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/HwSettings.java @@ -304,7 +304,7 @@ public class HwSettings extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { HwSettings obj = new HwSettings(); @@ -318,13 +318,13 @@ public class HwSettings extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public HwSettings GetInstance(UAVObjectManager objMngr, int instID) + public HwSettings GetInstance(UAVObjectManager objMngr, long instID) { return (HwSettings)(objMngr.getObject(HwSettings.OBJID, instID)); } // Constants - protected static final int OBJID = 0x5D950E50; + protected static final long OBJID = 0x5D950E50; protected static final String NAME = "HwSettings"; protected static String DESCRIPTION = "Selection of optional hardware configurations."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -332,4 +332,4 @@ public class HwSettings extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/I2CStats.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/I2CStats.java index a09e4404d..41e4f91ab 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/I2CStats.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/I2CStats.java @@ -206,7 +206,7 @@ public class I2CStats extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { I2CStats obj = new I2CStats(); @@ -220,13 +220,13 @@ public class I2CStats extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public I2CStats GetInstance(UAVObjectManager objMngr, int instID) + public I2CStats GetInstance(UAVObjectManager objMngr, long instID) { return (I2CStats)(objMngr.getObject(I2CStats.OBJID, instID)); } // Constants - protected static final int OBJID = 0xB714823E; + protected static final long OBJID = 0xB714823E; protected static final String NAME = "I2CStats"; protected static String DESCRIPTION = "Tracks statistics on the I2C bus."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -234,4 +234,4 @@ public class I2CStats extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/MagBias.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/MagBias.java index 398f455d5..e7c97c33c 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/MagBias.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/MagBias.java @@ -115,7 +115,7 @@ public class MagBias extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { MagBias obj = new MagBias(); @@ -129,13 +129,13 @@ public class MagBias extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public MagBias GetInstance(UAVObjectManager objMngr, int instID) + public MagBias GetInstance(UAVObjectManager objMngr, long instID) { return (MagBias)(objMngr.getObject(MagBias.OBJID, instID)); } // Constants - protected static final int OBJID = 0x5043E510; + protected static final long OBJID = 0x5043E510; protected static final String NAME = "MagBias"; protected static String DESCRIPTION = "The gyro data."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -143,4 +143,4 @@ public class MagBias extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/Magnetometer.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/Magnetometer.java index 583817cca..554c4bb69 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/Magnetometer.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/Magnetometer.java @@ -115,7 +115,7 @@ public class Magnetometer extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { Magnetometer obj = new Magnetometer(); @@ -129,13 +129,13 @@ public class Magnetometer extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public Magnetometer GetInstance(UAVObjectManager objMngr, int instID) + public Magnetometer GetInstance(UAVObjectManager objMngr, long instID) { return (Magnetometer)(objMngr.getObject(Magnetometer.OBJID, instID)); } // Constants - protected static final int OBJID = 0x813B55DE; + protected static final long OBJID = 0x813B55DE; protected static final String NAME = "Magnetometer"; protected static String DESCRIPTION = "The mag data."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -143,4 +143,4 @@ public class Magnetometer extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlCommand.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlCommand.java index 5ce51c245..d48ac310c 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlCommand.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlCommand.java @@ -142,7 +142,7 @@ public class ManualControlCommand extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { ManualControlCommand obj = new ManualControlCommand(); @@ -156,13 +156,13 @@ public class ManualControlCommand extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public ManualControlCommand GetInstance(UAVObjectManager objMngr, int instID) + public ManualControlCommand GetInstance(UAVObjectManager objMngr, long instID) { return (ManualControlCommand)(objMngr.getObject(ManualControlCommand.OBJID, instID)); } // Constants - protected static final int OBJID = 0x1E82C2D2; + protected static final long OBJID = 0x1E82C2D2; protected static final String NAME = "ManualControlCommand"; protected static String DESCRIPTION = "The output from the @ref ManualControlModule which descodes the receiver inputs. Overriden by GCS for fly-by-wire control."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -170,4 +170,4 @@ public class ManualControlCommand extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java index 47ebbc230..afa4cfcde 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java @@ -321,7 +321,7 @@ public class ManualControlSettings extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { ManualControlSettings obj = new ManualControlSettings(); @@ -335,13 +335,13 @@ public class ManualControlSettings extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public ManualControlSettings GetInstance(UAVObjectManager objMngr, int instID) + public ManualControlSettings GetInstance(UAVObjectManager objMngr, long instID) { return (ManualControlSettings)(objMngr.getObject(ManualControlSettings.OBJID, instID)); } // Constants - protected static final int OBJID = 0x6C188320; + protected static final long OBJID = 0x6C188320; 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 == 1; @@ -349,4 +349,4 @@ public class ManualControlSettings extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/MixerSettings.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/MixerSettings.java index 094d91545..d52b39448 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/MixerSettings.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/MixerSettings.java @@ -476,7 +476,7 @@ public class MixerSettings extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { MixerSettings obj = new MixerSettings(); @@ -490,13 +490,13 @@ public class MixerSettings extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public MixerSettings GetInstance(UAVObjectManager objMngr, int instID) + public MixerSettings GetInstance(UAVObjectManager objMngr, long instID) { return (MixerSettings)(objMngr.getObject(MixerSettings.OBJID, instID)); } // Constants - protected static final int OBJID = 0x5D16D6C4; + protected static final long OBJID = 0x5D16D6C4; protected static final String NAME = "MixerSettings"; protected static String DESCRIPTION = "Settings for the @ref ActuatorModule that controls the channel assignments for the mixer based on AircraftType"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -504,4 +504,4 @@ public class MixerSettings extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/MixerStatus.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/MixerStatus.java index 1f767c5ba..b0f2692af 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/MixerStatus.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/MixerStatus.java @@ -143,7 +143,7 @@ public class MixerStatus extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { MixerStatus obj = new MixerStatus(); @@ -157,13 +157,13 @@ public class MixerStatus extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public MixerStatus GetInstance(UAVObjectManager objMngr, int instID) + public MixerStatus GetInstance(UAVObjectManager objMngr, long instID) { return (MixerStatus)(objMngr.getObject(MixerStatus.OBJID, instID)); } // Constants - protected static final int OBJID = 0x124E28A; + protected static final long OBJID = 0x124E28A; protected static final String NAME = "MixerStatus"; protected static String DESCRIPTION = "Status for the matrix mixer showing the output of each mixer after all scaling"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -171,4 +171,4 @@ public class MixerStatus extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/NEDPosition.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/NEDPosition.java index 0aa67862e..8a46a0025 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/NEDPosition.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/NEDPosition.java @@ -115,7 +115,7 @@ public class NEDPosition extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { NEDPosition obj = new NEDPosition(); @@ -129,13 +129,13 @@ public class NEDPosition extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public NEDPosition GetInstance(UAVObjectManager objMngr, int instID) + public NEDPosition GetInstance(UAVObjectManager objMngr, long instID) { return (NEDPosition)(objMngr.getObject(NEDPosition.OBJID, instID)); } // Constants - protected static final int OBJID = 0x1FB15A00; + protected static final long OBJID = 0x1FB15A00; protected static final String NAME = "NEDPosition"; protected static String DESCRIPTION = "Contains the current position relative to @ref HomeLocation"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -143,4 +143,4 @@ public class NEDPosition extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/NedAccel.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/NedAccel.java index 6d09a799e..972d81e3c 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/NedAccel.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/NedAccel.java @@ -115,7 +115,7 @@ public class NedAccel extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { NedAccel obj = new NedAccel(); @@ -129,13 +129,13 @@ public class NedAccel extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public NedAccel GetInstance(UAVObjectManager objMngr, int instID) + public NedAccel GetInstance(UAVObjectManager objMngr, long instID) { return (NedAccel)(objMngr.getObject(NedAccel.OBJID, instID)); } // Constants - protected static final int OBJID = 0x7C7F5BC0; + protected static final long OBJID = 0x7C7F5BC0; protected static final String NAME = "NedAccel"; protected static String DESCRIPTION = "The projection of acceleration in the NED reference frame used by @ref Guidance."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -143,4 +143,4 @@ public class NedAccel extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/ObjectPersistence.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/ObjectPersistence.java index 42a65e3ab..8790ff8b8 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/ObjectPersistence.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/ObjectPersistence.java @@ -132,7 +132,7 @@ public class ObjectPersistence extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { ObjectPersistence obj = new ObjectPersistence(); @@ -146,13 +146,13 @@ public class ObjectPersistence extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public ObjectPersistence GetInstance(UAVObjectManager objMngr, int instID) + public ObjectPersistence GetInstance(UAVObjectManager objMngr, long instID) { return (ObjectPersistence)(objMngr.getObject(ObjectPersistence.OBJID, instID)); } // Constants - protected static final int OBJID = 0x99C63292; + protected static final long OBJID = 0x99C63292; protected static final String NAME = "ObjectPersistence"; protected static String DESCRIPTION = "Someone who knows please enter this"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -160,4 +160,4 @@ public class ObjectPersistence extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/OveroSyncSettings.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/OveroSyncSettings.java index c680d230c..12048f0a3 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/OveroSyncSettings.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/OveroSyncSettings.java @@ -112,7 +112,7 @@ public class OveroSyncSettings extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { OveroSyncSettings obj = new OveroSyncSettings(); @@ -126,13 +126,13 @@ public class OveroSyncSettings extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public OveroSyncSettings GetInstance(UAVObjectManager objMngr, int instID) + public OveroSyncSettings GetInstance(UAVObjectManager objMngr, long instID) { return (OveroSyncSettings)(objMngr.getObject(OveroSyncSettings.OBJID, instID)); } // Constants - protected static final int OBJID = 0xA1ABC278; + protected static final long OBJID = 0xA1ABC278; protected static final String NAME = "OveroSyncSettings"; protected static String DESCRIPTION = "Settings to control the behavior of the overo sync module"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -140,4 +140,4 @@ public class OveroSyncSettings extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/OveroSyncStats.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/OveroSyncStats.java index 4c31f21dd..380388118 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/OveroSyncStats.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/OveroSyncStats.java @@ -134,7 +134,7 @@ public class OveroSyncStats extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { OveroSyncStats obj = new OveroSyncStats(); @@ -148,13 +148,13 @@ public class OveroSyncStats extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public OveroSyncStats GetInstance(UAVObjectManager objMngr, int instID) + public OveroSyncStats GetInstance(UAVObjectManager objMngr, long instID) { return (OveroSyncStats)(objMngr.getObject(OveroSyncStats.OBJID, instID)); } // Constants - protected static final int OBJID = 0xD2085FAC; + protected static final long OBJID = 0xD2085FAC; protected static final String NAME = "OveroSyncStats"; protected static String DESCRIPTION = "Maintains statistics on transfer rate to and from over"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -162,4 +162,4 @@ public class OveroSyncStats extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/PathDesired.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/PathDesired.java index 38e710477..f430f0f4b 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/PathDesired.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/PathDesired.java @@ -131,7 +131,7 @@ public class PathDesired extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { PathDesired obj = new PathDesired(); @@ -145,13 +145,13 @@ public class PathDesired extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public PathDesired GetInstance(UAVObjectManager objMngr, int instID) + public PathDesired GetInstance(UAVObjectManager objMngr, long instID) { return (PathDesired)(objMngr.getObject(PathDesired.OBJID, instID)); } // Constants - protected static final int OBJID = 0x5A4DC71A; + protected static final long OBJID = 0x5A4DC71A; protected static final String NAME = "PathDesired"; protected static String DESCRIPTION = "The endpoint or path the craft is trying to achieve. Can come from @ref ManualControl or @ref PathPlanner "; protected static final boolean ISSINGLEINST = 1 == 1; @@ -159,4 +159,4 @@ public class PathDesired extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/PathPlannerSettings.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/PathPlannerSettings.java index fb6b66e19..c842559f0 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/PathPlannerSettings.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/PathPlannerSettings.java @@ -120,7 +120,7 @@ public class PathPlannerSettings extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { PathPlannerSettings obj = new PathPlannerSettings(); @@ -134,13 +134,13 @@ public class PathPlannerSettings extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public PathPlannerSettings GetInstance(UAVObjectManager objMngr, int instID) + public PathPlannerSettings GetInstance(UAVObjectManager objMngr, long instID) { return (PathPlannerSettings)(objMngr.getObject(PathPlannerSettings.OBJID, instID)); } // Constants - protected static final int OBJID = 0x290E45DA; + protected static final long OBJID = 0x290E45DA; protected static final String NAME = "PathPlannerSettings"; protected static String DESCRIPTION = "Settings for the @ref PathPlanner Module"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -148,4 +148,4 @@ public class PathPlannerSettings extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXSettings.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXSettings.java index aa5387148..f9dfa5723 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXSettings.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXSettings.java @@ -295,7 +295,7 @@ public class PipXSettings extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { PipXSettings obj = new PipXSettings(); @@ -309,13 +309,13 @@ public class PipXSettings extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public PipXSettings GetInstance(UAVObjectManager objMngr, int instID) + public PipXSettings GetInstance(UAVObjectManager objMngr, long instID) { return (PipXSettings)(objMngr.getObject(PipXSettings.OBJID, instID)); } // Constants - protected static final int OBJID = 0xBA192BCA; + protected static final long OBJID = 0xBA192BCA; protected static final String NAME = "PipXSettings"; protected static String DESCRIPTION = "PipXtreme configurations options."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -323,4 +323,4 @@ public class PipXSettings extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXStatus.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXStatus.java index fb6a91e33..efa9035f7 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXStatus.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXStatus.java @@ -270,7 +270,7 @@ public class PipXStatus extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { PipXStatus obj = new PipXStatus(); @@ -284,13 +284,13 @@ public class PipXStatus extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public PipXStatus GetInstance(UAVObjectManager objMngr, int instID) + public PipXStatus GetInstance(UAVObjectManager objMngr, long instID) { return (PipXStatus)(objMngr.getObject(PipXStatus.OBJID, instID)); } // Constants - protected static final int OBJID = 0x3FC68A86; + protected static final long OBJID = 0x3FC68A86; protected static final String NAME = "PipXStatus"; protected static String DESCRIPTION = "PipXtreme device status."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -298,4 +298,4 @@ public class PipXStatus extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/PositionActual.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/PositionActual.java index 1c87c21c3..38b308c16 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/PositionActual.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/PositionActual.java @@ -115,7 +115,7 @@ public class PositionActual extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { PositionActual obj = new PositionActual(); @@ -129,13 +129,13 @@ public class PositionActual extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public PositionActual GetInstance(UAVObjectManager objMngr, int instID) + public PositionActual GetInstance(UAVObjectManager objMngr, long instID) { return (PositionActual)(objMngr.getObject(PositionActual.OBJID, instID)); } // Constants - protected static final int OBJID = 0xFA9E2D42; + protected static final long OBJID = 0xFA9E2D42; protected static final String NAME = "PositionActual"; protected static String DESCRIPTION = "Contains the current position relative to @ref HomeLocation"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -143,4 +143,4 @@ public class PositionActual extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/RateDesired.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/RateDesired.java index 51f7faa7d..8ed278a4f 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/RateDesired.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/RateDesired.java @@ -115,7 +115,7 @@ public class RateDesired extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { RateDesired obj = new RateDesired(); @@ -129,13 +129,13 @@ public class RateDesired extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public RateDesired GetInstance(UAVObjectManager objMngr, int instID) + public RateDesired GetInstance(UAVObjectManager objMngr, long instID) { return (RateDesired)(objMngr.getObject(RateDesired.OBJID, instID)); } // Constants - protected static final int OBJID = 0xCE8C826; + protected static final long OBJID = 0xCE8C826; protected static final String NAME = "RateDesired"; protected static String DESCRIPTION = "Status for the matrix mixer showing the output of each mixer after all scaling"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -143,4 +143,4 @@ public class RateDesired extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/ReceiverActivity.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/ReceiverActivity.java index 15391ce71..be7523ce0 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/ReceiverActivity.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/ReceiverActivity.java @@ -121,7 +121,7 @@ public class ReceiverActivity extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { ReceiverActivity obj = new ReceiverActivity(); @@ -135,13 +135,13 @@ public class ReceiverActivity extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public ReceiverActivity GetInstance(UAVObjectManager objMngr, int instID) + public ReceiverActivity GetInstance(UAVObjectManager objMngr, long instID) { return (ReceiverActivity)(objMngr.getObject(ReceiverActivity.OBJID, instID)); } // Constants - protected static final int OBJID = 0x1E7C53DA; + protected static final long OBJID = 0x1E7C53DA; protected static final String NAME = "ReceiverActivity"; protected static String DESCRIPTION = "Monitors which receiver channels have been active within the last second."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -149,4 +149,4 @@ public class ReceiverActivity extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/RevoCalibration.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/RevoCalibration.java index 940f78875..d583feb19 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/RevoCalibration.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/RevoCalibration.java @@ -218,7 +218,7 @@ public class RevoCalibration extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { RevoCalibration obj = new RevoCalibration(); @@ -232,13 +232,13 @@ public class RevoCalibration extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public RevoCalibration GetInstance(UAVObjectManager objMngr, int instID) + public RevoCalibration GetInstance(UAVObjectManager objMngr, long instID) { return (RevoCalibration)(objMngr.getObject(RevoCalibration.OBJID, instID)); } // Constants - protected static final int OBJID = 0xA2A63C7C; + protected static final long OBJID = 0xA2A63C7C; protected static final String NAME = "RevoCalibration"; protected static String DESCRIPTION = "Settings for the INS to control the algorithm and what is updated"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -246,4 +246,4 @@ public class RevoCalibration extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/RevoSettings.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/RevoSettings.java index 5e36565b2..00d1275a4 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/RevoSettings.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/RevoSettings.java @@ -112,7 +112,7 @@ public class RevoSettings extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { RevoSettings obj = new RevoSettings(); @@ -126,13 +126,13 @@ public class RevoSettings extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public RevoSettings GetInstance(UAVObjectManager objMngr, int instID) + public RevoSettings GetInstance(UAVObjectManager objMngr, long instID) { return (RevoSettings)(objMngr.getObject(RevoSettings.OBJID, instID)); } // Constants - protected static final int OBJID = 0xE2DA70EA; + protected static final long OBJID = 0xE2DA70EA; protected static final String NAME = "RevoSettings"; protected static String DESCRIPTION = "Settings for the revo to control the algorithm and what is updated"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -140,4 +140,4 @@ public class RevoSettings extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/SonarAltitude.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/SonarAltitude.java index 1a5679d6a..c7498d4fe 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/SonarAltitude.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/SonarAltitude.java @@ -107,7 +107,7 @@ public class SonarAltitude extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { SonarAltitude obj = new SonarAltitude(); @@ -121,13 +121,13 @@ public class SonarAltitude extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public SonarAltitude GetInstance(UAVObjectManager objMngr, int instID) + public SonarAltitude GetInstance(UAVObjectManager objMngr, long instID) { return (SonarAltitude)(objMngr.getObject(SonarAltitude.OBJID, instID)); } // Constants - protected static final int OBJID = 0x6C5A0CBC; + protected static final long OBJID = 0x6C5A0CBC; protected static final String NAME = "SonarAltitude"; protected static String DESCRIPTION = "The raw data from the ultrasound sonar sensor with altitude estimate."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -135,4 +135,4 @@ public class SonarAltitude extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/StabilizationDesired.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/StabilizationDesired.java index 8ca5df722..be812d268 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/StabilizationDesired.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/StabilizationDesired.java @@ -132,7 +132,7 @@ public class StabilizationDesired extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { StabilizationDesired obj = new StabilizationDesired(); @@ -146,13 +146,13 @@ public class StabilizationDesired extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public StabilizationDesired GetInstance(UAVObjectManager objMngr, int instID) + public StabilizationDesired GetInstance(UAVObjectManager objMngr, long instID) { return (StabilizationDesired)(objMngr.getObject(StabilizationDesired.OBJID, instID)); } // Constants - protected static final int OBJID = 0xDE1EAAD6; + protected static final long OBJID = 0xDE1EAAD6; protected static final String NAME = "StabilizationDesired"; protected static String DESCRIPTION = "The desired attitude that @ref StabilizationModule will try and achieve if FlightMode is Stabilized. Comes from @ref ManaulControlModule."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -160,4 +160,4 @@ public class StabilizationDesired extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/StabilizationSettings.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/StabilizationSettings.java index cc2c69e8f..a2244e681 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/StabilizationSettings.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/StabilizationSettings.java @@ -282,7 +282,7 @@ public class StabilizationSettings extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { StabilizationSettings obj = new StabilizationSettings(); @@ -296,13 +296,13 @@ public class StabilizationSettings extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public StabilizationSettings GetInstance(UAVObjectManager objMngr, int instID) + public StabilizationSettings GetInstance(UAVObjectManager objMngr, long instID) { return (StabilizationSettings)(objMngr.getObject(StabilizationSettings.OBJID, instID)); } // Constants - protected static final int OBJID = 0xBBC337D4; + protected static final long OBJID = 0xBBC337D4; protected static final String NAME = "StabilizationSettings"; protected static String DESCRIPTION = "PID settings used by the Stabilization module to combine the @ref AttitudeActual and @ref AttitudeDesired to compute @ref ActuatorDesired"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -310,4 +310,4 @@ public class StabilizationSettings extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemAlarms.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemAlarms.java index 3b34763fe..a6d22d5d2 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemAlarms.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemAlarms.java @@ -146,7 +146,7 @@ public class SystemAlarms extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { SystemAlarms obj = new SystemAlarms(); @@ -160,13 +160,13 @@ public class SystemAlarms extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public SystemAlarms GetInstance(UAVObjectManager objMngr, int instID) + public SystemAlarms GetInstance(UAVObjectManager objMngr, long instID) { return (SystemAlarms)(objMngr.getObject(SystemAlarms.OBJID, instID)); } // Constants - protected static final int OBJID = 0x737ADCF2; + protected static final long OBJID = 0x737ADCF2; protected static final String NAME = "SystemAlarms"; protected static String DESCRIPTION = "Alarms from OpenPilot to indicate failure conditions or warnings. Set by various modules."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -174,4 +174,4 @@ public class SystemAlarms extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemSettings.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemSettings.java index bffbced31..5005b1485 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemSettings.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemSettings.java @@ -139,7 +139,7 @@ public class SystemSettings extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { SystemSettings obj = new SystemSettings(); @@ -153,13 +153,13 @@ public class SystemSettings extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public SystemSettings GetInstance(UAVObjectManager objMngr, int instID) + public SystemSettings GetInstance(UAVObjectManager objMngr, long instID) { return (SystemSettings)(objMngr.getObject(SystemSettings.OBJID, instID)); } // Constants - protected static final int OBJID = 0xC72A326E; + protected static final long OBJID = 0xC72A326E; protected static final String NAME = "SystemSettings"; protected static String DESCRIPTION = "Select airframe type. Currently used by @ref ActuatorModule to choose mixing from @ref ActuatorDesired to @ref ActuatorCommand"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -167,4 +167,4 @@ public class SystemSettings extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemStats.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemStats.java index 888474261..1d35e219e 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemStats.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemStats.java @@ -135,7 +135,7 @@ public class SystemStats extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { SystemStats obj = new SystemStats(); @@ -149,13 +149,13 @@ public class SystemStats extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public SystemStats GetInstance(UAVObjectManager objMngr, int instID) + public SystemStats GetInstance(UAVObjectManager objMngr, long instID) { return (SystemStats)(objMngr.getObject(SystemStats.OBJID, instID)); } // Constants - protected static final int OBJID = 0x364D1406; + protected static final long OBJID = 0x364D1406; protected static final String NAME = "SystemStats"; protected static String DESCRIPTION = "CPU and memory usage from OpenPilot computer. "; protected static final boolean ISSINGLEINST = 1 == 1; @@ -163,4 +163,4 @@ public class SystemStats extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/TaskInfo.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/TaskInfo.java index 9f530e6a9..291a21708 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/TaskInfo.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/TaskInfo.java @@ -172,7 +172,7 @@ public class TaskInfo extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { TaskInfo obj = new TaskInfo(); @@ -186,13 +186,13 @@ public class TaskInfo extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public TaskInfo GetInstance(UAVObjectManager objMngr, int instID) + public TaskInfo GetInstance(UAVObjectManager objMngr, long instID) { return (TaskInfo)(objMngr.getObject(TaskInfo.OBJID, instID)); } // Constants - protected static final int OBJID = 0xB81CD2AE; + protected static final long OBJID = 0xB81CD2AE; protected static final String NAME = "TaskInfo"; protected static String DESCRIPTION = "Task information"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -200,4 +200,4 @@ public class TaskInfo extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/TxPIDSettings.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/TxPIDSettings.java index 789f31b3f..656676278 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/TxPIDSettings.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/TxPIDSettings.java @@ -194,7 +194,7 @@ public class TxPIDSettings extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { TxPIDSettings obj = new TxPIDSettings(); @@ -208,13 +208,13 @@ public class TxPIDSettings extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public TxPIDSettings GetInstance(UAVObjectManager objMngr, int instID) + public TxPIDSettings GetInstance(UAVObjectManager objMngr, long instID) { return (TxPIDSettings)(objMngr.getObject(TxPIDSettings.OBJID, instID)); } // Constants - protected static final int OBJID = 0x42B2D2AE; + protected static final long OBJID = 0x42B2D2AE; protected static final String NAME = "TxPIDSettings"; protected static String DESCRIPTION = "Settings used by @ref TxPID optional module to tune PID settings using R/C transmitter"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -222,4 +222,4 @@ public class TxPIDSettings extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/VelocityActual.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/VelocityActual.java index a545bca16..89f4475c0 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/VelocityActual.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/VelocityActual.java @@ -115,7 +115,7 @@ public class VelocityActual extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { VelocityActual obj = new VelocityActual(); @@ -129,13 +129,13 @@ public class VelocityActual extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public VelocityActual GetInstance(UAVObjectManager objMngr, int instID) + public VelocityActual GetInstance(UAVObjectManager objMngr, long instID) { return (VelocityActual)(objMngr.getObject(VelocityActual.OBJID, instID)); } // Constants - protected static final int OBJID = 0x5A08F61A; + protected static final long OBJID = 0x5A08F61A; protected static final String NAME = "VelocityActual"; protected static String DESCRIPTION = "Updated by @ref AHRSCommsModule and used within @ref GuidanceModule for velocity control"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -143,4 +143,4 @@ public class VelocityActual extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/VelocityDesired.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/VelocityDesired.java index f506a594c..57665e43e 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/VelocityDesired.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/VelocityDesired.java @@ -115,7 +115,7 @@ public class VelocityDesired extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { VelocityDesired obj = new VelocityDesired(); @@ -129,13 +129,13 @@ public class VelocityDesired extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public VelocityDesired GetInstance(UAVObjectManager objMngr, int instID) + public VelocityDesired GetInstance(UAVObjectManager objMngr, long instID) { return (VelocityDesired)(objMngr.getObject(VelocityDesired.OBJID, instID)); } // Constants - protected static final int OBJID = 0x9E946992; + protected static final long OBJID = 0x9E946992; protected static final String NAME = "VelocityDesired"; protected static String DESCRIPTION = "Used within @ref GuidanceModule to communicate between the task computing the desired velocity and the PID loop to achieve it (running at different rates)."; protected static final boolean ISSINGLEINST = 1 == 1; @@ -143,4 +143,4 @@ public class VelocityDesired extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/VtolPathFollowerSettings.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/VtolPathFollowerSettings.java index b3c01dc8a..698164646 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/VtolPathFollowerSettings.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/VtolPathFollowerSettings.java @@ -201,7 +201,7 @@ public class VtolPathFollowerSettings extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { VtolPathFollowerSettings obj = new VtolPathFollowerSettings(); @@ -215,13 +215,13 @@ public class VtolPathFollowerSettings extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public VtolPathFollowerSettings GetInstance(UAVObjectManager objMngr, int instID) + public VtolPathFollowerSettings GetInstance(UAVObjectManager objMngr, long instID) { return (VtolPathFollowerSettings)(objMngr.getObject(VtolPathFollowerSettings.OBJID, instID)); } // Constants - protected static final int OBJID = 0x973991F6; + protected static final long OBJID = 0x973991F6; protected static final String NAME = "VtolPathFollowerSettings"; protected static String DESCRIPTION = "Settings for the @ref VtolPathFollower module"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -229,4 +229,4 @@ public class VtolPathFollowerSettings extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/WatchdogStatus.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/WatchdogStatus.java index 94e85f57b..930c74536 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/WatchdogStatus.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/WatchdogStatus.java @@ -111,7 +111,7 @@ public class WatchdogStatus extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { WatchdogStatus obj = new WatchdogStatus(); @@ -125,13 +125,13 @@ public class WatchdogStatus extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public WatchdogStatus GetInstance(UAVObjectManager objMngr, int instID) + public WatchdogStatus GetInstance(UAVObjectManager objMngr, long instID) { return (WatchdogStatus)(objMngr.getObject(WatchdogStatus.OBJID, instID)); } // Constants - protected static final int OBJID = 0xA207FA7C; + protected static final long OBJID = 0xA207FA7C; protected static final String NAME = "WatchdogStatus"; protected static String DESCRIPTION = "For monitoring the flags in the watchdog and especially the bootup flags"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -139,4 +139,4 @@ public class WatchdogStatus extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/Waypoint.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/Waypoint.java index 4db7179ad..f774990cd 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/Waypoint.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/Waypoint.java @@ -128,7 +128,7 @@ public class Waypoint extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { Waypoint obj = new Waypoint(); @@ -142,13 +142,13 @@ public class Waypoint extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public Waypoint GetInstance(UAVObjectManager objMngr, int instID) + public Waypoint GetInstance(UAVObjectManager objMngr, long instID) { return (Waypoint)(objMngr.getObject(Waypoint.OBJID, instID)); } // Constants - protected static final int OBJID = 0x338C5F90; + protected static final long OBJID = 0x338C5F90; protected static final String NAME = "Waypoint"; protected static String DESCRIPTION = "A waypoint the aircraft can try and hit. Used by the @ref PathPlanner module"; protected static final boolean ISSINGLEINST = 0 == 1; @@ -156,4 +156,4 @@ public class Waypoint extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/androidgcs/src/org/openpilot/uavtalk/uavobjects/WaypointActive.java b/androidgcs/src/org/openpilot/uavtalk/uavobjects/WaypointActive.java index 06f3ab6c4..3096b571e 100644 --- a/androidgcs/src/org/openpilot/uavtalk/uavobjects/WaypointActive.java +++ b/androidgcs/src/org/openpilot/uavtalk/uavobjects/WaypointActive.java @@ -107,7 +107,7 @@ public class WaypointActive extends UAVDataObject { * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { WaypointActive obj = new WaypointActive(); @@ -121,13 +121,13 @@ public class WaypointActive extends UAVDataObject { /** * Static function to retrieve an instance of the object. */ - public WaypointActive GetInstance(UAVObjectManager objMngr, int instID) + public WaypointActive GetInstance(UAVObjectManager objMngr, long instID) { return (WaypointActive)(objMngr.getObject(WaypointActive.OBJID, instID)); } // Constants - protected static final int OBJID = 0x1EA5B192; + protected static final long OBJID = 0x1EA5B192; protected static final String NAME = "WaypointActive"; protected static String DESCRIPTION = "Indicates the currently active waypoint"; protected static final boolean ISSINGLEINST = 1 == 1; @@ -135,4 +135,4 @@ public class WaypointActive extends UAVDataObject { protected static int NUMBYTES = 0; -} \ No newline at end of file +} diff --git a/ground/openpilotgcs/src/libs/juavobjects/templates/uavobjecttemplate.java b/ground/openpilotgcs/src/libs/juavobjects/templates/uavobjecttemplate.java index 1283f03cb..6a2f31408 100644 --- a/ground/openpilotgcs/src/libs/juavobjects/templates/uavobjecttemplate.java +++ b/ground/openpilotgcs/src/libs/juavobjects/templates/uavobjecttemplate.java @@ -103,7 +103,7 @@ $(INITFIELDS) * Do not use this function directly to create new instances, the * UAVObjectManager should be used instead. */ - public UAVDataObject clone(int instID) { + public UAVDataObject clone(long instID) { // TODO: Need to get specific instance to clone try { $(NAME) obj = new $(NAME)(); @@ -117,13 +117,13 @@ $(INITFIELDS) /** * Static function to retrieve an instance of the object. */ - public $(NAME) GetInstance(UAVObjectManager objMngr, int instID) + public $(NAME) GetInstance(UAVObjectManager objMngr, long instID) { return ($(NAME))(objMngr.getObject($(NAME).OBJID, instID)); } // Constants - protected static final int OBJID = $(OBJIDHEX); + protected static final long OBJID = $(OBJIDHEX); protected static final String NAME = "$(NAME)"; protected static String DESCRIPTION = "$(DESCRIPTION)"; protected static final boolean ISSINGLEINST = $(ISSINGLEINST) == 1; @@ -131,4 +131,4 @@ $(INITFIELDS) protected static int NUMBYTES = 0; -} \ No newline at end of file +}