From 1c8a5054e6f043d3a770892b56f218e91ed78f87 Mon Sep 17 00:00:00 2001
From: Martin Vajnar <martin@martin-HP-ProBook-4330s.(none)>
Date: Tue, 8 Apr 2014 13:48:31 +0200
Subject: [PATCH] ROBOT_DEMO: reduce WifiLocks usage

Use WifiLock only for MotionSpeedPublisher.
---
 .../src/org/ocera/orte/demo/GUI/MainActivity.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/GUI/MainActivity.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/GUI/MainActivity.java
index 70ab2e5..2da19d8 100644
--- a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/GUI/MainActivity.java
+++ b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/GUI/MainActivity.java
@@ -115,7 +115,7 @@ public class MainActivity extends Activity {
         	motion_speed_subs.cancel();
         	hokuyo_view.invalidate();
             mWakeLock.release();
-            mWifiLock.release();
+            //mWifiLock.release();
         }
 
         if (hokuyo_scan != null && !hokuyo_scan.isCancelled()) {
@@ -123,7 +123,7 @@ public class MainActivity extends Activity {
 			hokuyo_scan.cancel();
 			hokuyo_view.invalidate();
 	        mWakeLock.release();
-	        mWifiLock.release();
+	        //mWifiLock.release();
         }
     }
     
@@ -345,7 +345,7 @@ public class MainActivity extends Activity {
 					event.getXPrecision()*event.getX() < normSpeed) {
 				if(!hokuyo_view.isRunningMotion()) {
 					mWakeLock.acquire();
-					mWifiLock.acquire();
+					//mWifiLock.acquire();
 					if (motion_speed_subs == null)
 						motion_speed_subs = new MotionSpeedSubscribe(appDomain, hokuyo_view);
 					motion_speed_subs.start();
@@ -358,7 +358,7 @@ public class MainActivity extends Activity {
 					motion_speed_subs.cancel();
 					hokuyo_view.invalidate();
 					mWakeLock.release();
-					mWifiLock.release();
+					//mWifiLock.release();
 					Toast.makeText(getApplicationContext(), "Speed Monitor: OFF", Toast.LENGTH_SHORT).show();
 				}
 				return true;
@@ -369,7 +369,7 @@ public class MainActivity extends Activity {
 							event.getXPrecision()*event.getX() < hokuyo_view.getWidth() - norm)) {
 				if (!hokuyo_view.isRunning()) {
 					mWakeLock.acquire();
-					mWifiLock.acquire();
+					//mWifiLock.acquire();
 					hokuyo_view.setData(new int[681]);
 					if (hokuyo_scan == null)
 						hokuyo_scan = new HokuyoScanSubscribe(appDomain, hokuyo_view);
@@ -383,7 +383,7 @@ public class MainActivity extends Activity {
 					hokuyo_scan.cancel();
 					hokuyo_view.invalidate();
 					mWakeLock.release();
-					mWifiLock.release();
+					//mWifiLock.release();
 					Toast.makeText(getApplicationContext(), "Hokuyo LRF: OFF", Toast.LENGTH_SHORT).show();
 				}
 				return true;
-- 
2.39.2