You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2023/04/11 08:09:33 UTC
[plc4x] 07/07: feat(plc4go/knx): update manufacturers
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 36e4f4c5394cfa751d60b4170624348b57dbb5ff
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Tue Apr 11 10:09:20 2023 +0200
feat(plc4go/knx): update manufacturers
---
.../knxnetip/readwrite/model/KnxDatapoint.go | 38 ++++++++++----------
.../knxnetip/readwrite/model/KnxManufacturer.go | 42 +++++++++++++++++++---
2 files changed, 56 insertions(+), 24 deletions(-)
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxDatapoint.go b/plc4go/protocols/knxnetip/readwrite/model/KnxDatapoint.go
index a09bc93b74..d78ff1e2f9 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxDatapoint.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxDatapoint.go
@@ -7306,6 +7306,11 @@ func KnxDatapointParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffe
return nil, errors.Wrap(_err, "Error parsing reserved field")
}
+ // Reserved Field (Just skip the bytes)
+ if _, _err := readBuffer.ReadUint8("reserved", 4); _err != nil {
+ return nil, errors.Wrap(_err, "Error parsing reserved field")
+ }
+
// Simple Field (maskcw)
maskcw, _maskcwErr := readBuffer.ReadBit("maskcw")
if _maskcwErr != nil {
@@ -7409,11 +7414,6 @@ func KnxDatapointParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffe
return nil, errors.Wrap(_stepCodeColourRedErr, "Error parsing 'stepCodeColourRed' field")
}
_map["Struct"] = values.NewPlcUSINT(stepCodeColourRed)
-
- // Reserved Field (Just skip the bytes)
- if _, _err := readBuffer.ReadUint8("reserved", 4); _err != nil {
- return nil, errors.Wrap(_err, "Error parsing reserved field")
- }
readBuffer.CloseContext("KnxDatapoint")
return values.NewPlcStruct(_map), nil
case datapointType == KnxDatapointType_DPT_Relative_Control_RGB: // Struct
@@ -7425,6 +7425,11 @@ func KnxDatapointParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffe
return nil, errors.Wrap(_err, "Error parsing reserved field")
}
+ // Reserved Field (Just skip the bytes)
+ if _, _err := readBuffer.ReadUint8("reserved", 4); _err != nil {
+ return nil, errors.Wrap(_err, "Error parsing reserved field")
+ }
+
// Simple Field (cb)
cb, _cbErr := readBuffer.ReadBit("cb")
if _cbErr != nil {
@@ -7476,11 +7481,6 @@ func KnxDatapointParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffe
return nil, errors.Wrap(_stepCodeColourRedErr, "Error parsing 'stepCodeColourRed' field")
}
_map["Struct"] = values.NewPlcUSINT(stepCodeColourRed)
-
- // Reserved Field (Just skip the bytes)
- if _, _err := readBuffer.ReadUint8("reserved", 4); _err != nil {
- return nil, errors.Wrap(_err, "Error parsing reserved field")
- }
readBuffer.CloseContext("KnxDatapoint")
return values.NewPlcStruct(_map), nil
case datapointType == KnxDatapointType_DPT_GeographicalLocation: // Struct
@@ -12921,6 +12921,11 @@ func KnxDatapointSerializeWithWriteBuffer(ctx context.Context, writeBuffer utils
return errors.Wrap(_err, "Error serializing reserved field")
}
+ // Reserved Field (Just skip the bytes)
+ if _err := writeBuffer.WriteUint8("reserved", 4, uint8(0x00)); _err != nil {
+ return errors.Wrap(_err, "Error serializing reserved field")
+ }
+
// Simple Field (maskcw)
if _err := writeBuffer.WriteBit("maskcw", value.GetBool()); _err != nil {
return errors.Wrap(_err, "Error serializing 'maskcw' field")
@@ -13000,14 +13005,14 @@ func KnxDatapointSerializeWithWriteBuffer(ctx context.Context, writeBuffer utils
if _err := writeBuffer.WriteUint8("stepCodeColourRed", 3, value.GetUint8()); _err != nil {
return errors.Wrap(_err, "Error serializing 'stepCodeColourRed' field")
}
-
+ case datapointType == KnxDatapointType_DPT_Relative_Control_RGB: // Struct
// Reserved Field (Just skip the bytes)
- if _err := writeBuffer.WriteUint8("reserved", 4, uint8(0x00)); _err != nil {
+ if _err := writeBuffer.WriteUint8("reserved", 8, uint8(0x00)); _err != nil {
return errors.Wrap(_err, "Error serializing reserved field")
}
- case datapointType == KnxDatapointType_DPT_Relative_Control_RGB: // Struct
+
// Reserved Field (Just skip the bytes)
- if _err := writeBuffer.WriteUint8("reserved", 8, uint8(0x00)); _err != nil {
+ if _err := writeBuffer.WriteUint8("reserved", 4, uint8(0x00)); _err != nil {
return errors.Wrap(_err, "Error serializing reserved field")
}
@@ -13050,11 +13055,6 @@ func KnxDatapointSerializeWithWriteBuffer(ctx context.Context, writeBuffer utils
if _err := writeBuffer.WriteUint8("stepCodeColourRed", 3, value.GetUint8()); _err != nil {
return errors.Wrap(_err, "Error serializing 'stepCodeColourRed' field")
}
-
- // Reserved Field (Just skip the bytes)
- if _err := writeBuffer.WriteUint8("reserved", 4, uint8(0x00)); _err != nil {
- return errors.Wrap(_err, "Error serializing reserved field")
- }
case datapointType == KnxDatapointType_DPT_GeographicalLocation: // Struct
// Reserved Field (Just skip the bytes)
if _err := writeBuffer.WriteUint8("reserved", 8, uint8(0x00)); _err != nil {
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
index 4e7925c355..eca0d440bb 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
@@ -661,8 +661,10 @@ const (
KnxManufacturer_M_NEXHOME KnxManufacturer = 619
KnxManufacturer_M_HUOTENG_WULIAN_JIANGSU_CO___LTD KnxManufacturer = 620
KnxManufacturer_M_RAYLOGIC_CONTROL_SYSTEMS_PVT_LTD KnxManufacturer = 621
- KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 622
- KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 623
+ KnxManufacturer_M_BITS_AND_BYTES KnxManufacturer = 622
+ KnxManufacturer_M_KFV_SIEGENIA_GRUPPE KnxManufacturer = 623
+ KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 624
+ KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 625
)
var KnxManufacturerValues []KnxManufacturer
@@ -1292,6 +1294,8 @@ func init() {
KnxManufacturer_M_NEXHOME,
KnxManufacturer_M_HUOTENG_WULIAN_JIANGSU_CO___LTD,
KnxManufacturer_M_RAYLOGIC_CONTROL_SYSTEMS_PVT_LTD,
+ KnxManufacturer_M_BITS_AND_BYTES,
+ KnxManufacturer_M_KFV_SIEGENIA_GRUPPE,
KnxManufacturer_M_ABB___RESERVED,
KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED,
}
@@ -3629,10 +3633,18 @@ func (e KnxManufacturer) Number() uint16 {
}
case 622:
{ /* '622' */
- return 43954
+ return 679
}
case 623:
{ /* '623' */
+ return 680
+ }
+ case 624:
+ { /* '624' */
+ return 43954
+ }
+ case 625:
+ { /* '625' */
return 43959
}
case 63:
@@ -6143,10 +6155,18 @@ func (e KnxManufacturer) Name() string {
}
case 622:
{ /* '622' */
- return "ABB - reserved"
+ return "Bits & Bytes"
}
case 623:
{ /* '623' */
+ return "KFV (SIEGENIA GRUPPE)"
+ }
+ case 624:
+ { /* '624' */
+ return "ABB - reserved"
+ }
+ case 625:
+ { /* '625' */
return "Busch-Jaeger Elektro - reserved"
}
case 63:
@@ -7491,8 +7511,12 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) {
case 621:
return KnxManufacturer_M_RAYLOGIC_CONTROL_SYSTEMS_PVT_LTD, true
case 622:
- return KnxManufacturer_M_ABB___RESERVED, true
+ return KnxManufacturer_M_BITS_AND_BYTES, true
case 623:
+ return KnxManufacturer_M_KFV_SIEGENIA_GRUPPE, true
+ case 624:
+ return KnxManufacturer_M_ABB___RESERVED, true
+ case 625:
return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
case 63:
return KnxManufacturer_M_WHD_WILHELM_HUBER_Plus_SOEHNE, true
@@ -8744,6 +8768,10 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) {
return KnxManufacturer_M_HUOTENG_WULIAN_JIANGSU_CO___LTD, true
case "M_RAYLOGIC_CONTROL_SYSTEMS_PVT_LTD":
return KnxManufacturer_M_RAYLOGIC_CONTROL_SYSTEMS_PVT_LTD, true
+ case "M_BITS_AND_BYTES":
+ return KnxManufacturer_M_BITS_AND_BYTES, true
+ case "M_KFV_SIEGENIA_GRUPPE":
+ return KnxManufacturer_M_KFV_SIEGENIA_GRUPPE, true
case "M_ABB___RESERVED":
return KnxManufacturer_M_ABB___RESERVED, true
case "M_BUSCH_JAEGER_ELEKTRO___RESERVED":
@@ -10055,6 +10083,10 @@ func (e KnxManufacturer) PLC4XEnumName() string {
return "M_HUOTENG_WULIAN_JIANGSU_CO___LTD"
case KnxManufacturer_M_RAYLOGIC_CONTROL_SYSTEMS_PVT_LTD:
return "M_RAYLOGIC_CONTROL_SYSTEMS_PVT_LTD"
+ case KnxManufacturer_M_BITS_AND_BYTES:
+ return "M_BITS_AND_BYTES"
+ case KnxManufacturer_M_KFV_SIEGENIA_GRUPPE:
+ return "M_KFV_SIEGENIA_GRUPPE"
case KnxManufacturer_M_ABB___RESERVED:
return "M_ABB___RESERVED"
case KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED: