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/01/20 22:16:12 UTC
[plc4x] branch develop updated: - Renamed and rearranged the output
fields.
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
The following commit(s) were added to refs/heads/develop by this push:
new 8811dbf - Renamed and rearranged the output fields.
8811dbf is described below
commit 8811dbf3007a4f28498f97fc56eaa9df28a46b7c
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Jan 20 23:15:45 2020 +0100
- Renamed and rearranged the output fields.
---
.../plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java b/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java
index 62456bc..7ac7fc4 100644
--- a/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java
+++ b/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java
@@ -268,12 +268,10 @@ public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KNXNetIPMessage> im
Map<String, PlcValue> dataPointMap = new HashMap<>();
dataPointMap.put("sourceAddress", new PlcString(toString(sourceAddress)));
dataPointMap.put("targetAddress", new PlcString(groupAddress.getGroupAddress()));
- dataPointMap.put("name", new PlcString(groupAddress.getName()));
- dataPointMap.put("type", new PlcString(groupAddress.getType().getName()));
- dataPointMap.put("functionId", new PlcString(groupAddress.getFunction().getId()));
- dataPointMap.put("functionName", new PlcString(groupAddress.getFunction().getName()));
- dataPointMap.put("functionType", new PlcString(groupAddress.getFunction().getType()));
- dataPointMap.put("functionSpace", new PlcString(groupAddress.getFunction().getSpaceName()));
+ dataPointMap.put("location", new PlcString(groupAddress.getFunction().getSpaceName()));
+ dataPointMap.put("function", new PlcString(groupAddress.getFunction().getName()));
+ dataPointMap.put("description", new PlcString(groupAddress.getName()));
+ dataPointMap.put("unitOfMeasurement", new PlcString(groupAddress.getType().getName()));
dataPointMap.put("value", value);
final PlcStruct dataPoint = new PlcStruct(dataPointMap);