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 ea128461125e31f96502ea1b755d2c2a6b2b88ca Author: Sebastian Rühl <sru...@apache.org> AuthorDate: Wed Jun 21 16:37:20 2023 +0200 feat: update vendors --- .../bacnetip/readwrite/model/BACnetVendorId.go | 32 ++++++++++++++++++++++ .../knxnetip/readwrite/model/KnxDatapoint.go | 24 ++++++++-------- .../java/bacnetip/readwrite/BACnetVendorId.java | 2 ++ .../java/knxnetip/readwrite/KnxDatapoint.java | 24 ++++++++-------- 4 files changed, 58 insertions(+), 24 deletions(-) diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go index 6bbf12f5be..427b933203 100644 --- a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go +++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go @@ -1457,6 +1457,8 @@ const ( BACnetVendorId_UBIQISENSE_APS BACnetVendorId = 1420 BACnetVendorId_TIGER_SOFT BACnetVendorId = 1421 BACnetVendorId_ECODOM_SRL BACnetVendorId = 1422 + BACnetVendorId_BILGIPRO_IOT_SYSTEMS BACnetVendorId = 1423 + BACnetVendorId_PLANSPURNETDESIGN_GMBH BACnetVendorId = 1424 BACnetVendorId_DOLPHIN_SOLUTIONS_LTD BACnetVendorId = 1425 BACnetVendorId_MITSUBISHI_ELECTRIC_CORPORATION BACnetVendorId = 1426 BACnetVendorId_ECOVENA BACnetVendorId = 1427 @@ -2882,6 +2884,8 @@ func init() { BACnetVendorId_UBIQISENSE_APS, BACnetVendorId_TIGER_SOFT, BACnetVendorId_ECODOM_SRL, + BACnetVendorId_BILGIPRO_IOT_SYSTEMS, + BACnetVendorId_PLANSPURNETDESIGN_GMBH, BACnetVendorId_DOLPHIN_SOLUTIONS_LTD, BACnetVendorId_MITSUBISHI_ELECTRIC_CORPORATION, BACnetVendorId_ECOVENA, @@ -4775,6 +4779,14 @@ func (e BACnetVendorId) VendorId() uint16 { { /* '1422' */ return 1422 } + case 1423: + { /* '1423' */ + return 1423 + } + case 1424: + { /* '1424' */ + return 1424 + } case 1425: { /* '1425' */ return 1425 @@ -10465,6 +10477,14 @@ func (e BACnetVendorId) VendorName() string { { /* '1422' */ return "Ecodom Srl" } + case 1423: + { /* '1423' */ + return "Bilgipro IoT Systems" + } + case 1424: + { /* '1424' */ + return "planspur netdesign GmbH" + } case 1425: { /* '1425' */ return "Dolphin Solutions Ltd" @@ -15212,6 +15232,10 @@ func BACnetVendorIdByValue(value uint16) (enum BACnetVendorId, ok bool) { return BACnetVendorId_TIGER_SOFT, true case 1422: return BACnetVendorId_ECODOM_SRL, true + case 1423: + return BACnetVendorId_BILGIPRO_IOT_SYSTEMS, true + case 1424: + return BACnetVendorId_PLANSPURNETDESIGN_GMBH, true case 1425: return BACnetVendorId_DOLPHIN_SOLUTIONS_LTD, true case 1426: @@ -18054,6 +18078,10 @@ func BACnetVendorIdByName(value string) (enum BACnetVendorId, ok bool) { return BACnetVendorId_TIGER_SOFT, true case "ECODOM_SRL": return BACnetVendorId_ECODOM_SRL, true + case "BILGIPRO_IOT_SYSTEMS": + return BACnetVendorId_BILGIPRO_IOT_SYSTEMS, true + case "PLANSPURNETDESIGN_GMBH": + return BACnetVendorId_PLANSPURNETDESIGN_GMBH, true case "DOLPHIN_SOLUTIONS_LTD": return BACnetVendorId_DOLPHIN_SOLUTIONS_LTD, true case "MITSUBISHI_ELECTRIC_CORPORATION": @@ -20957,6 +20985,10 @@ func (e BACnetVendorId) PLC4XEnumName() string { return "TIGER_SOFT" case BACnetVendorId_ECODOM_SRL: return "ECODOM_SRL" + case BACnetVendorId_BILGIPRO_IOT_SYSTEMS: + return "BILGIPRO_IOT_SYSTEMS" + case BACnetVendorId_PLANSPURNETDESIGN_GMBH: + return "PLANSPURNETDESIGN_GMBH" case BACnetVendorId_DOLPHIN_SOLUTIONS_LTD: return "DOLPHIN_SOLUTIONS_LTD" case BACnetVendorId_MITSUBISHI_ELECTRIC_CORPORATION: diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxDatapoint.go b/plc4go/protocols/knxnetip/readwrite/model/KnxDatapoint.go index 15c42be583..10cf3e4718 100644 --- a/plc4go/protocols/knxnetip/readwrite/model/KnxDatapoint.go +++ b/plc4go/protocols/knxnetip/readwrite/model/KnxDatapoint.go @@ -6732,19 +6732,19 @@ func KnxDatapointParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffe return nil, errors.Wrap(_err, "Error parsing reserved field") } - // Simple Field (validityHeightPosition) - validityHeightPosition, _validityHeightPositionErr := readBuffer.ReadBit("validityHeightPosition") - if _validityHeightPositionErr != nil { - return nil, errors.Wrap(_validityHeightPositionErr, "Error parsing 'validityHeightPosition' field") - } - _map["Struct"] = values.NewPlcBOOL(validityHeightPosition) - // Simple Field (validitySlatsPosition) validitySlatsPosition, _validitySlatsPositionErr := readBuffer.ReadBit("validitySlatsPosition") if _validitySlatsPositionErr != nil { return nil, errors.Wrap(_validitySlatsPositionErr, "Error parsing 'validitySlatsPosition' field") } _map["Struct"] = values.NewPlcBOOL(validitySlatsPosition) + + // Simple Field (validityHeightPosition) + validityHeightPosition, _validityHeightPositionErr := readBuffer.ReadBit("validityHeightPosition") + if _validityHeightPositionErr != nil { + return nil, errors.Wrap(_validityHeightPositionErr, "Error parsing 'validityHeightPosition' field") + } + _map["Struct"] = values.NewPlcBOOL(validityHeightPosition) readBuffer.CloseContext("KnxDatapoint") return values.NewPlcStruct(_map), nil case datapointType == KnxDatapointType_DPT_StatusSAB: // Struct @@ -12516,15 +12516,15 @@ func KnxDatapointSerializeWithWriteBuffer(ctx context.Context, writeBuffer utils return errors.Wrap(_err, "Error serializing reserved field") } - // Simple Field (validityHeightPosition) - if _err := writeBuffer.WriteBit("validityHeightPosition", value.GetBool()); _err != nil { - return errors.Wrap(_err, "Error serializing 'validityHeightPosition' field") - } - // Simple Field (validitySlatsPosition) if _err := writeBuffer.WriteBit("validitySlatsPosition", value.GetBool()); _err != nil { return errors.Wrap(_err, "Error serializing 'validitySlatsPosition' field") } + + // Simple Field (validityHeightPosition) + if _err := writeBuffer.WriteBit("validityHeightPosition", value.GetBool()); _err != nil { + return errors.Wrap(_err, "Error serializing 'validityHeightPosition' field") + } case datapointType == KnxDatapointType_DPT_StatusSAB: // Struct // Reserved Field (Just skip the bytes) if _err := writeBuffer.WriteUint8("reserved", 8, uint8(0x00)); _err != nil { diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java index 128d8848b5..ce0792775a 100644 --- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java +++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java @@ -1632,6 +1632,8 @@ public enum BACnetVendorId { UBIQISENSE_APS((int) 1420, (int) 1420, (String) "Ubiqisense ApS"), TIGER_SOFT((int) 1421, (int) 1421, (String) "Tiger-Soft"), ECODOM_SRL((int) 1422, (int) 1422, (String) "Ecodom Srl"), + BILGIPRO_IOT_SYSTEMS((int) 1423, (int) 1423, (String) "Bilgipro IoT Systems"), + PLANSPURNETDESIGN_GMBH((int) 1424, (int) 1424, (String) "planspur netdesign GmbH"), DOLPHIN_SOLUTIONS_LTD((int) 1425, (int) 1425, (String) "Dolphin Solutions Ltd"), MITSUBISHI_ELECTRIC_CORPORATION( (int) 1426, (int) 1426, (String) "Mitsubishi Electric Corporation"), diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxDatapoint.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxDatapoint.java index b0a92f4ffc..dc41f16e93 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxDatapoint.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxDatapoint.java @@ -7371,19 +7371,19 @@ public class KnxDatapoint { } } - // Simple Field (validityHeightPosition) - Boolean validityHeightPosition = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readBit(""); - // Simple Field (validitySlatsPosition) Boolean validitySlatsPosition = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readBit(""); + // Simple Field (validityHeightPosition) + Boolean validityHeightPosition = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readBit(""); + Map<String, PlcValue> _map = new HashMap<>(); _map.put("heightPosition", new PlcINT(heightPosition)); _map.put("slatsPosition", new PlcINT(slatsPosition)); - _map.put("validityHeightPosition", new PlcBOOL(validityHeightPosition)); _map.put("validitySlatsPosition", new PlcBOOL(validitySlatsPosition)); + _map.put("validityHeightPosition", new PlcBOOL(validityHeightPosition)); return new PlcStruct(_map); } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_StatusSAB)) { // Struct @@ -12825,16 +12825,16 @@ public class KnxDatapoint { /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( "", 6, ((Number) (short) 0x00).shortValue()); - // Simple Field (validityHeightPosition) - boolean validityHeightPosition = - (boolean) _value.getStruct().get("validityHeightPosition").getBoolean(); - /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeBit("", (boolean) (validityHeightPosition)); // Simple Field (validitySlatsPosition) boolean validitySlatsPosition = (boolean) _value.getStruct().get("validitySlatsPosition").getBoolean(); /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeBit("", (boolean) (validitySlatsPosition)); + // Simple Field (validityHeightPosition) + boolean validityHeightPosition = + (boolean) _value.getStruct().get("validityHeightPosition").getBoolean(); + /*TODO: migrate me*/ + /*TODO: migrate me*/ writeBuffer.writeBit("", (boolean) (validityHeightPosition)); } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_StatusSAB)) { // Struct // Reserved Field /*TODO: migrate me*/ @@ -15894,10 +15894,10 @@ public class KnxDatapoint { sizeInBits += 8; // Reserved Field sizeInBits += 6; - // Simple Field (validityHeightPosition) - sizeInBits += 1; // Simple Field (validitySlatsPosition) sizeInBits += 1; + // Simple Field (validityHeightPosition) + sizeInBits += 1; } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_StatusSAB)) { // Struct // Reserved Field sizeInBits += 8;