Merge pull request #35 from NeuronRobotics/kh/TimeKeeper-Update

Kh/time keeper update

Author: madhephaestus

build.gradle

@@ -1,6 +1,9 @@
 apply plugin: 'java'
 apply plugin: 'eclipse'
-apply plugin: 'maven'
+if (project == rootProject) {
+	apply plugin: 'maven'
+}
+apply plugin: 'java-library'
 apply plugin: 'signing'
 
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
@@ -9,14 +12,14 @@ File buildDir = file(".");
 
 Properties props = new Properties()
 props.load(new FileInputStream(buildDir.getAbsolutePath()+"/src/main/resources/com/neuronrobotics/sdk/config/build.properties"))
-//sourceSets {
-//	
-//	test {
-//		java {
-//			srcDirs = ["test/java/src" ]  // Note @Peter's comment below
-//		}
-//	}
-//}
+sourceSets {
+	
+	test {
+		java {
+			srcDirs = ["test/java/src" ]  
+		}
+	}
+}
 
 manifest {
     attributes(	
@@ -31,7 +34,7 @@ manifest {
 
     )
 }
-
+if (project == rootProject)
 jar.archiveName = "nrsdk-"+props."app.version"+"-jar-with-dependencies.jar"
 
 //apply from: 'http://gradle-plugins.mihosoft.eu/latest/vlicenseheader.gradle'
@@ -40,27 +43,36 @@ jar.archiveName = "nrsdk-"+props."app.version"+"-jar-with-dependencies.jar"
 
 repositories {
 	mavenCentral()
+//	maven {
+//		url "https://repository.ow2.org/nexus/content/repositories/public/"
+//	}
 }
 
 dependencies {
 	//TODO change as many of these as possible to Maven repositories
-    compile fileTree (dir: 'libs', includes: ['*.jar'])
-	testCompile 'junit:junit:4.12'
-	compile 'gov.nist.math:jama:1.0.2'
-	compile 'com.miglayout:miglayout-swing:4.1'
-	compile 'org.igniterealtime.smack:smack:3.2.1'
+    api fileTree (dir: 'libs', includes: ['*.jar'])
+	testImplementation 'junit:junit:4.12'
+	implementation 'com.google.code.gson:gson:2.5'
+	
+	api 'gov.nist.math:jama:1.0.2'
+	implementation 'com.miglayout:miglayout-swing:4.1'
+	implementation 'org.igniterealtime.smack:smack:3.2.1'
 
-	compile 'org.igniterealtime.smack:smackx:3.2.1'
-	compile 'org.apache.commons:commons-lang3:3.2.1'
-	compile 'org.usb4java:usb4java:1.2.0'
-	compile 'org.usb4java:usb4java-javax:1.2.0'
+	implementation 'org.igniterealtime.smack:smackx:3.2.1'
+	implementation 'org.apache.commons:commons-lang3:3.2.1'
+	api 'org.usb4java:usb4java:1.2.0'
+	api 'org.usb4java:usb4java-javax:1.2.0'
 
 	//compile fileTree (dir: '../doychinNRJAVASERISL/nrjavaserial/build/libs', includes: ['*.jar'])
-	compile "com.neuronrobotics:nrjavaserial:5.1.1"
+	api "com.neuronrobotics:nrjavaserial:5.1.1"
 	// https://mvnrepository.com/artifact/org.apache.commons/commons-math3
-	compile group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
-
-
+	api group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
+	// https://mvnrepository.com/artifact/net.sf.bluecove/bluecove-gpl
+	api group: 'net.sf.bluecove', name: 'bluecove-gpl', version: '2.1.0'
+	api group: 'io.ultreia', name: 'bluecove', version: '2.1.1'
+	// https://mvnrepository.com/artifact/motej/motej
+	//api group: 'motej', name: 'motej', version: '0.9-2008.02.05-patched', ext: 'pom'
+	
 
 }
 
@@ -73,11 +85,13 @@ archivesBaseName = "java-bowler"
 version = props."app.version"
 
 task javadocJar(type: Jar) {
+	if (project == rootProject)
 	classifier = 'javadoc'
 	from javadoc
 }
 
 task sourcesJar(type: Jar) {
+	if (project == rootProject)
 	classifier = 'sources'
 	from sourceSets.main.allSource
 }

examples/java/src/com/neuronrobotics/test/nrdk/BluetoothConector.java

@@ -4,7 +4,7 @@
 import com.neuronrobotics.sdk.wireless.bluetooth.BlueCoveManager;
 import com.neuronrobotics.sdk.wireless.bluetooth.BluetoothSerialConnection;
 
-// TODO: Auto-generated Javadoc
+//  Auto-generated Javadoc
 /**
  * The Class BluetoothConector.
  */
@@ -19,16 +19,16 @@ public static void main(String[] args) {
 		DyIO dyio;
 		BlueCoveManager manager = new BlueCoveManager();
 		String devices[] = manager.getAvailableSerialDevices(true);
-		System.out.println("Devices: ");
+		com.neuronrobotics.sdk.common.Log.error("Devices: ");
 		for (String d: devices) {
-			System.out.println(d);
+			com.neuronrobotics.sdk.common.Log.error(d);
 		}
 		if (devices.length > 0) {
-			System.out.println("Connecting to : "+devices[0]);
+			com.neuronrobotics.sdk.common.Log.error("Connecting to : "+devices[0]);
 			dyio = new DyIO(new BluetoothSerialConnection(manager, devices[0]));
 			dyio.connect();
 			if(dyio.ping() )
-				System.out.println("All OK!");
+				com.neuronrobotics.sdk.common.Log.error("All OK!");
 
 		}
 		System.exit(0);

examples/java/src/com/neuronrobotics/test/nrdk/ByteListTest.java

@@ -2,7 +2,7 @@
 
 import com.neuronrobotics.sdk.common.ByteList;
 
-// TODO: Auto-generated Javadoc
+//  Auto-generated Javadoc
 /**
  * The Class ByteListTest.
  */
@@ -15,9 +15,9 @@ public class ByteListTest {
 	 */
 	public static void main(String [] args) {
 		byte [] b = ByteList.convertTo16(526);
-		System.out.println(b[0] + " - " + b[1]);
+		com.neuronrobotics.sdk.common.Log.error(b[0] + " - " + b[1]);
 
 		int i = ByteList.convertToInt(b);
-		System.out.println(i);
+		com.neuronrobotics.sdk.common.Log.error(i);
 	}
 }

examples/java/src/com/neuronrobotics/test/nrdk/ConnectionDialogTest.java

@@ -4,7 +4,7 @@
 import com.neuronrobotics.sdk.dyio.DyIO;
 import com.neuronrobotics.sdk.ui.ConnectionDialog;
 
-// TODO: Auto-generated Javadoc
+//  Auto-generated Javadoc
 /**
  * The Class ConnectionDialogTest.
  */
@@ -16,16 +16,16 @@ public class ConnectionDialogTest {
 	 * @param args the arguments
 	 */
 	public static void main(String[] args) {
-		System.out.println("Starting");
+		com.neuronrobotics.sdk.common.Log.error("Starting");
 		DyIO dyio=new DyIO();
 		if (!ConnectionDialog.getBowlerDevice(dyio)){
-			System.err.println("Dialog failed");
+			com.neuronrobotics.sdk.common.Log.error("Dialog failed");
 			System.exit(1);
 		}
 		Log.enableDebugPrint();
 		dyio.ping();
         dyio.disconnect();
-		System.out.println("Connection OK!");
+		com.neuronrobotics.sdk.common.Log.error("Connection OK!");
 		System.exit(0);
 		//while(true);
 	}

examples/java/src/com/neuronrobotics/test/nrdk/ExtendGenericPID.java

@@ -8,7 +8,7 @@
 import com.neuronrobotics.sdk.pid.GenericPIDDevice;
 import com.neuronrobotics.sdk.ui.ConnectionDialog;
 
-// TODO: Auto-generated Javadoc
+//  Auto-generated Javadoc
 /**
  * The Class ExtendGenericPID.
  */
@@ -24,14 +24,14 @@ private ExtendGenericPID(){
 			System.exit(1);
 		}
 		try {
-			System.out.println("Extended get position: "+pid.getExtendedValue(0));
+			com.neuronrobotics.sdk.common.Log.error("Extended get position: "+pid.getExtendedValue(0));
 			pid.GetAllPIDPosition();
 			pid.GetPIDPosition(2);
 			pid.disconnect();
-			System.out.println("All OK!");
+			com.neuronrobotics.sdk.common.Log.error("All OK!");
 			System.exit(0);
 		} catch (Exception e) {
-			// TODO Auto-generated catch block
+			// Auto-generated catch block
 			e.printStackTrace();
 			pid.disconnect();
 			System.exit(1);

examples/java/src/com/neuronrobotics/test/nrdk/GenericPIDTest.java

@@ -4,7 +4,7 @@
 import com.neuronrobotics.sdk.network.BowlerTCPClient;
 import com.neuronrobotics.sdk.pid.GenericPIDDevice;
 
-// TODO: Auto-generated Javadoc
+//  Auto-generated Javadoc
 /**
  * The Class GenericPIDTest.
  */
@@ -25,17 +25,17 @@ public static void main(String[] args) {
 			try {
 				pid.setConnection(new BowlerTCPClient("cortex.wpi.edu", 1965));
 			} catch (Exception e) {
-				// TODO Auto-generated catch block
+				// Auto-generated catch block
 				e.printStackTrace();
 			}
 			//pid.setConnection(new BowlerTCPClient("192.168.0.134", 1965));
 			pid.GetAllPIDPosition();
 			pid.GetPIDPosition(2);
 			pid.disconnect();
-			System.out.println("All OK!");
+			com.neuronrobotics.sdk.common.Log.error("All OK!");
 			System.exit(0);
 		} catch (Exception e) {
-			// TODO Auto-generated catch block
+			// Auto-generated catch block
 			e.printStackTrace();
 			pid.disconnect();
 			System.exit(1);

examples/java/src/com/neuronrobotics/test/nrdk/PingSpeedTest.java

@@ -9,7 +9,7 @@
 import com.neuronrobotics.sdk.serial.SerialConnection;
 import com.neuronrobotics.sdk.ui.ConnectionDialog;
 
-// TODO: Auto-generated Javadoc
+//  Auto-generated Javadoc
 /**
  * The Class PingSpeedTest.
  */
@@ -30,13 +30,13 @@ public static void main(String[] args) {
 //			//c = new BowlerTCPClient("192.168.1.10", 1866);
 //			c = new UDPBowlerConnection(InetAddress.getByName("130.215.49.37"), 1865);
 //		} catch (Exception e) {
-//			// TODO Auto-generated catch block
+//			// Auto-generated catch block
 //			e.printStackTrace();
 //			System.exit(1);
 //		}
 		if(c==null)
 			System.exit(1);
-		System.out.println("Starting test");
+		com.neuronrobotics.sdk.common.Log.error("Starting test");
 		Log.enableInfoPrint();
 		GenericDevice dev = new GenericDevice(c);
 		dev.connect();
@@ -51,10 +51,10 @@ public static void main(String[] args) {
 
 			double ms=System.currentTimeMillis()-start;
 			avg +=ms;			
-			System.out.println("Average cycle time: "+(int)(avg/i)+"ms\t\t\t this loop was: "+ms);
+			com.neuronrobotics.sdk.common.Log.error("Average cycle time: "+(int)(avg/i)+"ms\t\t\t this loop was: "+ms);
 			dev.getNamespaces();
 		}
-		System.out.println("Average cycle time for ping: "+(avg/i)+" ms");	
+		com.neuronrobotics.sdk.common.Log.error("Average cycle time for ping: "+(avg/i)+" ms");	
 		dev.disconnect();
 		System.exit(0);
 	}

examples/java/src/com/neuronrobotics/test/nrdk/SimpleConnection.java

@@ -3,7 +3,7 @@
 import com.neuronrobotics.sdk.genericdevice.GenericDevice;
 import com.neuronrobotics.sdk.serial.SerialConnection;
 
-// TODO: Auto-generated Javadoc
+//  Auto-generated Javadoc
 /**
  * The Class SimpleConnection.
  */
@@ -16,7 +16,7 @@ public class SimpleConnection {
 	 */
 	public static void main(String[] args) {
 		SerialConnection s = null;
-		System.out.println("Connecting and disconnecting");
+		com.neuronrobotics.sdk.common.Log.error("Connecting and disconnecting");
 
 		//Windows
 		//s=new SerialConnection("COM5");
@@ -41,7 +41,7 @@ public static void main(String[] args) {
 			avg +=ms;
 			start = System.currentTimeMillis();
 		}
-		System.out.println("Average cycle time for ping: "+(avg/i)+" ms");
+		com.neuronrobotics.sdk.common.Log.error("Average cycle time for ping: "+(avg/i)+" ms");
         dyio.disconnect();
 		System.exit(0);
         //while(true);

examples/java/src/com/neuronrobotics/test/nrdk/network/NetworkServerTest.java

@@ -8,7 +8,7 @@
 import com.neuronrobotics.sdk.network.BowlerUDPServer;
 import com.neuronrobotics.sdk.util.ThreadUtil;
 
-// TODO: Auto-generated Javadoc
+//  Auto-generated Javadoc
 /**
  * The Class NetworkServerTest.
  */
@@ -43,7 +43,7 @@ public static void main(String [] args){
 			new NetworkServerTest();
 		}catch (Exception e){
 			e.printStackTrace();
-			System.err.println("###SERVER Failed out!");
+			com.neuronrobotics.sdk.common.Log.error("###SERVER Failed out!");
 			System.exit(1);
 		}
 	}