Author: jvermillard
Date: Fri Jan 12 07:35:39 2007
New Revision: 495609
URL: http://svn.apache.org/viewvc?view=rev&rev=495609
Log:
better serial params names, changed data bit from an enum to int and forbid
updateTrafficMask (prolly useless for that slow comms...)
Modified:
mina/sandbox/jvermillard/serial/src/main/java/TestSerial.java
mina/sandbox/jvermillard/serial/src/main/java/org/apache/mina/transport/serial/SerialPortAddress.java
mina/sandbox/jvermillard/serial/src/main/java/org/apache/mina/transport/serial/SerialSession.java
Modified: mina/sandbox/jvermillard/serial/src/main/java/TestSerial.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/jvermillard/serial/src/main/java/TestSerial.java?view=diff&rev=495609&r1=495608&r2=495609
==============================================================================
--- mina/sandbox/jvermillard/serial/src/main/java/TestSerial.java (original)
+++ mina/sandbox/jvermillard/serial/src/main/java/TestSerial.java Fri Jan 12
07:35:39 2007
@@ -75,7 +75,7 @@
}
});
- ConnectFuture future=connector.connect(new
SerialPortAddress("/dev/ttyUSB0",38400,DataBits.DATABITS_8,StopBits.STOP_BITS_1,Parity.PARITY_NONE,FlowControl.FLOWCONTROL_NONE));
+ ConnectFuture future=connector.connect(new
SerialPortAddress("/dev/ttyUSB0",38400,8,StopBits.BITS_1,Parity.NONE,FlowControl.NONE));
IoSession session=future.getSession();
try {
Modified:
mina/sandbox/jvermillard/serial/src/main/java/org/apache/mina/transport/serial/SerialPortAddress.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/jvermillard/serial/src/main/java/org/apache/mina/transport/serial/SerialPortAddress.java?view=diff&rev=495609&r1=495608&r2=495609
==============================================================================
---
mina/sandbox/jvermillard/serial/src/main/java/org/apache/mina/transport/serial/SerialPortAddress.java
(original)
+++
mina/sandbox/jvermillard/serial/src/main/java/org/apache/mina/transport/serial/SerialPortAddress.java
Fri Jan 12 07:35:39 2007
@@ -39,37 +39,37 @@
public enum Parity
{
- PARITY_NONE,
- PARITY_ODD,
- PARITY_EVEN,
- PARITY_MARK,
- PARITY_SPACE
+ NONE,
+ ODD,
+ EVEN,
+ MARK,
+ SPACE
}
public enum StopBits
{
- STOP_BITS_1,
- STOP_BITS_2,
- STOP_BITS_1_5
+ BITS_1,
+ BITS_2,
+ BITS_1_5
}
public enum FlowControl {
- FLOWCONTROL_NONE,
- FLOWCONTROL_RTSCTS_IN,
- FLOWCONTROL_RTSCTS_OUT,
- FLOWCONTROL_XONXOFF_IN,
- FLOWCONTROL_XONXOFF_OUT
+ NONE,
+ RTSCTS_IN,
+ RTSCTS_OUT,
+ XONXOFF_IN,
+ XONXOFF_OUT
}
private String name;
private int bauds;
- private DataBits dataBits;
+ private int dataBits;
private StopBits stopBits;
private Parity parity;
private FlowControl flowControl;
- public SerialPortAddress(String name, int bauds, DataBits dataBits,
StopBits stopBits,
+ public SerialPortAddress(String name, int bauds, int dataBits, StopBits
stopBits,
Parity parity, FlowControl flowControl)
{
super();
@@ -85,7 +85,7 @@
return bauds;
}
- public DataBits getDataBits() {
+ public int getDataBits() {
return dataBits;
}
@@ -113,13 +113,13 @@
{
switch (dataBits)
{
- case DATABITS_5:
+ case 5:
return SerialPort.DATABITS_5;
- case DATABITS_6:
- return SerialPort.DATABITS_6;
- case DATABITS_7:
+ case 6:
+ return SerialPort.DATABITS_6;
+ case 7:
return SerialPort.DATABITS_7;
- case DATABITS_8:
+ case 8:
return SerialPort.DATABITS_8;
}
throw new InvalidParameterException( "broken databits");
@@ -130,11 +130,11 @@
{
switch (stopBits)
{
- case STOP_BITS_1:
+ case BITS_1:
return SerialPort.STOPBITS_1;
- case STOP_BITS_1_5:
+ case BITS_1_5:
return SerialPort.STOPBITS_1_5;
- case STOP_BITS_2:
+ case BITS_2:
return SerialPort.STOPBITS_2;
}
throw new InvalidParameterException( "broken stopbits");
@@ -144,15 +144,15 @@
{
switch (parity)
{
- case PARITY_EVEN:
+ case EVEN:
return SerialPort.PARITY_EVEN;
- case PARITY_MARK:
+ case MARK:
return SerialPort.PARITY_MARK;
- case PARITY_NONE:
+ case NONE:
return SerialPort.PARITY_NONE;
- case PARITY_ODD:
+ case ODD:
return SerialPort.PARITY_ODD;
- case PARITY_SPACE:
+ case SPACE:
return SerialPort.PARITY_SPACE;
}
throw new InvalidParameterException( "broken parity");
@@ -161,15 +161,15 @@
int getFLowControlForRXTX() {
switch(flowControl)
{
- case FLOWCONTROL_NONE:
+ case NONE:
return SerialPort.FLOWCONTROL_NONE;
- case FLOWCONTROL_RTSCTS_IN:
+ case RTSCTS_IN:
return SerialPort.FLOWCONTROL_RTSCTS_IN;
- case FLOWCONTROL_RTSCTS_OUT:
+ case RTSCTS_OUT:
return SerialPort.FLOWCONTROL_RTSCTS_OUT;
- case FLOWCONTROL_XONXOFF_IN:
+ case XONXOFF_IN:
return SerialPort.FLOWCONTROL_XONXOFF_IN;
- case FLOWCONTROL_XONXOFF_OUT:
+ case XONXOFF_OUT:
return SerialPort.FLOWCONTROL_XONXOFF_OUT;
}
throw new InvalidParameterException( "broken stopbits");
Modified:
mina/sandbox/jvermillard/serial/src/main/java/org/apache/mina/transport/serial/SerialSession.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/jvermillard/serial/src/main/java/org/apache/mina/transport/serial/SerialSession.java?view=diff&rev=495609&r1=495608&r2=495609
==============================================================================
---
mina/sandbox/jvermillard/serial/src/main/java/org/apache/mina/transport/serial/SerialSession.java
(original)
+++
mina/sandbox/jvermillard/serial/src/main/java/org/apache/mina/transport/serial/SerialSession.java
Fri Jan 12 07:35:39 2007
@@ -59,8 +59,7 @@
@Override
protected void updateTrafficMask() {
- // TODO Auto-generated method stub
-
+ throw new UnsupportedOperationException();
}
public IoSessionConfig getConfig() {
