You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2020/07/11 11:34:37 UTC
[plc4x] 03/03: Made the "replay" transport config options
"replay-speed-factor" and "loop" configurable
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 5b2bbc557ca5b532100cc6ec2dd850da99bc1190
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Jul 9 16:35:53 2020 +0200
Made the "replay" transport config options "replay-speed-factor" and "loop" configurable
---
.../configuration/KnxNetIpConfiguration.java | 28 ++++++++++++++++++++++
.../knxnetip/protocol/KnxNetIpProtocolLogic.java | 2 --
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/configuration/KnxNetIpConfiguration.java b/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/configuration/KnxNetIpConfiguration.java
index ce16d00..7ce150d 100644
--- a/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/configuration/KnxNetIpConfiguration.java
+++ b/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/configuration/KnxNetIpConfiguration.java
@@ -21,6 +21,8 @@ package org.apache.plc4x.java.knxnetip.configuration;
import org.apache.plc4x.java.knxnetip.KnxNetIpDriver;
import org.apache.plc4x.java.spi.configuration.Configuration;
import org.apache.plc4x.java.spi.configuration.annotations.ConfigurationParameter;
+import org.apache.plc4x.java.spi.configuration.annotations.defaults.BooleanDefaultValue;
+import org.apache.plc4x.java.spi.configuration.annotations.defaults.FloatDefaultValue;
import org.apache.plc4x.java.spi.configuration.annotations.defaults.IntDefaultValue;
import org.apache.plc4x.java.transport.pcapreplay.PcapReplayTransportConfiguration;
import org.apache.plc4x.java.transport.rawsocket.RawSocketTransportConfiguration;
@@ -37,6 +39,14 @@ public class KnxNetIpConfiguration implements Configuration, UdpTransportConfigu
@IntDefaultValue(3)
public int groupAddressType = 3;
+ @ConfigurationParameter("replay-speed-factor")
+ @FloatDefaultValue(1.0f)
+ public float replaySpeedFactor = 1.0f;
+
+ @ConfigurationParameter("loop")
+ @BooleanDefaultValue(false)
+ public boolean loop = false;
+
public String getKnxprojFilePath() {
return knxprojFilePath;
}
@@ -54,6 +64,24 @@ public class KnxNetIpConfiguration implements Configuration, UdpTransportConfigu
}
@Override
+ public float getReplaySpeedFactor() {
+ return replaySpeedFactor;
+ }
+
+ public void setReplaySpeedFactor(float replaySpeedFactor) {
+ this.replaySpeedFactor = replaySpeedFactor;
+ }
+
+ @Override
+ public boolean isLoop() {
+ return loop;
+ }
+
+ public void setLoop(boolean loop) {
+ this.loop = loop;
+ }
+
+ @Override
public int getDefaultPort() {
return KnxNetIpDriver.KNXNET_IP_PORT;
}
diff --git a/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java b/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java
index 4a37545..cf6d34e 100644
--- a/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java
+++ b/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java
@@ -20,8 +20,6 @@ package org.apache.plc4x.java.knxnetip.protocol;
import io.netty.channel.socket.DatagramChannel;
import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent;
import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;