diff options
author | Adam Martindale <awiamartindale@googlemail.com> | 2011-09-07 11:31:02 +0100 |
---|---|---|
committer | Adam Martindale <awiamartindale@googlemail.com> | 2011-09-07 11:31:02 +0100 |
commit | cd0fdd04f3108f61482919309b2a2da5c33f6872 (patch) | |
tree | 99710b299a02fa58382df101766892c0c3b679a7 /PunchingBag/src/Arduino.java | |
parent | dc16d95ed5a4b5f15f327cbe609414dc9e5d6225 (diff) | |
parent | ba3448fb8093afd9d298cef1123a1bedfea13999 (diff) | |
download | punchingbag-cd0fdd04f3108f61482919309b2a2da5c33f6872.tar punchingbag-cd0fdd04f3108f61482919309b2a2da5c33f6872.tar.gz |
Merge branch 'master' of gitorious.org:punchingbag/punchingbag
Diffstat (limited to 'PunchingBag/src/Arduino.java')
-rw-r--r-- | PunchingBag/src/Arduino.java | 42 |
1 files changed, 34 insertions, 8 deletions
diff --git a/PunchingBag/src/Arduino.java b/PunchingBag/src/Arduino.java index 5e6e288..f76bcf6 100644 --- a/PunchingBag/src/Arduino.java +++ b/PunchingBag/src/Arduino.java @@ -11,7 +11,10 @@ import java.io.OutputStream; import gnu.io.*;
-public class Arduino {
+public class Arduino implements Runnable {
+
+ InputStream in;
+ OutputStream out;
static void listPorts()
{
@@ -85,12 +88,10 @@ public class Arduino { SerialPort serialPort = (SerialPort) commPort;
serialPort.setSerialPortParams(57600,SerialPort.DATABITS_8,SerialPort.STOPBITS_1,SerialPort.PARITY_NONE);
- InputStream in = serialPort.getInputStream();
- OutputStream out = serialPort.getOutputStream();
+ in = serialPort.getInputStream();
+ out = serialPort.getOutputStream();
- (new Thread(new SerialReader(in))).start();
- (new Thread(new SerialWriter(out))).start();
-
+ (new Thread(this)).start();
}
else
{
@@ -100,7 +101,7 @@ public class Arduino { }
/** */
- public static class SerialReader implements Runnable
+ public class SerialReader implements Runnable
{
InputStream in;
@@ -118,6 +119,7 @@ public class Arduino { while ( ( len = this.in.read(buffer)) > -1 )
{
System.out.print(new String(buffer,0,len));
+ input(new String(buffer,0,len));
}
}
catch ( IOException e )
@@ -126,9 +128,13 @@ public class Arduino { }
}
}
+
+ public static void input(String string) {
+
+ }
/** */
- public static class SerialWriter implements Runnable
+ public class SerialWriter implements Runnable
{
OutputStream out;
@@ -154,4 +160,24 @@ public class Arduino { }
}
+ public void run() {
+ byte[] buffer = new byte[1024];
+ int len = -1;
+ try
+ {
+ while ( ( len = this.in.read(buffer)) > -1 )
+ {
+ System.out.print(new String(buffer,0,len));
+ input(new String(buffer,0,len));
+ }
+ }
+ catch ( IOException e )
+ {
+ e.printStackTrace();
+ }
+
+ }
+
+
+
}
|