Merge branch 'master' of schwann.lupus:/git/java/org.hwo.servicelink
commit
8412607d93
|
@ -303,6 +303,7 @@ public class ServiceLink implements NewSerialPortListener {
|
|||
long rstart,rend;
|
||||
|
||||
ServiceTelegram telegram = new ServiceTelegram();
|
||||
ServiceTelegram rx = new ServiceTelegram();
|
||||
|
||||
telegram.setRequest(request);
|
||||
telegram.setAchse(achse);
|
||||
|
@ -317,11 +318,11 @@ public class ServiceLink implements NewSerialPortListener {
|
|||
rstart = System.currentTimeMillis();
|
||||
for (int n = 0; n<3; n++)
|
||||
{
|
||||
telegram.recv();
|
||||
rx.recv();
|
||||
if (
|
||||
(telegram.getAchse() == achse) &&
|
||||
(telegram.getKnoten() == knoten) &&
|
||||
(telegram.getRegister() == register)
|
||||
(rx.getAchse() == achse) &&
|
||||
(rx.getKnoten() == knoten) &&
|
||||
(rx.getRegister() == register)
|
||||
)
|
||||
break;
|
||||
};
|
||||
|
@ -329,10 +330,10 @@ public class ServiceLink implements NewSerialPortListener {
|
|||
|
||||
requestTime.cycle((int)(rend - rstart));
|
||||
|
||||
if ((telegram.getRequest() & REQ_ACK)==0)
|
||||
if ((rx.getRequest() & REQ_ACK)==0)
|
||||
throw new ServiceLinkRequestFailedException(telegram);
|
||||
|
||||
return telegram;
|
||||
return rx;
|
||||
}
|
||||
|
||||
public synchronized NewSerialPort getSerialPort() {
|
||||
|
|
Loading…
Reference in New Issue