diff --git a/build.gradle b/build.gradle index 2e732bf..216dccc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,5 @@ apply plugin: 'java' apply plugin: 'eclipse' -apply plugin: 'protobuf' task wrapper(type: Wrapper) { gradleVersion = '2.2' @@ -24,6 +23,8 @@ repositories { } dependencies { + compile 'org.slf4j:slf4j-log4j12:1.7.7' + compile 'org.picocontainer:picocontainer:2.15' compile 'org.msgpack:msgpack:0.6.11' compile 'com.sparetimelabs:purejavacomm:0.0.22' } \ No newline at end of file diff --git a/src/main/java/com/github/boukefalos/arduino/AbstractArduino.java b/src/main/java/com/github/boukefalos/arduino/AbstractArduino.java index 5574d00..7083309 100644 --- a/src/main/java/com/github/boukefalos/arduino/AbstractArduino.java +++ b/src/main/java/com/github/boukefalos/arduino/AbstractArduino.java @@ -1,36 +1,41 @@ -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 implements Arduino { - public static final int BUFFER_SIZE = 1024; - protected Logger logger = LoggerFactory.getLogger(getClass()); - protected ArrayList> listenList; - - public AbstractArduino() { - super(Worker.Type.DIRECT); - listenList = new ArrayList>(); - } - - public void register(Listen listen) { - listenList.add(listen); - } - - public void remove(Listen listen) { - listenList.remove(listen); - } - - public void start() {} - - public void stop() {} - - public void exit() { - stop(); - } -} +package com.github.boukefalos.arduino; + +import java.util.ArrayList; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import base.work.Listen; +import base.work.ReflectiveListen; +import base.worker.Worker; + +public abstract class AbstractArduino extends ReflectiveListen implements Arduino { + public static final int BUFFER_SIZE = 1024; + protected Logger logger = LoggerFactory.getLogger(getClass()); + protected ArrayList> listenList; + + public AbstractArduino() { + super(Worker.Type.DIRECT); + listenList = new ArrayList>(); + } + + public void register(ReflectiveListen listen) { + listenList.add(listen); + } + + public void remove(ReflectiveListen listen) { + listenList.remove(listen); + } + + public void start() {} + + public void stop() {} + + public void exit() { + stop(); + } + + public void input(byte[] buffer) { + logger.error("Input was not parsed in port!"); + } +} diff --git a/src/main/java/com/github/boukefalos/arduino/Arduino.java b/src/main/java/com/github/boukefalos/arduino/Arduino.java index f059b5c..9f9306c 100644 --- a/src/main/java/com/github/boukefalos/arduino/Arduino.java +++ b/src/main/java/com/github/boukefalos/arduino/Arduino.java @@ -1,13 +1,13 @@ package com.github.boukefalos.arduino; import base.Control; -import base.work.Listen; +import base.work.ReflectiveListen; import com.github.boukefalos.arduino.exception.ArduinoException; public interface Arduino extends Control { - public void register(Listen listen); - public void remove(Listen listen); + public void register(ReflectiveListen listen); + public void remove(ReflectiveListen listen); public void send(byte[] buffer) throws ArduinoException; } \ No newline at end of file diff --git a/src/main/java/com/github/boukefalos/arduino/Server.java b/src/main/java/com/github/boukefalos/arduino/Server.java index 55e0cb5..eb6172d 100644 --- a/src/main/java/com/github/boukefalos/arduino/Server.java +++ b/src/main/java/com/github/boukefalos/arduino/Server.java @@ -7,11 +7,11 @@ import base.Duplex; import base.Receiver; import base.exception.worker.ActivateException; import base.exception.worker.DeactivateException; -import base.work.Listen; +import base.work.ReflectiveListen; import com.github.boukefalos.arduino.exception.ArduinoException; -public class Server extends Listen implements Control, Receiver { +public class Server extends ReflectiveListen implements Control, Receiver { protected static final boolean DIRECT = false; protected Arduino arduino; diff --git a/src/main/java/com/github/boukefalos/arduino/port/Port.java b/src/main/java/com/github/boukefalos/arduino/port/Port.java index 2708aaa..f72eff2 100644 --- a/src/main/java/com/github/boukefalos/arduino/port/Port.java +++ b/src/main/java/com/github/boukefalos/arduino/port/Port.java @@ -28,7 +28,7 @@ public class Port implements SerialPortEventListener { "usbdev", // Linux "tty", // Linux "serial", // Linux - "COM3", // Windows + "COM", // Windows }; protected static Logger logger = LoggerFactory.getLogger(Port.class); @@ -71,7 +71,7 @@ public class Port implements SerialPortEventListener { portid = (CommPortIdentifier) portEnum.nextElement(); if (portid != null) { System.out.println("Trying: " + portid.getName()); - for ( String portName: PORT_NAMES) { + for (String portName : PORT_NAMES) { if (portid.getName().equals(portName) || portid.getName().contains(portName)) { try { serialPort = (SerialPort) portid.open("", TIME_OUT);