You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2020/06/10 05:33:11 UTC

[incubator-streampipes-extensions] branch dev updated: Fix modbus adapter

This is an automated email from the ASF dual-hosted git repository.

zehnder pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git


The following commit(s) were added to refs/heads/dev by this push:
     new 69f41fd  Fix modbus adapter
69f41fd is described below

commit 69f41fd245ece72b0d305844ae30fd1452b5420b
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Wed Jun 10 07:32:54 2020 +0200

    Fix modbus adapter
---
 .../streampipes/connect/adapters/plc4x/modbus/Plc4xModbusAdapter.java | 4 ++--
 .../jvm/processor/booloperator/edge/SignalEdgeFilter.java             | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/modbus/Plc4xModbusAdapter.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/modbus/Plc4xModbusAdapter.java
index 92cdaef..b932fd5 100644
--- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/modbus/Plc4xModbusAdapter.java
+++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/plc4x/modbus/Plc4xModbusAdapter.java
@@ -242,10 +242,10 @@ public class Plc4xModbusAdapter extends PullAdapter{
 		
 		for (Map<String, String> node : this.nodes) {
 			if (node.get(PLC_NODE_TYPE).equals("Coil")) {
-				builder.addItem(node.get(PLC_NODE_NAME), "coil:" + node.get(PLC_NODE_ADDRESS));				
+				builder.addItem(node.get(PLC_NODE_NAME), "coil:" + String.valueOf(node.get(PLC_NODE_ADDRESS)));
 			}
 			else {
-				builder.addItem(node.get(PLC_NODE_NAME), "holding-register:" + node.get(PLC_NODE_ADDRESS));
+				builder.addItem(node.get(PLC_NODE_NAME), "holding-register:" + String.valueOf(node.get(PLC_NODE_ADDRESS)));
 			}
 		}
 		PlcReadRequest readRequest = builder.build();
diff --git a/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/edge/SignalEdgeFilter.java b/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/edge/SignalEdgeFilter.java
index ed38c8a..8656e48 100644
--- a/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/edge/SignalEdgeFilter.java
+++ b/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/edge/SignalEdgeFilter.java
@@ -85,8 +85,6 @@ public class SignalEdgeFilter implements EventProcessor<SignalEdgeFilterParamete
       } else {
         this.delayCount++;
       }
-
-
     }
 
     this.lastValue = value;