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 2023/06/30 14:29:09 UTC
[plc4x] 03/03: chore: Updated KNX manufacturer ids
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 a7081ae1648064fe068e6b2cf95db065717cc08f
Author: Christofer Dutz <cd...@apache.org>
AuthorDate: Fri Jun 30 16:28:56 2023 +0200
chore: Updated KNX manufacturer ids
---
.../knxnetip/readwrite/model/KnxDatapoint.cs | 12 +++++-----
.../knxnetip/readwrite/model/KnxManufacturer.cs | 26 +++++++++++++++++-----
2 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxDatapoint.cs b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxDatapoint.cs
index fa72def7ab..7c6227ea80 100644
--- a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxDatapoint.cs
+++ b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxDatapoint.cs
@@ -5945,12 +5945,12 @@ if( datapointType == KnxDatapointType.BOOL ) { // BOOL
}
}
- // Simple Field (validityHeightPosition)
- var validityHeightPosition = readBuffer.ReadBit("");
-
// Simple Field (validitySlatsPosition)
var validitySlatsPosition = readBuffer.ReadBit("");
+ // Simple Field (validityHeightPosition)
+ var validityHeightPosition = readBuffer.ReadBit("");
+
var _map = new Dictionary<string, IPlcValue>();
return new PlcStruct(_map);
@@ -10468,12 +10468,12 @@ if( datapointType == KnxDatapointType.BOOL ) { // BOOL
writeBuffer.WriteByte("", 8, (byte) (slatsPosition));
// Reserved Field
writeBuffer.WriteByte("", 6, (byte) 0x00);
- // Simple Field (validityHeightPosition)
- var validityHeightPosition = (bool) _value.GetStruct()["validityHeightPosition"].GetBool();
- writeBuffer.WriteBit("", (validityHeightPosition));
// Simple Field (validitySlatsPosition)
var validitySlatsPosition = (bool) _value.GetStruct()["validitySlatsPosition"].GetBool();
writeBuffer.WriteBit("", (validitySlatsPosition));
+ // Simple Field (validityHeightPosition)
+ var validityHeightPosition = (bool) _value.GetStruct()["validityHeightPosition"].GetBool();
+ writeBuffer.WriteBit("", (validityHeightPosition));
return writeBuffer;
} else if( datapointType == KnxDatapointType.DPT_StatusSAB ) { // Struct
var writeBuffer = new WriteBuffer();
diff --git a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
index dbae696f97..103c58d703 100644
--- a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
+++ b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
@@ -658,8 +658,10 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
M_PASSIV_ENERGIE_GMBH = 631,
M_PAYNE_TECHNOLOGIES_LTD = 632,
M_GUANGDONG_YOZEWIT_INTELLIGENT_TECHNOLOGY_CO__LTD_ = 633,
- M_ABB___RESERVED = 634,
- M_BUSCH_JAEGER_ELEKTRO___RESERVED = 635,
+ M_SEXANKA = 634,
+ M_SECURI_FLEX_LTD = 635,
+ M_ABB___RESERVED = 636,
+ M_BUSCH_JAEGER_ELEKTRO___RESERVED = 637,
}
public static class KnxManufacturerInfo
@@ -2454,10 +2456,16 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_GUANGDONG_YOZEWIT_INTELLIGENT_TECHNOLOGY_CO__LTD_: { /* '633' */
return 690;
}
- case KnxManufacturer.M_ABB___RESERVED: { /* '634' */
+ case KnxManufacturer.M_SEXANKA: { /* '634' */
+ return 691;
+ }
+ case KnxManufacturer.M_SECURI_FLEX_LTD: { /* '635' */
+ return 692;
+ }
+ case KnxManufacturer.M_ABB___RESERVED: { /* '636' */
return 43954;
}
- case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '635' */
+ case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '637' */
return 43959;
}
case KnxManufacturer.M_BISCHOFF_ELEKTRONIK: { /* '64' */
@@ -4372,10 +4380,16 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_GUANGDONG_YOZEWIT_INTELLIGENT_TECHNOLOGY_CO__LTD_: { /* '633' */
return "Guangdong Yozewit Intelligent Technology Co.,Ltd.";
}
- case KnxManufacturer.M_ABB___RESERVED: { /* '634' */
+ case KnxManufacturer.M_SEXANKA: { /* '634' */
+ return "SEXANKA";
+ }
+ case KnxManufacturer.M_SECURI_FLEX_LTD: { /* '635' */
+ return "Securi-Flex Ltd";
+ }
+ case KnxManufacturer.M_ABB___RESERVED: { /* '636' */
return "ABB - reserved";
}
- case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '635' */
+ case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '637' */
return "Busch-Jaeger Elektro - reserved";
}
case KnxManufacturer.M_BISCHOFF_ELEKTRONIK: { /* '64' */