v.0.3.3: fix write delay and connection

Daniel Tuerk · Daniel Tuerk · commit e68fd9cba190 · 2026-01-03T15:59:44.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <groupId>net.wbz.selectrix4java</groupId>
-  <version>0.3.2-SNAPSHOT</version>
+  <version>0.3.3-SNAPSHOT</version>
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>selectrix4java</artifactId>
diff --git a/src/main/java/net/wbz/selectrix4java/block/FeedbackBlockModule.java b/src/main/java/net/wbz/selectrix4java/block/FeedbackBlockModule.java
@@ -78,7 +78,8 @@ private void handleReceivedFeedbackData(Collection<BusAddressData> data) {
         }
 
         if (stateAddressNewDataValue != -1 && feedbackAddressNewDataValue != -1) {
-            int sequenceNr = stateAddressNewDataValue & 0x60;
+            int sequenceNr = (stateAddressNewDataValue >> 5) & 0b11;
+            //int sequenceNr = stateAddressNewDataValue & 0x60;
             log.trace("sequence {}", sequenceNr);
 
             FeedbackTrainData feedbackTrainData = new FeedbackTrainData();
@@ -95,6 +96,9 @@ private void handleReceivedFeedbackData(Collection<BusAddressData> data) {
                 isDuplicate = trainAddressLastSend.get(feedbackTrainData.getTrainAddress()).equals(feedbackTrainData);
             }
             if (!isDuplicate) {
+                if(log.isTraceEnabled()) {
+                    log.trace("{}: value: {}",getBusAddress(), feedbackTrainData);
+                }
                 trainAddressLastSend.put(feedbackTrainData.getTrainAddress(), feedbackTrainData);
                 if (feedbackTrainData.isEnteringBlock()) {
                     dispatcher.fireTrainEnterBlock(feedbackTrainData.getBlockNr(), feedbackTrainData.getTrainAddress(),
@@ -104,11 +108,11 @@ private void handleReceivedFeedbackData(Collection<BusAddressData> data) {
                             feedbackTrainData.isTrainDirectionForward());
                 }
             } else {
-                log.error("duplicate: {}", feedbackTrainData);
+                log.error("duplicate ({}): {}", getBusAddress(), feedbackTrainData);
             }
 
         } else {
-            log.error("state ({}) and feedback ({}) not new", stateAddressNewDataValue, feedbackAddressNewDataValue);
+            log.error("{}: state ({}) and feedback ({}) not new", getBusAddress(), stateAddressNewDataValue, feedbackAddressNewDataValue);
         }
     }
 
