From ec31f0dc6a0da73f532c0c871f92e59835e5a62e Mon Sep 17 00:00:00 2001
From: James Cotton <peabody124@gmail.com>
Date: Sun, 5 Aug 2012 22:14:40 -0500
Subject: [PATCH] AndroidGCS: As soon as the controller is released set the
 throttle to -1

---
 .../src/org/openpilot/androidgcs/Controller.java       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/androidgcs/src/org/openpilot/androidgcs/Controller.java b/androidgcs/src/org/openpilot/androidgcs/Controller.java
index d87bb5c06..baa61229b 100644
--- a/androidgcs/src/org/openpilot/androidgcs/Controller.java
+++ b/androidgcs/src/org/openpilot/androidgcs/Controller.java
@@ -92,10 +92,9 @@ public class Controller extends ObjectManagerActivity {
 			public void OnMoved(int pan, int tilt) {
 				pitch = (double) tilt / MOVEMENT_RANGE;
 				yaw = (double) pan / MOVEMENT_RANGE;
-				updated = true;
 				leftJoystickHeld = true;
 			}
-			public void OnReleased() { leftJoystickHeld = false; }
+			public void OnReleased() { leftJoystickHeld = false; throttle = -1; updated = true; }
 			@Override
 			public void OnReturnedToCenter() { }
 		}, new JoystickMovedListener() {
@@ -105,10 +104,9 @@ public class Controller extends ObjectManagerActivity {
 				if (throttle < 0)
 					throttle = -1;
 				roll = (double) pan / MOVEMENT_RANGE;
-				updated = true;
 				rightJoystickHeld = true;
 			}
-			public void OnReleased() { rightJoystickHeld = false; }
+			public void OnReleased() { rightJoystickHeld = false; throttle = -1; updated = true; }
 			@Override
 			public void OnReturnedToCenter() { }
 		}) ;
@@ -117,7 +115,7 @@ public class Controller extends ObjectManagerActivity {
 				uavobjHandler.post(new Runnable() {
 					@Override
 					public void run() {
-						if (leftJoystickHeld && rightJoystickHeld) {
+						if ((leftJoystickHeld && rightJoystickHeld) || updated) {
 							UAVObject gcsReceiver = objMngr.getObject("GCSReceiver");
 							if (gcsReceiver == null) {
 								Log.e(TAG, "No GCS Receiver object found");
@@ -138,6 +136,8 @@ public class Controller extends ObjectManagerActivity {
 
 							gcsReceiver.updated();
 
+							updated = false;
+
 							if (DEBUG) Log.d(TAG, "Send update" + gcsReceiver.toStringData());
 						}
 						updated = false;