Migrate to general jlibarduino

src/main/java/com/github/boukefalos/arduino/AbstractArduino.java

@@ -0,0 +1,27 @@
+package com.github.boukefalos.arduino;
+
+import java.util.ArrayList;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import base.work.Listen;
+import base.worker.Worker;
+
+public abstract class AbstractArduino extends Listen<Object> implements Arduino {
+	public static final int BUFFER_SIZE = 1024;
+	protected Logger logger = LoggerFactory.getLogger(getClass());
+	protected ArrayList<Listen<Object>> listenList;
+
+	public AbstractArduino() {
+		super(Worker.Type.DIRECT);
+	}
+
+	public void start() {}
+
+	public void stop() {}
+
+	public void exit() {
+		stop();
+	}
+}

src/main/java/com/github/boukefalos/arduino/Arduino.java

@@ -0,0 +1,13 @@
+package com.github.boukefalos.arduino;
+
+import base.Control;
+import base.work.Listen;
+
+import com.github.boukefalos.arduino.exception.ArduinoException;
+
+public interface Arduino extends Control {
+	public void register(Listen<Object> listen);
+	public void remove(Listen<Object> listen);
+
+	public void send(byte[] buffer) throws ArduinoException;
+}

src/main/java/com/github/boukefalos/arduino/Loader.java

@@ -1,4 +1,4 @@
-package com.github.boukefalos.tm1638;
+package com.github.boukefalos.arduino;
 
 import java.util.Properties;
 
@@ -10,30 +10,32 @@ import org.picocontainer.parameters.ConstantParameter;
 import base.exception.LoaderException;
 import base.loader.AbstractLoader;
 
