Merge branch 'master' of schwann.lupus:/git/java/org.hwo.servicelink

src/org/hwo/servicelink/ServiceLink.java

@@ -323,6 +323,7 @@ public class ServiceLink implements NewSerialPortListener {
 				}
 				rx = ServiceLinkTelegram.read(getSerialPort().getInputStream());
 				if (rx != null){
+					log(DEBUG,"RX: %s", rx.getAddress());
 					received(rx);
 				}
 			}

src/org/hwo/servicelink/ServiceLinkAddress.java

@@ -12,6 +12,10 @@ public class ServiceLinkAddress {
 		this.ax = ax;
 		this.node = node;
 		this.register = register;
+		
+		if (this.register < 0){
+			this.register += 65536;
+		}
 	}
 	
 	@Override