Kh/time keeper update

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

@@ -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

@@ -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

@@ -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

@@ -24,11 +24,11 @@ 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

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

@@ -32,7 +32,7 @@ public static void main(String[] args) {
 			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

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

@@ -36,7 +36,7 @@ public static void main(String[] args) {
 //		}
 		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

@@ -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

@@ -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);
 		}
 	}

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

@@ -28,7 +28,7 @@ public UDPClientTest(){
 		clnt=new UDPBowlerConnection();
 
 //		ArrayList<InetAddress>  addrs = clnt.getAllAddresses();
-//		System.out.println("Availiable servers: "+addrs);
+//		com.neuronrobotics.sdk.common.Log.error("Availiable servers: "+addrs);
 //		if (addrs.size()==0)
 //			throw new RuntimeException();
 //		clnt.setAddress(addrs.get(0));
@@ -42,15 +42,15 @@ public UDPClientTest(){
 		setConnection(clnt);
 		connect();
 
-		System.out.println("Pinging");
+		com.neuronrobotics.sdk.common.Log.error("Pinging");
 		long start = System.currentTimeMillis();
 		int numPings=10;
 		for(int i=0;i<numPings;i++)
 			if (!ping())
 				throw new RuntimeException("Ping failed!");
-		System.out.println("Ping average = "+(System.currentTimeMillis()-start)/numPings+"ms");
+		com.neuronrobotics.sdk.common.Log.error("Ping average = "+(System.currentTimeMillis()-start)/numPings+"ms");
 		clnt.disconnect();
-		System.out.println("done");
+		com.neuronrobotics.sdk.common.Log.error("done");
 		System.exit(0);
 	}
 
@@ -82,7 +82,7 @@ public static void main(String [] args){
 			new UDPClientTest();
 		}catch (Exception e){
 			e.printStackTrace();
-			System.err.println("###Client Failed out!");
+			com.neuronrobotics.sdk.common.Log.error("###Client Failed out!");
 			System.exit(1);
 		}
 	}

src/main/java/com/neuronrobotics/application/xmpp/DyIOConversation.java