-import com.github.boukefalos.tm1638.exception.ArduinoException;
-import com.github.boukefalos.tm1638.implementation.Local;
-import com.github.boukefalos.tm1638.implementation.Remote;
+import com.github.boukefalos.arduino.exception.ArduinoException;
+import com.github.boukefalos.arduino.implementation.Local;
+import com.github.boukefalos.arduino.implementation.Remote;
 
 public class Loader extends AbstractLoader<Loader> {
-    protected static final String PROPERTIES_FILE = "TM1638.properties";
+    protected static final String PROPERTIES_FILE = "arduino.properties";
 
-	public Loader(Properties properties) throws LoaderException {
-		super();
+    public Loader(Properties properties) throws LoaderException {
+    	this(Local.class, Remote.class, Server.class, properties);
+    }
 
+	public Loader(Class<?> localClass, Class<?> remoteClass, Class<?> serverClass, Properties properties) throws LoaderException {
 		/* Add implementation */
 		switch (properties.getProperty("implementation")) {
 			case "local":
-				pico.addComponent(TM1638.class, Local.class);
+				pico.addComponent(localClass);
 				break;				
 			case "remote":
-				pico.addComponent(TM1638.class, Remote.class);
+				pico.addComponent(remoteClass);
 
 				/* Add remote duplex implementation */
 				try {
-					String protocol = properties.getOrDefault("server.protocol", "tcp").toString();
+					String protocol = properties.getOrDefault("protocol", "tcp").toString();
 					String implementation = properties.getOrDefault("tcp.implementation", "socket").toString();
 					String host = properties.getProperty("remote.host");
-					int port = Integer.valueOf(properties.getProperty("remote.port"));
+					int port = Integer.valueOf(properties.getProperty("remote.port"));					
 					addClientDuplex(protocol, implementation, host, port);
 				} catch (NumberFormatException e) {
 					throw new LoaderException("Failed to parse remote.port");
@@ -44,7 +46,7 @@ public class Loader extends AbstractLoader<Loader> {
 		/* Add server */
 		if (properties.getProperty("server") != null) {
 			boolean direct = Boolean.parseBoolean(properties.getOrDefault("server.direct", Server.DIRECT).toString());
-			pico.addComponent(Server.class, Server.class, new Parameter[] {
+			pico.addComponent(serverClass, serverClass, new Parameter[] {
 				new ComponentParameter(),
 				new ComponentParameter(),
 				new ConstantParameter(direct)});
@@ -61,9 +63,9 @@ public class Loader extends AbstractLoader<Loader> {
 		}
 	}
 
-	public TM1638 getTM1638() throws ArduinoException {
+	public Arduino getArduino() throws ArduinoException {
 		try {
-			return pico.getComponent(TM1638.class);
+			return (Arduino) pico.getComponent(Arduino.class);
 		} catch (PicoCompositionException e) {
 			throw new ArduinoException("Failed to load");
 		}

src/main/java/com/github/boukefalos/arduino/Server.java

@@ -0,0 +1,64 @@
+package com.github.boukefalos.arduino;
+
+import java.io.IOException;
+
+import base.Control;
+import base.Duplex;
+import base.Receiver;
+import base.exception.worker.ActivateException;
+import base.exception.worker.DeactivateException;
+import base.work.Listen;
+
+import com.github.boukefalos.arduino.exception.ArduinoException;
+
+public class Server extends Listen<Object> implements Control, Receiver {
+	protected static final boolean DIRECT = false;
+
+    protected Arduino arduino;
+	protected Duplex duplex;
+	protected boolean direct;
+
+	public Server(Arduino arduino, Duplex duplex) {
+		this(arduino, duplex, DIRECT);
+	}
+
+	public Server(Arduino tm1638, Duplex duplex, boolean direct) {
+		this.arduino = tm1638;
+		this.duplex = duplex;
+		this.direct = direct;
+		arduino.register(this); // Arduino > [input()]
+		duplex.register(this); // Client > [receive()]
+	}
+
+	public void activate() throws ActivateException {
+		duplex.start();
+		super.activate();
+	}
+	
+	public void deactivate() throws DeactivateException {
+		duplex.stop();
+		super.deactivate();
+	}
+
+	public void receive(byte[] buffer) {
+		// Client > [Server] > Arduino
+		if (direct) {
+			try {
+				arduino.send(buffer);
+			} catch (ArduinoException e) {
+				logger.error("", e);
+			}
+		} else {
+			// option to decode() in derivatives?
+		}
+	}
+
+	public void input(byte[] buffer) {
+		// Arduino > [Server] > Client
+		try {
+			duplex.send(buffer);
+		} catch (IOException e) {
+			logger.error("", e);
+		}
+	}
+}

src/main/java/com/github/boukefalos/arduino/exception/ArduinoException.java

@@ -1,4 +1,4 @@
-package com.github.boukefalos.tm1638.exception;
+package com.github.boukefalos.arduino.exception;
 
 import java.io.IOException;
 

src/main/java/com/github/boukefalos/arduino/implementation/Local.java

@@ -1,23 +1,23 @@
-package com.github.boukefalos.tm1638.implementation;
+package com.github.boukefalos.arduino.implementation;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
 import base.work.Listen;
 
-import com.github.boukefalos.tm1638.AbstractTM1638;
-import com.github.boukefalos.tm1638.Arduino;
-import com.github.boukefalos.tm1638.exception.ArduinoException;
+import com.github.boukefalos.arduino.AbstractArduino;
+import com.github.boukefalos.arduino.exception.ArduinoException;
+import com.github.boukefalos.arduino.port.Port;
 
-public class Local extends AbstractTM1638 {
-	protected Arduino arduino;
+public class Local extends AbstractArduino {
+	protected Port arduino;
 	protected OutputStream outputStream;
 
 	public Local() throws Exception {
-		this(Arduino.getInstance());
+		this(Port.getInstance());
 	}
 
-	public Local(Arduino arduino) throws ArduinoException {
+	public Local(Port arduino) throws ArduinoException {
 		this.arduino = arduino;
 		outputStream = arduino.getOutputStream();
 	}

src/main/java/com/github/boukefalos/arduino/implementation/Remote.java

@@ -1,4 +1,4 @@
-package com.github.boukefalos.tm1638.implementation;
+package com.github.boukefalos.arduino.implementation;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -7,12 +7,11 @@ import base.Duplex;
 import base.Receiver;
 import base.work.Listen;
 
-import com.github.boukefalos.tm1638.AbstractTM1638;
-import com.github.boukefalos.tm1638.exception.ArduinoException;
+import com.github.boukefalos.arduino.AbstractArduino;
+import com.github.boukefalos.arduino.exception.ArduinoException;
 
-public class Remote extends AbstractTM1638 implements Receiver {
+public class Remote extends AbstractArduino implements Receiver {
 	protected Duplex duplex;
-	protected ArrayList<Listen<Object>> listenList;
 
 	public Remote(Duplex duplex) {
 		this.duplex = duplex;

src/main/java/com/github/boukefalos/arduino/port/ParsingPort.java

@@ -0,0 +1,36 @@
+package com.github.boukefalos.arduino.port;
+
+import java.io.InputStream;
+import java.lang.reflect.Method;
+
+import purejavacomm.SerialPortEvent;
+import base.work.Listen;
+
+public class ParsingPort extends Port {
+	protected Class<?> messageClass;
+
+	protected ParsingPort(Class<?> messageClass) {
+		this.messageClass = messageClass;
+	}
+
+	public static Port getInstance(Class<?> messageClass) {
+    	if (port == null) {
+    		port = new ParsingPort(messageClass);
+    	}
+    	return port;
+	}
+
+	public void serialEvent(SerialPortEvent event) {
+		try {
+			Method m = messageClass.getMethod("parseDelimitedFrom", InputStream.class);
+			Object object = m.invoke(null, inputStream);
+			for (Listen<Object> listen : listenList) {
+				listen.add(object);
+			}
+		} catch (Exception e) {
+			logger.error("", e);
+		} catch (Throwable e) {
+			logger.error("", e);
+		}
+	}
+}

src/main/java/com/github/boukefalos/arduino/port/Port.java

@@ -1,4 +1,5 @@
-package com.github.boukefalos.tm1638;
+package com.github.boukefalos.arduino.port;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -15,12 +16,11 @@ import purejavacomm.SerialPort;
 import purejavacomm.SerialPortEvent;
 import purejavacomm.SerialPortEventListener;
 import purejavacomm.UnsupportedCommOperationException;
-import tm1638.Tm1638.Echo;
 import base.work.Listen;
 
-import com.github.boukefalos.tm1638.exception.ArduinoException;
+import com.github.boukefalos.arduino.exception.ArduinoException;
  
-public class Arduino implements SerialPortEventListener {
+public class Port implements SerialPortEventListener {
 	public static final int BUFFER_SIZE = 1024;
     public static final int TIME_OUT = 1000;
     public static final String PORT_NAMES[] = {
@@ -31,35 +31,37 @@ public class Arduino implements SerialPortEventListener {
         "COM3",         // Windows
     };
 
-	protected static Logger logger = LoggerFactory.getLogger(Arduino.class);
-	protected static Arduino arduino;
+	protected static Logger logger = LoggerFactory.getLogger(Port.class);
+	protected static Port port;
 
 	protected int bufferSize;
-    protected SerialPort port = null;
+    protected SerialPort serialPort = null;
     protected InputStream inputStream = null;
     protected ArrayList<Listen<Object>> listenList = new ArrayList<Listen<Object>>();
 
-    protected Arduino(int bufferSize) {
+    protected Port() {}
+
+    protected Port(int bufferSize) {
     	this.bufferSize = bufferSize;
     }
 
 	public void register(Listen<Object> listen) {
         listenList.add(listen);
 	}
-	
+
 	public void remove(Listen<Object> listen) {
 		listenList.remove(listen);
 	}
 
-    public static Arduino getInstance() {
+    public static Port getInstance() {
     	return getInstance(BUFFER_SIZE);
     }
 
-    public static Arduino getInstance(int bufferSize) {
-    	if (arduino == null) {
-    		arduino = new Arduino(bufferSize);
+    public static Port getInstance(int bufferSize) {
+    	if (port == null) {
+    		port = new Port(bufferSize);
     	}
-    	return arduino;
+    	return port;
     }
 
     protected void connect() throws ArduinoException {
@@ -72,17 +74,17 @@ public class Arduino implements SerialPortEventListener {
                 for ( String portName: PORT_NAMES) {
                     if (portid.getName().equals(portName) || portid.getName().contains(portName)) {
                         try {
-                        	port = (SerialPort) portid.open("", TIME_OUT);
-	                        port.setFlowControlMode(
+                        	serialPort = (SerialPort) portid.open("", TIME_OUT);
+	                        serialPort.setFlowControlMode(
 	                        		SerialPort.FLOWCONTROL_XONXOFF_IN + 
 	                        		SerialPort.FLOWCONTROL_XONXOFF_OUT);
-	                        inputStream = port.getInputStream();
-	                        System.out.println( "Connected on port: " + portid.getName());
-	                        port.addEventListener(this);
+	                        inputStream = serialPort.getInputStream();
+	                        System.out.println("Connected on port: " + portid.getName());
+	                        serialPort.addEventListener(this);
 	                    } catch (UnsupportedCommOperationException | PortInUseException | IOException | TooManyListenersException e) {
 	                    	throw new ArduinoException("Failed to connect");
 	                    }
-                        port.notifyOnDataAvailable(true);
+                        serialPort.notifyOnDataAvailable(true);
                         return;
                     }
                 }
@@ -92,47 +94,46 @@ public class Arduino implements SerialPortEventListener {
     }
  
     public void serialEvent(SerialPortEvent event) {
-		try {
-			switch (event.getEventType()) {
-                case SerialPortEvent.DATA_AVAILABLE:
-                	// Where should this be parsed, or should byte[] be passed directly?
-    				Echo echo = Echo.parseDelimitedFrom(inputStream);
-    				System.err.println(echo.getMessage());
-                    for (Listen<Object> listen : listenList) {
-                    	listen.add(echo);
-                    }
-                    break; 
-                default:
-                    break;
-            }
-		} catch (IOException e) {			
-			logger.error("", e);
+		switch (event.getEventType()) {
+		    case SerialPortEvent.DATA_AVAILABLE:
+				byte[] buffer = new byte[bufferSize];
+				try {
+					inputStream.read(buffer);
+					for (Listen<Object> listen : listenList) {
+						listen.add(buffer);
+					}
+				} catch (IOException e) {
+					logger.error("", e);
+				}		    	
+		        break; 
+		    default:
+		        break;
 		}
     }
 
 	public InputStream getInputStream() throws ArduinoException {		
-		if (port == null) {
+		if (serialPort == null) {
 			connect();	
 		}
 		try {
-			return port.getInputStream();
+			return serialPort.getInputStream();
 		} catch (IOException e) {
 			throw new ArduinoException("Failed to get inputstream");
 		}
 	}
 
 	public OutputStream getOutputStream() throws ArduinoException {
-		if (port == null) {
+		if (serialPort == null) {
 			connect();	
 		}
 		try {
-			return port.getOutputStream();
+			return serialPort.getOutputStream();
 		} catch (IOException e) {
 			throw new ArduinoException("Failed to get inputstream");
 		}
 	}
 
 	public void close() {
-		port.close();		
+		serialPort.close();		
 	}
 }

src/main/java/com/github/boukefalos/tm1638/AbstractTM1638.java

@@ -1,65 +0,0 @@
-package com.github.boukefalos.tm1638;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import tm1638.Tm1638.Color;
-import tm1638.Tm1638.Command;
-import tm1638.Tm1638.Command.Type;
-import tm1638.Tm1638.Construct;
-import tm1638.Tm1638.Ping;
-import tm1638.Tm1638.SetLed;
-import base.Sender;
-
-public abstract class AbstractTM1638 implements TM1638, Sender {
-	public static final int BUFFER_SIZE = 1024;
-	protected Logger logger = LoggerFactory.getLogger(getClass());
-
-	public void start() {}
-
-	public void stop() {}
-
-	public void exit() {
-		stop();
-	}
-
-	public void command(Command command) {
-		ByteArrayOutputStream output = new ByteArrayOutputStream(BUFFER_SIZE);
-		try {
-			command.writeDelimitedTo(output);
-			byte[] buffer = output.toByteArray();
-			send(buffer);
-		} catch (IOException e) {
-			logger.error("Failed to send command");
-		}
-	}
-
-	public void construct(int dataPin, int clockPin, int strobePin) {
-		command(Command.newBuilder()
-			.setType(Type.CONSTRUCT)
-			.setConstruct(
-				Construct.newBuilder()
-					.setDataPin(dataPin)
-					.setClockPin(clockPin)
-					.setStrobePin(strobePin).build()).build());	
-	}
-
-	public void ping(int id) {
-    	command(Command.newBuilder()
-			.setType(Type.PING)
-			.setPing(Ping.newBuilder()
-				.setId(id)).build());
-	}
-
-	public void setLed(Color color, int pos) {
-		command(Command.newBuilder()
-        	.setType(Type.SET_LED)
-        	.setSetLed(
-        		SetLed.newBuilder()
-        			.setColor(color)
-        			.setPos(pos).build()).build());
-	}
-}

src/main/java/com/github/boukefalos/tm1638/Server.java

@@ -1,96 +0,0 @@
-package com.github.boukefalos.tm1638;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-import tm1638.Tm1638.Color;
-import tm1638.Tm1638.Command;
-import tm1638.Tm1638.Ping;
-import tm1638.Tm1638.SetLed;
-import base.Control;
-import base.Duplex;
-import base.Receiver;
-import base.exception.worker.ActivateException;
-import base.exception.worker.DeactivateException;
-import base.work.Listen;
-
-import com.github.boukefalos.tm1638.exception.ArduinoException;
-
-public class Server extends Listen<Object> implements Control, Receiver {
-	protected static final boolean DIRECT = false;
-
-    protected TM1638 tm1638;
-	protected Duplex duplex;
-	protected boolean direct;
-
-	public Server(TM1638 tm1638, Duplex duplex) {
-		this(tm1638, duplex, DIRECT);
-	}
-
-	public Server(TM1638 tm1638, Duplex duplex, boolean direct) {
-		this.tm1638 = tm1638;
-		this.duplex = duplex;
-		this.direct = direct;
-		tm1638.register(this); // Arduino > [input()]
-		duplex.register(this); // Client > [receive()]
-	}
-
-	public void activate() throws ActivateException {
-		duplex.start();
-		super.activate();
-	}
-	
-	public void deactivate() throws DeactivateException {
-		duplex.stop();
-		super.deactivate();
-	}
-
-	public void receive(byte[] buffer) {
-		// Client > [Server] > Arduino
-		if (direct) {
-			try {
-				tm1638.send(buffer);
-			} catch (ArduinoException e) {
-				logger.error("", e);
-			}
-		} else {
-			ByteArrayInputStream input = new ByteArrayInputStream(buffer);
-			try {
-				Command command = Command.parseDelimitedFrom(input);
-				logger.debug("Command type = " + command.getType().name());
-				switch (command.getType()) {
-					case PING:
-						Ping ping = command.getPing();
-						tm1638.ping(ping.getId());
-						break;
-					case SET_LED:
-						SetLed setLed = command.getSetLed();
-						logger.debug("Color = " + setLed.getColor().name());
-						switch (setLed.getColor()) {
-							case RED:
-								tm1638.setLed(Color.RED, 1);
-							case GREEN:
-								tm1638.setLed(Color.GREEN, 1);
-							default:
-								break;
-						}
-						break;
-					default:
-						break;
-				}
-			} catch (IOException e) {
-				logger.error("Failed to parse input");
-				return;
-			}
-		}
-	}
-
-	public void input(byte[] buffer) {
-		// Arduino > [Server] > Client
-		try {
-			duplex.send(buffer);
-		} catch (IOException e) {
-			logger.error("", e);
-		}
-	}
-}

src/main/java/com/github/boukefalos/tm1638/TM1638.java

@@ -1,18 +0,0 @@
-package com.github.boukefalos.tm1638;
-
-import com.github.boukefalos.tm1638.exception.ArduinoException;
-
-import tm1638.Tm1638.Color;
-import base.Control;
-import base.work.Listen;
-
-public interface TM1638 extends Control {
-	public void register(Listen<Object> listen);
-	public void remove(Listen<Object> listen);
-
-	public void send(byte[] buffer) throws ArduinoException;
-
-	public void construct(int dataPin, int clockPin, int strobePin);
-	public void ping(int i);
-	public void setLed(Color color, int pos);
-}