LupusNobilis
/
java-org.hwo
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of 10.97.0.1:/git/org.hwo 

Conflicts:
	src/org/hwo/io/servicelink/ServiceLink.java
thobaben_serialize
Harald Wolff 2014-06-04 13:56:09 +02:00
parent d0f3f99dd7 b08529d368
commit c2d7d0aeb1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/hwo/io/servicelink/ServiceLink.java
View File

@ -119,6 +119,8 @@ public class ServiceLink {
if (chksum != ChkSum.chksum(rxbuffer, 0, bb.position() - 2))
throw new ServiceLinkException();
System.err.println(String.format("recv(): %d.%d:%d = 0x%08x",achse,knoten,bb.getShort(3),bb.getInt(5)));
} catch (IOException e) {
getSerialPort().close();
@ -414,7 +416,7 @@ public class ServiceLink {
{
this.retries = 3;
this.serialPort = serialPort;
this.serialPort.setTimeout(200);
this.serialPort.setTimeout(250);
}