- updated android-wheelphone-library to rev31

- clear "calibData.csv" file before writing new calibration data to it
gctronic · Jan 14, 2014 · 00cac50 · 00cac50
1 parent 9e13a4b
commit 00cac50
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 14 deletions.
diff --git a/android-applications/WheelphoneCalibration/bin/WheelphoneCalibration.apk b/android-applications/WheelphoneCalibration/bin/WheelphoneCalibration.apk
diff --git a/android-applications/WheelphoneCalibration/bin/classes.dex b/android-applications/WheelphoneCalibration/bin/classes.dex
diff --git a/...heelphoneCalibration/bin/classes/com/wheelphone/calibration/WheelphoneCalibration$1.class b/...heelphoneCalibration/bin/classes/com/wheelphone/calibration/WheelphoneCalibration$1.class
diff --git a/.../WheelphoneCalibration/bin/classes/com/wheelphone/calibration/WheelphoneCalibration.class b/.../WheelphoneCalibration/bin/classes/com/wheelphone/calibration/WheelphoneCalibration.class
diff --git a/...Calibration/bin/dexedLibs/android-wheelphone-library-fdf22a2bb2040d05a74304313978f6fa.jar b/...Calibration/bin/dexedLibs/android-wheelphone-library-fdf22a2bb2040d05a74304313978f6fa.jar
diff --git a/...ions/WheelphoneCalibration/bin/dexedLibs/annotations-770a20812c61f1464bf30df1fbaab247.jar b/...ions/WheelphoneCalibration/bin/dexedLibs/annotations-770a20812c61f1464bf30df1fbaab247.jar
diff --git a/...heelphoneCalibration/bin/dexedLibs/wheelphonelibrary-c158764da80781f6675ed5ff2b363dd4.jar b/...heelphoneCalibration/bin/dexedLibs/wheelphonelibrary-c158764da80781f6675ed5ff2b363dd4.jar
diff --git a/android-applications/WheelphoneCalibration/bin/jarlist.cache b/android-applications/WheelphoneCalibration/bin/jarlist.cache
diff --git a/android-applications/WheelphoneCalibration/bin/resources.ap_ b/android-applications/WheelphoneCalibration/bin/resources.ap_
diff --git a/android-applications/WheelphoneCalibration/libs/android-wheelphone-library.jar b/android-applications/WheelphoneCalibration/libs/android-wheelphone-library.jar
diff --git a/...lications/WheelphoneCalibration/src/com/wheelphone/calibration/WheelphoneCalibration.java b/...lications/WheelphoneCalibration/src/com/wheelphone/calibration/WheelphoneCalibration.java
@@ -125,7 +125,6 @@ protected void onCreate(Bundle savedInstanceState) {
                         WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);		
 
         wheelphone = new WheelphoneRobot(getApplicationContext(), getIntent());
-        wheelphone.setUSBCommunicationTimeout(5000);
 
         msgbox("calibration", "Place the robot with the right wheel next to the black line and press the calibrate button. Wait until the process is terminated.");
 
@@ -134,13 +133,12 @@ protected void onCreate(Bundle savedInstanceState) {
 	@Override
 	public void onStart() {
 		super.onStart();
-		wheelphone.startUSBCommunication();
 	}
 
     @Override
     public void onResume() {
     	super.onResume();
-    	wheelphone.resumeUSBCommunication();
+    	wheelphone.startUSBCommunication();
     	wheelphone.setWheelPhoneRobotListener(this);
     }	
 
@@ -153,7 +151,7 @@ public void onStop() {
     @Override
     public void onPause() {
     	super.onPause();
-    	wheelphone.pauseUSBCommunication();
+    	wheelphone.closeUSBCommunication();
     	wheelphone.setWheelPhoneRobotListener(null);
     }  
 
@@ -179,7 +177,7 @@ public void onWheelphoneUpdate() {
 			}
 		}
 
-		if(wheelphone.isUSBConnected()) {
+		if(wheelphone.isRobotConnected()) {
 	    	txtConnected.setText("Connected");
 	    	txtConnected.setTextColor(getResources().getColor(R.color.green));
 		} else {
@@ -273,12 +271,22 @@ public void writeCalibrationDataToFile() {
 		int i = 0;
 
 		File logFile = new File("sdcard/calibData.csv");
-		try {
-			logFile.createNewFile();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+		if (!logFile.exists()) {
+			try {
+				logFile.createNewFile();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		} else {
+			logFile.delete();
+			try {
+				logFile.createNewFile();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}		
 
 		try {
 			//BufferedWriter for performance, true to set append to file flag