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 2021/01/06 20:07:01 UTC
[plc4x] branch develop updated: - Adjusted the Java KNX client to
the latest changes in code-generation.
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 c0bbc1d - Adjusted the Java KNX client to the latest changes in code-generation.
c0bbc1d is described below
commit c0bbc1d48586f9869a410035788d2a36f0273c31
Author: cdutz <ch...@c-ware.de>
AuthorDate: Wed Jan 6 21:06:47 2021 +0100
- Adjusted the Java KNX client to the latest changes in code-generation.
---
.../knxnetip/readwrite/model/KnxManufacturer.go | 24 +++++++++++-----------
.../plc4x/java/knxnetip/ets5/Ets5Parser.java | 2 +-
.../knxnetip/protocol/KnxNetIpProtocolLogic.java | 6 +++---
protocols/knxnetip/src/main/xslt/knx-types.xsl | 4 +++-
4 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxManufacturer.go
index 074cfac..f20f40d 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxManufacturer.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxManufacturer.go
@@ -167,7 +167,7 @@ const (
KnxManufacturer_LUTRON KnxManufacturer = 175
KnxManufacturer_AIRZONE___ALTRA KnxManufacturer = 176
KnxManufacturer_LITHOSS_DESIGN_SWITCHES KnxManufacturer = 177
- KnxManufacturer_3ATEL KnxManufacturer = 178
+ KnxManufacturer_THREEATEL KnxManufacturer = 178
KnxManufacturer_PHILIPS_CONTROLS KnxManufacturer = 179
KnxManufacturer_VELUX_AS KnxManufacturer = 180
KnxManufacturer_LOYTEC KnxManufacturer = 181
@@ -475,7 +475,7 @@ const (
KnxManufacturer_IAUTOMATION_PTY_LIMITED KnxManufacturer = 498
KnxManufacturer_EXTRON KnxManufacturer = 499
KnxManufacturer_FREEDOMPRO KnxManufacturer = 500
- KnxManufacturer_1HOME KnxManufacturer = 501
+ KnxManufacturer_ONEHOME KnxManufacturer = 501
KnxManufacturer_EOS_SAUNATECHNIK_GMBH KnxManufacturer = 502
KnxManufacturer_KUSATEK_GMBH KnxManufacturer = 503
KnxManufacturer_EISBAER_SCADA KnxManufacturer = 504
@@ -2892,7 +2892,7 @@ func KnxManufacturerByValue(value uint16) KnxManufacturer {
case 177:
return KnxManufacturer_LITHOSS_DESIGN_SWITCHES
case 178:
- return KnxManufacturer_3ATEL
+ return KnxManufacturer_THREEATEL
case 179:
return KnxManufacturer_PHILIPS_CONTROLS
case 180:
@@ -3556,7 +3556,7 @@ func KnxManufacturerByValue(value uint16) KnxManufacturer {
case 500:
return KnxManufacturer_FREEDOMPRO
case 501:
- return KnxManufacturer_1HOME
+ return KnxManufacturer_ONEHOME
case 502:
return KnxManufacturer_EOS_SAUNATECHNIK_GMBH
case 503:
@@ -3971,8 +3971,8 @@ func KnxManufacturerByName(value string) KnxManufacturer {
return KnxManufacturer_AIRZONE___ALTRA
case "LITHOSS_DESIGN_SWITCHES":
return KnxManufacturer_LITHOSS_DESIGN_SWITCHES
- case "3ATEL":
- return KnxManufacturer_3ATEL
+ case "THREEATEL":
+ return KnxManufacturer_THREEATEL
case "PHILIPS_CONTROLS":
return KnxManufacturer_PHILIPS_CONTROLS
case "VELUX_AS":
@@ -4635,8 +4635,8 @@ func KnxManufacturerByName(value string) KnxManufacturer {
return KnxManufacturer_BTICINO
case "FREEDOMPRO":
return KnxManufacturer_FREEDOMPRO
- case "1HOME":
- return KnxManufacturer_1HOME
+ case "ONEHOME":
+ return KnxManufacturer_ONEHOME
case "EOS_SAUNATECHNIK_GMBH":
return KnxManufacturer_EOS_SAUNATECHNIK_GMBH
case "KUSATEK_GMBH":
@@ -5082,8 +5082,8 @@ func (e KnxManufacturer) String() string {
return "AIRZONE___ALTRA"
case KnxManufacturer_LITHOSS_DESIGN_SWITCHES:
return "LITHOSS_DESIGN_SWITCHES"
- case KnxManufacturer_3ATEL:
- return "3ATEL"
+ case KnxManufacturer_THREEATEL:
+ return "THREEATEL"
case KnxManufacturer_PHILIPS_CONTROLS:
return "PHILIPS_CONTROLS"
case KnxManufacturer_VELUX_AS:
@@ -5746,8 +5746,8 @@ func (e KnxManufacturer) String() string {
return "BTICINO"
case KnxManufacturer_FREEDOMPRO:
return "FREEDOMPRO"
- case KnxManufacturer_1HOME:
- return "1HOME"
+ case KnxManufacturer_ONEHOME:
+ return "ONEHOME"
case KnxManufacturer_EOS_SAUNATECHNIK_GMBH:
return "EOS_SAUNATECHNIK_GMBH"
case KnxManufacturer_KUSATEK_GMBH:
diff --git a/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/ets5/Ets5Parser.java b/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/ets5/Ets5Parser.java
index 96046d9..8e3d4a7 100644
--- a/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/ets5/Ets5Parser.java
+++ b/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/ets5/Ets5Parser.java
@@ -77,7 +77,7 @@ public class Ets5Parser {
// Build an index of the internal data-types.
Map<String, KnxDatapointType> knxDatapointTypeMap = new HashMap<>();
for (KnxDatapointType value : KnxDatapointType.values()) {
- knxDatapointTypeMap.put(value.getMainNumber() + "#" + value.getSubNumber(), value);
+ //knxDatapointTypeMap.put(value.get() + "#" + value.getSubNumber(), value);
}
Map<String, AddressType> addressTypes = new HashMap<>();
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 c06734e..b976405 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
@@ -288,7 +288,7 @@ public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KnxNetIpMessage> im
// Use the data in the ets5 model to correctly check and serialize the PlcValue
try {
final WriteBuffer writeBuffer = KnxDatapointIO.staticSerialize(value,
- groupAddress.getType().getFormatName());
+ groupAddress.getType().getText());
final byte[] serialized = writeBuffer.getData();
dataFirstByte = serialized[0];
data = new byte[serialized.length - 1];
@@ -472,7 +472,7 @@ public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KnxNetIpMessage> im
// Parse the payload depending on the type of the group-address.
ReadBuffer rawDataReader = new ReadBuffer(payload);
final PlcValue value = KnxDatapointIO.staticParse(rawDataReader,
- groupAddress.getType().getFormatName());
+ groupAddress.getType().getText());
// Assemble the plc4x return data-structure.
Map<String, PlcValue> dataPointMap = new HashMap<>();
@@ -492,7 +492,7 @@ public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KnxNetIpMessage> im
dataPointMap.put("line", new PlcSTRING(lineName));
}
dataPointMap.put("description", new PlcSTRING(groupAddress.getName()));
- dataPointMap.put("unitOfMeasurement", new PlcSTRING(groupAddress.getType().getFormatName()));
+ dataPointMap.put("unitOfMeasurement", new PlcSTRING(groupAddress.getType().getText()));
dataPointMap.put("value", value);
final PlcStruct dataPoint = new PlcStruct(dataPointMap);
diff --git a/protocols/knxnetip/src/main/xslt/knx-types.xsl b/protocols/knxnetip/src/main/xslt/knx-types.xsl
index 85817b9..a94a542 100644
--- a/protocols/knxnetip/src/main/xslt/knx-types.xsl
+++ b/protocols/knxnetip/src/main/xslt/knx-types.xsl
@@ -52,7 +52,7 @@
<xsl:apply-templates select="knx:KNX/knx:MasterData/knx:InterfaceObjectTypes/knx:InterfaceObjectType"/>
]
-[enum uint 32 'KnxInterfaceObjectProperty' [uint16 'propertyId', KnxInterfaceObjectType 'objectType', KnxPropertyDataType 'propertyDataType', string 'text']
+[enum uint 32 'KnxInterfaceObjectProperty' [uint 16 'propertyId', KnxInterfaceObjectType 'objectType', KnxPropertyDataType 'propertyDataType', string 'text']
<xsl:apply-templates select="knx:KNX/knx:MasterData/knx:InterfaceObjectProperties/knx:InterfaceObjectProperty"/>
]
@@ -142,6 +142,8 @@
<xsl:template match="knx:Manufacturer">
<xsl:variable name="manufacturerId">
<xsl:choose>
+ <xsl:when test="@Name = '3ATEL'">THREEATEL</xsl:when>
+ <xsl:when test="@Name = '1Home'">ONEHOME</xsl:when>
<xsl:when test="@Name = 'Simon'">SIMON_<xsl:value-of select="@KnxManufacturerId"/></xsl:when>
<xsl:when test="@Name = 'Not Assigned'">NOT_ASSIGNED_<xsl:value-of select="@KnxManufacturerId"/></xsl:when>
<xsl:otherwise>