@@ -43,24 +43,24 @@ public DyIOConversation(IChatLog log) {
 	public void processMessage(Chat chat, Message message) {
 		Message msg = new Message(message.getFrom(), Message.Type.chat);
 	    if(message.getType().equals(Message.Type.chat) && message.getBody() != null) {
-	        System.out.println("Received: " + message.getBody()+" from: "+message.getFrom());
+	        com.neuronrobotics.sdk.common.Log.error("Received: " + message.getBody()+" from: "+message.getFrom());
 	        if(log!=null){
 	        	log.onLogEvent(""+message.getFrom()+">> "+ message.getBody());
 	        }
 	        try {
 	        	String ret =onMessage(message.getBody(),chat, message.getFrom());
 	        	msg.setBody(ret);
-	        	System.out.println("Sending: "+msg.getBody());
+	        	com.neuronrobotics.sdk.common.Log.error("Sending: "+msg.getBody());
 	        	 if(log!=null){
 	 	        	log.onLogEvent(""+message.getFrom()+"<< "+ ret);
 	 	        }
 	            chat.sendMessage(msg);
 	        } catch (XMPPException ex) {
 	            ex.printStackTrace();
-	            System.out.println("Failed to send message");
+	            com.neuronrobotics.sdk.common.Log.error("Failed to send message");
 	        }
 	    } else {
-	        System.out.println("I got a message I didn't understand\n\n"+message.getType());
+	        com.neuronrobotics.sdk.common.Log.error("I got a message I didn't understand\n\n"+message.getType());
 	    }
 	}
 
@@ -146,11 +146,11 @@ private ChatAsyncListener getListener(Chat c,String from){
 		for(ChatAsyncListener l:listeners ){
 			if(l.getFrom().equals(from) && l.getChat()==c){
 				back = l;
-				System.out.println("Found old listener");
+				com.neuronrobotics.sdk.common.Log.error("Found old listener");
 			}
 		}
 		if(back == null){
-			System.out.println("Adding new listener");
+			com.neuronrobotics.sdk.common.Log.error("Adding new listener");
 			back = new ChatAsyncListener(c, from);
 			listeners.add(back);
 		}
@@ -203,7 +203,7 @@ public void onChannelEvent(DyIOChannelEvent e) {
 			Message msg = new Message(getFrom(), Message.Type.chat);
 			String body = "asyncData "+e.getChannel().getChannelNumber()+" "+e.getValue();
 			msg.setBody(body);
-			System.err.println("async: "+msg.getBody());
+			com.neuronrobotics.sdk.common.Log.error("async: "+msg.getBody());
             try {
 				chat.sendMessage(msg);
 			} catch (XMPPException e1) {

src/main/java/com/neuronrobotics/application/xmpp/DyIOConversationFactory.java

@@ -26,7 +26,7 @@ public DyIOConversationFactory(IChatLog mine) {
 	 */
 	@Override
 	public IConversation getConversation() {
-		System.out.println("Getting DyIO conversation");
+		com.neuronrobotics.sdk.common.Log.error("Getting DyIO conversation");
 		return new DyIOConversation(log);
 	}
 }

src/main/java/com/neuronrobotics/application/xmpp/GoogleChat/GoogleChatConversation.java

@@ -42,17 +42,17 @@ public String onMessage(String input,Chat chat, String from) {
 	public void processMessage(Chat chat, Message message) {
 		Message msg = new Message(message.getFrom(), Message.Type.chat);
 	    if(message.getType().equals(Message.Type.chat) && message.getBody() != null) {
-	        System.out.println("Received: " + message.getBody());
+	        com.neuronrobotics.sdk.common.Log.error("Received: " + message.getBody());
 	        try {
 	        	msg.setBody(onMessage(message.getBody(),chat, message.getFrom()));
-	        	System.out.println("Sending: "+msg.getBody());
+	        	com.neuronrobotics.sdk.common.Log.error("Sending: "+msg.getBody());
 	            chat.sendMessage(msg);
 	        } catch (XMPPException ex) {
 	            ex.printStackTrace();
-	            System.out.println("Failed to send message");
+	            com.neuronrobotics.sdk.common.Log.error("Failed to send message");
 	        }
 	    } else {
-	        System.out.println("I got a message I didn't understand\n\n"+message.getType());
+	        com.neuronrobotics.sdk.common.Log.error("I got a message I didn't understand\n\n"+message.getType());
 	    }
 	}
 

src/main/java/com/neuronrobotics/application/xmpp/GoogleChat/GoogleChatEngine.java

@@ -136,10 +136,10 @@ private void setLoginInfo(InputStream config) {
 		} catch (IOException e) {
 			throw new RuntimeException(e);
 		}
-		//System.out.println("Parsing File...");
+		//com.neuronrobotics.sdk.common.Log.error("Parsing File...");
 		NodeList nList = doc.getElementsByTagName("login");
 		for (int temp = 0; temp < nList.getLength(); temp++) {
-			//System.out.println("Leg # "+temp);
+			//com.neuronrobotics.sdk.common.Log.error("Leg # "+temp);
 			Element eElement = (Element)nList.item(temp);
 			username = getTagValue("username",eElement);
 	    	password = getTagValue("password",eElement);
@@ -157,7 +157,7 @@ private void setLoginInfo(InputStream config) {
 	public static String getTagValue(String sTag, Element eElement){
 	    NodeList nlList= eElement.getElementsByTagName(sTag).item(0).getChildNodes();
 	    Node nValue = (Node) nlList.item(0); 
-	    //System.out.println("\t\t"+sTag+" = "+nValue.getNodeValue());
+	    //com.neuronrobotics.sdk.common.Log.error("\t\t"+sTag+" = "+nValue.getNodeValue());
 	    return nValue.getNodeValue();    
 	}
 

src/main/java/com/neuronrobotics/replicator/driver/interpreter/GCodeInterpreter.java

@@ -143,7 +143,7 @@ public void processSingleGCODELine(String line) throws Exception{
 		nextLine.storeWord('G', 0);
 		nextLine.storeWord('M', 0);
 		nextLine.storeWord('P', lineNumber);
-		System.out.println("GCODE: "+line);
+		com.neuronrobotics.sdk.common.Log.error("GCODE: "+line);
 
 		for(int i=0;i<tokens.length;i++){
 			tokens[i] = tokens[i].trim();
@@ -163,7 +163,7 @@ public void processSingleGCODELine(String line) throws Exception{
 				nextLine.storeWord(code, val);
 			}
 		}
-		//System.out.println(nextLine);
+		//com.neuronrobotics.sdk.common.Log.error(nextLine);
 		executeLine(line);
 	}