diff --git a/src/main/java/net/wbz/selectrix4java/bus/BusAddress.java b/src/main/java/net/wbz/selectrix4java/bus/BusAddress.java
@@ -60,7 +60,6 @@ public void valueChanged(int oldValue, int newValue) {
                     if ((byte) newValue != lastReceivedData) {
                         lastReceivedData = (byte) newValue;
                         if (bitsToUpdate.isEmpty()) {
-                            LOG.trace("update data {} to last received {}", data, lastReceivedData);
                             data = lastReceivedData;
                         }
                         /*
diff --git a/src/main/java/net/wbz/selectrix4java/bus/BusDataDispatcher.java b/src/main/java/net/wbz/selectrix4java/bus/BusDataDispatcher.java
@@ -187,10 +187,11 @@ private void callConsumers(List<AbstractBusDataConsumer> consumers, int busNr, b
         for (int address = 0; address < data.length; address++) {
             // skip the multiplex counter of FCC TODO refactor to FCCImpl
             if (address != 111) {
-                if (initialCall || Byte.compare(data[address], oldData[address]) != 0) {
-                    log.trace(String.format("data changed (initial: %s) - bus: %d, address: %d, old: %d, new: %d",
-                        initialCall, busNr, address, oldData[address], data[address]));
-
+                if (initialCall || data[address] != oldData[address]) {
+                    if (log.isDebugEnabled() && (address > 0 && address != 112)) {
+                        log.debug(String.format("data changed (initial: %s) - bus: %d, address: %d, old: %d, new: %d",
+                            initialCall, busNr, address, oldData[address], data[address]));
+                    }
                     for (AbstractBusDataConsumer consumer : consumersToCall) {
                         if (consumer instanceof AllBusDataConsumer) {
                             callAllBusDataConsumers(busNr, address, oldData[address], data[address],
diff --git a/src/main/java/net/wbz/selectrix4java/data/BusDataChannel.java b/src/main/java/net/wbz/selectrix4java/data/BusDataChannel.java
@@ -33,7 +33,8 @@ public class BusDataChannel {
     /**
      * Delay between each task.
      */
-    public static final long DELAY_IN_MS = 55L;
+    public static final long DELAY_IN_MS = 77L;
+    //public static final long DELAY_IN_MS = 55L;
 
     private static final Logger log = LoggerFactory.getLogger(BusDataChannel.class);
     /**
diff --git a/src/main/java/net/wbz/selectrix4java/data/ReadBlockTask.java b/src/main/java/net/wbz/selectrix4java/data/ReadBlockTask.java
@@ -34,6 +34,8 @@ public class ReadBlockTask extends AbstractSerialAccessTask {
      * TODO FCC specific
      */
     private static final int DATA = 3;
+    private static final byte[] WRITE_BYTES = new byte[]{(byte) ADDRESS, (byte) DATA};
+
     /**
      * Delay to read the SX bus.
      */
@@ -66,7 +68,7 @@ public Boolean call() {
     private boolean readBlock(byte[] reply) {
         // request bus data
         try {
-            getOutputStream().write(new byte[]{(byte) ADDRESS, (byte) DATA});
+            getOutputStream().write(WRITE_BYTES);
             getOutputStream().flush();
 
             // waiting for full response from FCC
diff --git a/src/main/java/net/wbz/selectrix4java/data/WriteTask.java b/src/main/java/net/wbz/selectrix4java/data/WriteTask.java
@@ -71,7 +71,9 @@ public Boolean call() {
             } while (reply < 0);
 
             if (reply == 0) {
-                log.debug("write successful!");
+                if(log.isDebugEnabled()) {
+                    log.debug("write successful, reply: {}", reply);
+                }
             } else {
                 log.warn("write error reply: " + reply);
             }
diff --git a/src/main/java/net/wbz/selectrix4java/device/serial/SerialDevice.java b/src/main/java/net/wbz/selectrix4java/device/serial/SerialDevice.java
@@ -79,14 +79,20 @@ protected BusDataChannel doConnect(BusDataDispatcher busDataDispatcher) throws D
         System.setProperty("gnu.io.rxtx.SerialPorts", deviceId);
         serialPort = SerialPort.getCommPort(deviceId);
         try {
-            serialPort.openPort();
-            serialPort.setComPortTimeouts(SerialPort.TIMEOUT_READ_SEMI_BLOCKING, 0, 0);
+
+            serialPort.setComPortTimeouts(SerialPort.TIMEOUT_READ_SEMI_BLOCKING, 200, 200);
             outputStream = serialPort.getOutputStream();
             inputStream = serialPort.getInputStream();
             serialPort.setFlowControl(SerialPort.FLOW_CONTROL_DISABLED);
             serialPort.setBaudRate(baudRate);
             serialPort.setNumDataBits(8);
             serialPort.setNumStopBits(1);
+            serialPort.setParity(SerialPort.NO_PARITY);
+
+            if(!serialPort.openPort()) throw new Exception("can't open port");
+
+            outputStream = serialPort.getOutputStream();
+            inputStream = serialPort.getInputStream();
         } catch (Exception e) {
             throw new DeviceAccessException(String.format("can't connect to device for id %s", deviceId), e);
         }
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <Properties>
-        <Property name="LOG_PATTERN">%d{yyyy-MM-dd'T'HH:mm:ss.SSSZ} %p %m%n</Property>
+        <Property name="LOG_PATTERN">sl - %d{yyyy-MM-dd'T'HH:mm:ss.SSSZ} %p %m%n</Property>
     </Properties>
 
     <Appenders>
@@ -11,23 +11,9 @@
             <PatternLayout pattern="${LOG_PATTERN}"/>
         </Console>
 
-        <!-- File Appenders on need basis -->
-        <RollingFile name="File" fileName="${sys:user.home}/.moba/log/controlcenter.log"
-          filePattern="${sys:user.home}/.moba/log/controlcenter-%d{yyyy-MM-dd}-%i.log">
-            <LevelRangeFilter minLevel="DEBUG" maxLevel="ERROR" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout pattern="${LOG_PATTERN}"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="10MB"/>
-            </Policies>
-            <DefaultRolloverStrategy max="10"/>
-        </RollingFile>
-
     </Appenders>
 
     <Loggers>
-        <logger name="net.wbz">
-            <level value="debug"/>
-        </logger>
 
         <logger name="net.wbz.selectrix4java.block">
             <level value="trace"/>

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,8 @@ private void handleReceivedFeedbackData(Collection<BusAddressData> data) {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`if (stateAddressNewDataValue != -1 && feedbackAddressNewDataValue != -1) {`
`81`		`- int sequenceNr = stateAddressNewDataValue & 0x60;`
	`81`	`+ int sequenceNr = (stateAddressNewDataValue >> 5) & 0b11;`
	`82`	`+ //int sequenceNr = stateAddressNewDataValue & 0x60;`
`82`	`83`	`log.trace("sequence {}", sequenceNr);`
`83`	`84`
`84`	`85`	`FeedbackTrainData feedbackTrainData = new FeedbackTrainData();`
`@@ -95,6 +96,9 @@ private void handleReceivedFeedbackData(Collection<BusAddressData> data) {`
`95`	`96`	`isDuplicate = trainAddressLastSend.get(feedbackTrainData.getTrainAddress()).equals(feedbackTrainData);`
`96`	`97`	`}`
`97`	`98`	`if (!isDuplicate) {`
	`99`	`+ if(log.isTraceEnabled()) {`
	`100`	`+ log.trace("{}: value: {}",getBusAddress(), feedbackTrainData);`
	`101`	`+ }`
`98`	`102`	`trainAddressLastSend.put(feedbackTrainData.getTrainAddress(), feedbackTrainData);`
`99`	`103`	`if (feedbackTrainData.isEnteringBlock()) {`
`100`	`104`	`dispatcher.fireTrainEnterBlock(feedbackTrainData.getBlockNr(), feedbackTrainData.getTrainAddress(),`
`@@ -104,11 +108,11 @@ private void handleReceivedFeedbackData(Collection<BusAddressData> data) {`
`104`	`108`	`feedbackTrainData.isTrainDirectionForward());`
`105`	`109`	`}`
`106`	`110`	`} else {`
`107`		`- log.error("duplicate: {}", feedbackTrainData);`
	`111`	`+ log.error("duplicate ({}): {}", getBusAddress(), feedbackTrainData);`
`108`	`112`	`}`
`109`	`113`
`110`	`114`	`} else {`
`111`		`- log.error("state ({}) and feedback ({}) not new", stateAddressNewDataValue, feedbackAddressNewDataValue);`
	`115`	`+ log.error("{}: state ({}) and feedback ({}) not new", getBusAddress(), stateAddressNewDataValue, feedbackAddressNewDataValue);`
`112`	`116`	`}`
`113`	`117`	`}`
`114`	`118`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,6 @@ public void valueChanged(int oldValue, int newValue) {`
`60`	`60`	`if ((byte) newValue != lastReceivedData) {`
`61`	`61`	`lastReceivedData = (byte) newValue;`
`62`	`62`	`if (bitsToUpdate.isEmpty()) {`
`63`		`- LOG.trace("update data {} to last received {}", data, lastReceivedData);`
`64`	`63`	`data = lastReceivedData;`
`65`	`64`	`}`
`66`	`65`	`/*`