AndroidGCS: Make sure the rest of the UAVO IDs are working as positive long

values instead of ints.

androidgcs/src/org/openpilot/uavtalk/UAVTalk.java

@@ -12,7 +12,7 @@ import android.util.Log;
 public class UAVTalk extends Observable {
 
 	static final String TAG = "UAVTalk";
-	public static int LOGLEVEL = 0;
+	public static int LOGLEVEL = -1;
 	public static boolean WARN = LOGLEVEL > 1;
 	public static boolean DEBUG = LOGLEVEL > 0;
 
@@ -107,8 +107,8 @@ public class UAVTalk extends Observable {
 	ByteBuffer rxTmpBuffer /* 4 */;
 	ByteBuffer rxBuffer;
 	int rxType;
-	int rxObjId;
+	long rxObjId;
-	int rxInstId;
+	long rxInstId;
 	int rxLength;
 	int rxPacketLength;
 
@@ -343,9 +343,13 @@ public class UAVTalk extends Observable {
 
 			// Search for object, if not found reset state machine
 			rxObjId = rxTmpBuffer.getInt(0);
+			// Because java treats ints as only signed we need to do this manually
+			if (rxObjId < 0) 
+				rxObjId = 0x100000000l + rxObjId;
 			{
 				UAVObject rxObj = objMngr.getObject(rxObjId);
 				if (rxObj == null) {
+					Log.d(TAG, "Unknown ID: " + rxObjId);
 					stats.rxErrors++;
 					rxState = RxStateType.STATE_SYNC;
 					break;
@@ -475,8 +479,10 @@ public class UAVTalk extends Observable {
 	 * for all instances. \param[in] data Data buffer \param[in] length Buffer
 	 * length \return Success (true), Failure (false)
 	 */
-	public boolean receiveObject(int type, int objId, int instId,
+	public boolean receiveObject(int type, long objId, long instId,
 			ByteBuffer data) {
+		
+		if (DEBUG) Log.d(TAG, "Received object ID: " + objId);
 		assert (objMngr != null);
 
 		UAVObject obj = null;
@@ -559,7 +565,7 @@ public class UAVTalk extends Observable {
 	 * Update the data of an object from a byte array (unpack). If the object
 	 * instance could not be found in the list, then a new one is created.
 	 */
-	public synchronized UAVObject updateObject(int objId, int instId,
+	public synchronized UAVObject updateObject(long objId, long instId,
 			ByteBuffer data) {
 		assert (objMngr != null);
 

androidgcs/src/org/openpilot/uavtalk/uavobjects/Accels.java

@@ -139,7 +139,7 @@ public class Accels extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xDD9D5FC0;
+	protected static final long OBJID = 0xDD9D5FC0l;
 	protected static final String NAME = "Accels";
 	protected static String DESCRIPTION = "The accel data.";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/AccessoryDesired.java

@@ -127,7 +127,7 @@ public class AccessoryDesired extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xC409985A;
+	protected static final long OBJID = 0xC409985Al;
 	protected static final String NAME = "AccessoryDesired";
 	protected static String DESCRIPTION = "Desired Auxillary actuator settings.  Comes from @ref ManualControlModule.";
 	protected static final boolean ISSINGLEINST = 0 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorCommand.java

@@ -148,7 +148,7 @@ public class ActuatorCommand extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x5324CB8;
+	protected static final long OBJID = 0x5324CB8l;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorDesired.java

@@ -147,7 +147,7 @@ public class ActuatorDesired extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xCA4BC4A4;
+	protected static final long OBJID = 0xCA4BC4A4l;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorSettings.java

@@ -262,7 +262,7 @@ public class ActuatorSettings extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x7D555646;
+	protected static final long OBJID = 0x7D555646l;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/AltHoldSmoothed.java

@@ -135,7 +135,7 @@ public class AltHoldSmoothed extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x2BC6B9D2;
+	protected static final long OBJID = 0x2BC6B9D2l;
 	protected static final String NAME = "AltHoldSmoothed";
 	protected static String DESCRIPTION = "The output on the kalman filter on altitude.";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldDesired.java

@@ -139,7 +139,7 @@ public class AltitudeHoldDesired extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x495BAD6E;
+	protected static final long OBJID = 0x495BAD6El;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldSettings.java

@@ -158,7 +158,7 @@ public class AltitudeHoldSettings extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xFEC55B42;
+	protected static final long OBJID = 0xFEC55B42l;
 	protected static final String NAME = "AltitudeHoldSettings";
 	protected static String DESCRIPTION = "Settings for the @ref AltitudeHold module";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/AttitudeActual.java

@@ -151,7 +151,7 @@ public class AttitudeActual extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x33DAD5E6;
+	protected static final long OBJID = 0x33DAD5E6l;
 	protected static final String NAME = "AttitudeActual";
 	protected static String DESCRIPTION = "The updated Attitude estimation from @ref AHRSCommsModule.";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/AttitudeSettings.java

@@ -195,7 +195,7 @@ public class AttitudeSettings extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xC307BC4A;
+	protected static final long OBJID = 0xC307BC4Al;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/AttitudeSimulated.java

@@ -163,7 +163,7 @@ public class AttitudeSimulated extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x9266CE74;
+	protected static final long OBJID = 0x9266CE74l;
 	protected static final String NAME = "AttitudeSimulated";
 	protected static String DESCRIPTION = "The simulated Attitude estimation from @ref Sensors.";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/BaroAirspeed.java

@@ -142,7 +142,7 @@ public class BaroAirspeed extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x169EA4A;
+	protected static final long OBJID = 0x169EA4Al;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/BaroAltitude.java

@@ -135,7 +135,7 @@ public class BaroAltitude extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x99622E6A;
+	protected static final long OBJID = 0x99622E6Al;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/CameraDesired.java

@@ -135,7 +135,7 @@ public class CameraDesired extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x531F544E;
+	protected static final long OBJID = 0x531F544El;
 	protected static final String NAME = "CameraDesired";
 	protected static String DESCRIPTION = "Desired camera outputs.  Comes from @ref CameraStabilization module.";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/CameraStabSettings.java

@@ -193,7 +193,7 @@ public class CameraStabSettings extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x3B95DDBA;
+	protected static final long OBJID = 0x3B95DDBAl;
 	protected static final String NAME = "CameraStabSettings";
 	protected static String DESCRIPTION = "Settings for the @ref CameraStab mmodule";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/FaultSettings.java

@@ -135,7 +135,7 @@ public class FaultSettings extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x2778BA3C;
+	protected static final long OBJID = 0x2778BA3Cl;
 	protected static final String NAME = "FaultSettings";
 	protected static String DESCRIPTION = "Allows testers to simulate various fault scenarios.";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/FirmwareIAPObj.java

@@ -201,7 +201,7 @@ public class FirmwareIAPObj extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x3CCDFB68;
+	protected static final long OBJID = 0x3CCDFB68l;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/FixedWingPathFollowerSettings.java

@@ -228,7 +228,7 @@ public class FixedWingPathFollowerSettings extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x8A3F1E02;
+	protected static final long OBJID = 0x8A3F1E02l;
 	protected static final String NAME = "FixedWingPathFollowerSettings";
 	protected static String DESCRIPTION = "Settings for the @ref FixedWingPathFollowerModule";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/FixedWingPathFollowerStatus.java

@@ -153,7 +153,7 @@ public class FixedWingPathFollowerStatus extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xA0D6F6D4;
+	protected static final long OBJID = 0xA0D6F6D4l;
 	protected static final String NAME = "FixedWingPathFollowerStatus";
 	protected static String DESCRIPTION = "Object Storing Debugging Information on PID internals";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatterySettings.java

@@ -170,7 +170,7 @@ public class FlightBatterySettings extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x94AC6AD2;
+	protected static final long OBJID = 0x94AC6AD2l;
 	protected static final String NAME = "FlightBatterySettings";
 	protected static String DESCRIPTION = "Flight Battery configuration.";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatteryState.java

@@ -158,7 +158,7 @@ public class FlightBatteryState extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xD2083596;
+	protected static final long OBJID = 0xD2083596l;
 	protected static final String NAME = "FlightBatteryState";
 	protected static String DESCRIPTION = "Battery status information.";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightPlanControl.java

@@ -132,7 +132,7 @@ public class FlightPlanControl extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x53E3F180;
+	protected static final long OBJID = 0x53E3F180l;
 	protected static final String NAME = "FlightPlanControl";
 	protected static String DESCRIPTION = "Control the flight plan script";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightPlanSettings.java

@@ -128,7 +128,7 @@ public class FlightPlanSettings extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x92E9FF76;
+	protected static final long OBJID = 0x92E9FF76l;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightPlanStatus.java

@@ -172,7 +172,7 @@ public class FlightPlanStatus extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x2206EE46;
+	protected static final long OBJID = 0x2206EE46l;
 	protected static final String NAME = "FlightPlanStatus";
 	protected static String DESCRIPTION = "Status of the flight plan script";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightStatus.java

@@ -146,7 +146,7 @@ public class FlightStatus extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x884FEF66;
+	protected static final long OBJID = 0x884FEF66l;
 	protected static final String NAME = "FlightStatus";
 	protected static String DESCRIPTION = "Contains major flight status information for other modules.";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightTelemetryStats.java

@@ -152,7 +152,7 @@ public class FlightTelemetryStats extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x2F7E2902;
+	protected static final long OBJID = 0x2F7E2902l;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/GCSReceiver.java

@@ -134,7 +134,7 @@ public class GCSReceiver extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xCC7E1470;
+	protected static final long OBJID = 0xCC7E1470l;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/GCSTelemetryStats.java

@@ -152,7 +152,7 @@ public class GCSTelemetryStats extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xABC72744;
+	protected static final long OBJID = 0xABC72744l;
 	protected static final String NAME = "GCSTelemetryStats";
 	protected static String DESCRIPTION = "The telemetry statistics from the ground computer";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSPosition.java

@@ -172,7 +172,7 @@ public class GPSPosition extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xE2A323B6;
+	protected static final long OBJID = 0xE2A323B6l;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSSatellites.java

@@ -203,7 +203,7 @@ public class GPSSatellites extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x920D998;
+	protected static final long OBJID = 0x920D998l;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSSettings.java

@@ -131,7 +131,7 @@ public class GPSSettings extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xAC5F6370;
+	protected static final long OBJID = 0xAC5F6370l;
 	protected static final String NAME = "GPSSettings";
 	protected static String DESCRIPTION = "Settings for the GPS";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSTime.java

@@ -147,7 +147,7 @@ public class GPSTime extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xD4478084;
+	protected static final long OBJID = 0xD4478084l;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/GPSVelocity.java

@@ -135,7 +135,7 @@ public class GPSVelocity extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x8245DC80;
+	protected static final long OBJID = 0x8245DC80l;
 	protected static final String NAME = "GPSVelocity";
 	protected static String DESCRIPTION = "Raw GPS data from @ref GPSModule.";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/Gyros.java

@@ -139,7 +139,7 @@ public class Gyros extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x4228AF6;
+	protected static final long OBJID = 0x4228AF6l;
 	protected static final String NAME = "Gyros";
 	protected static String DESCRIPTION = "The gyro data.";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/GyrosBias.java

@@ -135,7 +135,7 @@ public class GyrosBias extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xE4B6F980;
+	protected static final long OBJID = 0xE4B6F980l;
 	protected static final String NAME = "GyrosBias";
 	protected static String DESCRIPTION = "The gyro data.";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/HomeLocation.java

@@ -160,7 +160,7 @@ public class HomeLocation extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x6185DC6E;
+	protected static final long OBJID = 0x6185DC6El;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/HwSettings.java

@@ -324,7 +324,7 @@ public class HwSettings extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x5D950E50;
+	protected static final long OBJID = 0x5D950E50l;
 	protected static final String NAME = "HwSettings";
 	protected static String DESCRIPTION = "Selection of optional hardware configurations.";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/I2CStats.java

@@ -226,7 +226,7 @@ public class I2CStats extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xB714823E;
+	protected static final long OBJID = 0xB714823El;
 	protected static final String NAME = "I2CStats";
 	protected static String DESCRIPTION = "Tracks statistics on the I2C bus.";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/MagBias.java

@@ -135,7 +135,7 @@ public class MagBias extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x5043E510;
+	protected static final long OBJID = 0x5043E510l;
 	protected static final String NAME = "MagBias";
 	protected static String DESCRIPTION = "The gyro data.";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/Magnetometer.java

@@ -135,7 +135,7 @@ public class Magnetometer extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x813B55DE;
+	protected static final long OBJID = 0x813B55DEl;
 	protected static final String NAME = "Magnetometer";
 	protected static String DESCRIPTION = "The mag data.";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlCommand.java

@@ -162,7 +162,7 @@ public class ManualControlCommand extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x1E82C2D2;
+	protected static final long OBJID = 0x1E82C2D2l;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java

@@ -341,7 +341,7 @@ public class ManualControlSettings extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x6C188320;
+	protected static final long OBJID = 0x6C188320l;
 	protected static final String NAME = "ManualControlSettings";
 	protected static String DESCRIPTION = "Settings to indicate how to decode receiver input by @ref ManualControlModule.";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/MixerSettings.java

@@ -496,7 +496,7 @@ public class MixerSettings extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x5D16D6C4;
+	protected static final long OBJID = 0x5D16D6C4l;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/MixerStatus.java

@@ -163,7 +163,7 @@ public class MixerStatus extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x124E28A;
+	protected static final long OBJID = 0x124E28Al;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/NEDPosition.java

@@ -135,7 +135,7 @@ public class NEDPosition extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x1FB15A00;
+	protected static final long OBJID = 0x1FB15A00l;
 	protected static final String NAME = "NEDPosition";
 	protected static String DESCRIPTION = "Contains the current position relative to @ref HomeLocation";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/NedAccel.java

@@ -135,7 +135,7 @@ public class NedAccel extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x7C7F5BC0;
+	protected static final long OBJID = 0x7C7F5BC0l;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/ObjectPersistence.java

@@ -152,7 +152,7 @@ public class ObjectPersistence extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x99C63292;
+	protected static final long OBJID = 0x99C63292l;
 	protected static final String NAME = "ObjectPersistence";
 	protected static String DESCRIPTION = "Someone who knows please enter this";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/OveroSyncSettings.java

@@ -132,7 +132,7 @@ public class OveroSyncSettings extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xA1ABC278;
+	protected static final long OBJID = 0xA1ABC278l;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/OveroSyncStats.java

@@ -154,7 +154,7 @@ public class OveroSyncStats extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xD2085FAC;
+	protected static final long OBJID = 0xD2085FACl;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/PathDesired.java

@@ -151,7 +151,7 @@ public class PathDesired extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x5A4DC71A;
+	protected static final long OBJID = 0x5A4DC71Al;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/PathPlannerSettings.java

@@ -140,7 +140,7 @@ public class PathPlannerSettings extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x290E45DA;
+	protected static final long OBJID = 0x290E45DAl;
 	protected static final String NAME = "PathPlannerSettings";
 	protected static String DESCRIPTION = "Settings for the @ref PathPlanner Module";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXSettings.java

@@ -315,7 +315,7 @@ public class PipXSettings extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xBA192BCA;
+	protected static final long OBJID = 0xBA192BCAl;
 	protected static final String NAME = "PipXSettings";
 	protected static String DESCRIPTION = "PipXtreme configurations options.";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXStatus.java

@@ -290,7 +290,7 @@ public class PipXStatus extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x3FC68A86;
+	protected static final long OBJID = 0x3FC68A86l;
 	protected static final String NAME = "PipXStatus";
 	protected static String DESCRIPTION = "PipXtreme device status.";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/PositionActual.java

@@ -135,7 +135,7 @@ public class PositionActual extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xFA9E2D42;
+	protected static final long OBJID = 0xFA9E2D42l;
 	protected static final String NAME = "PositionActual";
 	protected static String DESCRIPTION = "Contains the current position relative to @ref HomeLocation";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/RateDesired.java

@@ -135,7 +135,7 @@ public class RateDesired extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xCE8C826;
+	protected static final long OBJID = 0xCE8C826l;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/ReceiverActivity.java

@@ -141,7 +141,7 @@ public class ReceiverActivity extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x1E7C53DA;
+	protected static final long OBJID = 0x1E7C53DAl;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/RevoCalibration.java

@@ -238,7 +238,7 @@ public class RevoCalibration extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xA2A63C7C;
+	protected static final long OBJID = 0xA2A63C7Cl;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/RevoSettings.java

@@ -132,7 +132,7 @@ public class RevoSettings extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xE2DA70EA;
+	protected static final long OBJID = 0xE2DA70EAl;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/SonarAltitude.java

@@ -127,7 +127,7 @@ public class SonarAltitude extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x6C5A0CBC;
+	protected static final long OBJID = 0x6C5A0CBCl;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/StabilizationDesired.java

@@ -152,7 +152,7 @@ public class StabilizationDesired extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xDE1EAAD6;
+	protected static final long OBJID = 0xDE1EAAD6l;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/StabilizationSettings.java

@@ -302,7 +302,7 @@ public class StabilizationSettings extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xBBC337D4;
+	protected static final long OBJID = 0xBBC337D4l;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemAlarms.java

@@ -166,7 +166,7 @@ public class SystemAlarms extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x737ADCF2;
+	protected static final long OBJID = 0x737ADCF2l;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemSettings.java

@@ -159,7 +159,7 @@ public class SystemSettings extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xC72A326E;
+	protected static final long OBJID = 0xC72A326El;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemStats.java

@@ -155,7 +155,7 @@ public class SystemStats extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x364D1406;
+	protected static final long OBJID = 0x364D1406l;
 	protected static final String NAME = "SystemStats";
 	protected static String DESCRIPTION = "CPU and memory usage from OpenPilot computer. ";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/TaskInfo.java

@@ -192,7 +192,7 @@ public class TaskInfo extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xB81CD2AE;
+	protected static final long OBJID = 0xB81CD2AEl;
 	protected static final String NAME = "TaskInfo";
 	protected static String DESCRIPTION = "Task information";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/TxPIDSettings.java

@@ -214,7 +214,7 @@ public class TxPIDSettings extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x42B2D2AE;
+	protected static final long OBJID = 0x42B2D2AEl;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/VelocityActual.java

@@ -135,7 +135,7 @@ public class VelocityActual extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x5A08F61A;
+	protected static final long OBJID = 0x5A08F61Al;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/VelocityDesired.java

@@ -135,7 +135,7 @@ public class VelocityDesired extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x9E946992;
+	protected static final long OBJID = 0x9E946992l;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/VtolPathFollowerSettings.java

@@ -221,7 +221,7 @@ public class VtolPathFollowerSettings extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x973991F6;
+	protected static final long OBJID = 0x973991F6l;
 	protected static final String NAME = "VtolPathFollowerSettings";
 	protected static String DESCRIPTION = "Settings for the @ref VtolPathFollower module";
 	protected static final boolean ISSINGLEINST = 1 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/WatchdogStatus.java

@@ -131,7 +131,7 @@ public class WatchdogStatus extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0xA207FA7C;
+	protected static final long OBJID = 0xA207FA7Cl;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/Waypoint.java

@@ -148,7 +148,7 @@ public class Waypoint extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x338C5F90;
+	protected static final long OBJID = 0x338C5F90l;
 	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 > 0;

androidgcs/src/org/openpilot/uavtalk/uavobjects/WaypointActive.java

@@ -127,7 +127,7 @@ public class WaypointActive extends UAVDataObject {
 	}
 
 	// Constants
-	protected static final long OBJID = 0x1EA5B192;
+	protected static final long OBJID = 0x1EA5B192l;
 	protected static final String NAME = "WaypointActive";
 	protected static String DESCRIPTION = "Indicates the currently active waypoint";
 	protected static final boolean ISSINGLEINST = 1 > 0;

ground/openpilotgcs/src/libs/juavobjects/templates/uavobjecttemplate.java

@@ -123,7 +123,7 @@ $(INITFIELDS)
 	}
 
 	// Constants
-	protected static final long OBJID = $(OBJIDHEX);
+	protected static final long OBJID = $(OBJIDHEX)l;
 	protected static final String NAME = "$(NAME)";
 	protected static String DESCRIPTION = "$(DESCRIPTION)";
 	protected static final boolean ISSINGLEINST = $(ISSINGLEINST) > 0;