Skip to content
Closed
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public enum BACnetVendorId {
REGULATOR_AUSTRALIAPTY_LTD((int) 67, (int) 67, (String) "Regulator Australia PTY Ltd."),
TOUCH_PLATE_LIGHTING_CONTROLS((int) 68, (int) 68, (String) "Touch-Plate Lighting Controls"),
AMANN_GMBH((int) 69, (int) 69, (String) "Amann GmbH"),
RLE_TECHNOLOGIES((int) 70, (int) 70, (String) "RLE Technologies"),
PARAMETERLLC((int) 70, (int) 70, (String) "Parameter LLC"),
CARDKEY_SYSTEMS((int) 71, (int) 71, (String) "Cardkey Systems"),
SECOM_CO_LTD((int) 72, (int) 72, (String) "SECOM Co., Ltd."),
ABB_GEBUDETECHNIKAG_BEREICH_NET_SERV(
Expand Down Expand Up @@ -404,7 +404,7 @@ public enum BACnetVendorId {
CEMTREX_INC((int) 326, (int) 326, (String) "Cemtrex, Inc."),
PERFORMANCE_TECHNOLOGIES_INC((int) 327, (int) 327, (String) "Performance Technologies, Inc."),
XTRALIS_AUST_PTY_LTD((int) 328, (int) 328, (String) "Xtralis (Aust) Pty Ltd"),
TROX_GMBH((int) 329, (int) 329, (String) "TROX GmbH"),
TROXSE((int) 329, (int) 329, (String) "TROX SE"),
BEIJING_HYSINE_TECHNOLOGY_CO_LTD(
(int) 330, (int) 330, (String) "Beijing Hysine Technology Co., Ltd"),
RCK_CONTROLS_INC((int) 331, (int) 331, (String) "RCK Controls, Inc."),
Expand Down Expand Up @@ -1814,6 +1814,21 @@ public enum BACnetVendorId {
SYSTEM_MART_LTD((int) 1579, (int) 1579, (String) "System Mart Ltd."),
SPOT_GMBH((int) 1580, (int) 1580, (String) "Spot7 GmbH"),
INTEMPCO_CONTROLS_LTD((int) 1581, (int) 1581, (String) "Intempco Controls Ltd."),
ROSEMONT_ENGINEERING_INC((int) 1582, (int) 1582, (String) "Rosemont Engineering, Inc."),
MINIVEIL_INDUSTRIES_LTD((int) 1583, (int) 1583, (String) "Miniveil Industries Ltd."),
PROFCONAB((int) 1584, (int) 1584, (String) "Profcon AB"),
KE_AUTOMASJONAS((int) 1585, (int) 1585, (String) "KE Automasjon AS"),
NORDOMATIC_PROPERTY_TECHNOLOGIESAB(
(int) 1586, (int) 1586, (String) "Nordomatic Property Technologies AB"),
RUNWISE((int) 1587, (int) 1587, (String) "Runwise"),
KARELAVOJSKY((int) 1588, (int) 1588, (String) "Karel Čavojsky"),
ABBLV_INSTALLATION_MATERIALS_CO_LTD_BEIJING(
(int) 1589, (int) 1589, (String) "ABB LV Installation Materials Co., Ltd. Beijing"),
ENER_SEARCH_SOLAR_GMBH((int) 1590, (int) 1590, (String) "EnerSearch Solar GmbH"),
ZURN_ELKAY_WATER_SOLUTIONS((int) 1591, (int) 1591, (String) "Zurn Elkay Water Solutions"),
ANDIVI((int) 1592, (int) 1592, (String) "Andivi"),
CHYI_LEE_INDUSTRY_CO_LTD((int) 1593, (int) 1593, (String) "Chyi Lee Industry Co., Ltd."),
ALLBEEBV((int) 1594, (int) 1594, (String) "Allbee B.V."),
UNKNOWN_VENDOR((int) 0xFFFF, (int) 0xFFFF, (String) "Unknown");
private static final Map<Integer, BACnetVendorId> map;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
public enum KnxManufacturer {
M_UNKNOWN((int) 0, (int) 0, (String) "Unknown Manufacturer"),
M_SIEMENS((int) 1, (int) 1, (String) "Siemens"),
M_ABB_AG_STOTZ___KONTAKT((int) 2, (int) 2, (String) "ABB AG (Stotz - Kontakt)"),
M_ABB_AG___STOTZ_KONTAKT((int) 2, (int) 2, (String) "ABB AG - STOTZ-KONTAKT"),
M_ALBRECHT_JUNG((int) 3, (int) 4, (String) "Albrecht Jung"),
M_BTICINO((int) 4, (int) 5, (String) "Bticino"),
M_BERKER((int) 5, (int) 6, (String) "Berker"),
M_ABB_AG_BUSCH___JAEGER((int) 6, (int) 7, (String) "ABB AG (Busch - Jaeger)"),
M_ABB_AG___BUSCH_JAEGER((int) 6, (int) 7, (String) "ABB AG - BUSCH-JAEGER"),
M_GIRA_GIERSIEPEN((int) 7, (int) 8, (String) "GIRA Giersiepen"),
M_HAGER_ELECTRO((int) 8, (int) 9, (String) "Hager Electro"),
M_INSTA_GMBH((int) 9, (int) 10, (String) "Insta GmbH"),
Expand Down Expand Up @@ -364,7 +364,7 @@ public enum KnxManufacturer {
M_EVN_LICHTTECHNIK((int) 318, (int) 369, (String) "EVN-Lichttechnik"),
M_RUTEC((int) 319, (int) 370, (String) "rutec"),
M_FINDER((int) 320, (int) 371, (String) "Finder"),
M_FUJITSU_GENERAL_LIMITED((int) 321, (int) 372, (String) "Fujitsu General Limited"),
M_GENERAL_INC_((int) 321, (int) 372, (String) "GENERAL Inc."),
M_ZF_FRIEDRICHSHAFEN_AG((int) 322, (int) 373, (String) "ZF Friedrichshafen AG"),
M_CREALED((int) 323, (int) 374, (String) "Crealed"),
M_MILES_MAGIC_AUTOMATION_PRIVATE_LIMITED(
Expand Down Expand Up @@ -677,7 +677,7 @@ public enum KnxManufacturer {
(int) 587, (int) 643, (String) "Hefei Chuang Yue Intelligent Technology Co.,LTD"),
M_LARFE((int) 588, (int) 644, (String) "Larfe"),
M_DONGGUAN_MUHCCI_ELECTRICAL((int) 589, (int) 645, (String) "Dongguan Muhcci Electrical"),
M_STEC((int) 590, (int) 646, (String) "STEC"),
M_SDEKE((int) 590, (int) 646, (String) "Sdeke"),
M_ARIGO_SOFTWARE_GMBH((int) 591, (int) 647, (String) "ARIGO Software GmbH"),
M_FEISHELEC((int) 592, (int) 648, (String) "Feishelec"),
M_GORDIC((int) 593, (int) 649, (String) "GORDIC"),
Expand Down Expand Up @@ -765,7 +765,7 @@ public enum KnxManufacturer {
M_FOSHAN_HAYDN_TECHNOLOGY_LIGHTING_CO__LTD_(
(int) 662, (int) 720, (String) "Foshan Haydn Technology Lighting Co.,Ltd."),
M_KNXES_COMPANY_LIMITED((int) 663, (int) 721, (String) "KNXES COMPANY LIMITED"),
M_AKUVOX((int) 664, (int) 722, (String) "Akuvox"),
M_AKUBELA((int) 664, (int) 722, (String) "akubela"),
M_NINGBO_YINZHOU_SHENGRUIJIE_ELECTRONICS_CO__LTD_(
(int) 665, (int) 723, (String) "NingBo Yinzhou ShengRuiJie Electronics Co. Ltd."),
M_SHENZHEN_HAIZHICHUANG_TECHNOLOGY_CO___LTD(
Expand Down Expand Up @@ -904,9 +904,31 @@ public enum KnxManufacturer {
M_OSPA_APPARATEBAU_PAUSER_GMBH_AND_CO__KG(
(int) 766, (int) 827, (String) "Ospa Apparatebau Pauser GmbH & Co. KG"),
M_PLH((int) 767, (int) 828, (String) "PLH"),
M_ABB___RESERVED((int) 768, (int) 43954, (String) "ABB - reserved"),
M_HANGZHOU_ZION_COMMUNICATION_CO__LTD(
(int) 768, (int) 829, (String) "HANGZHOU ZION COMMUNICATION CO.,LTD"),
M_WEIYI_TECHNOLOGY_ZHEJIANG_CO___LTD(
(int) 769, (int) 830, (String) "Weiyi Technology (Zhejiang) Co., Ltd"),
M_AUTERAS((int) 770, (int) 831, (String) "AUTERAS"),
M_OSUM_SMART((int) 771, (int) 832, (String) "OSUM Smart"),
M_TEKNOLINE((int) 772, (int) 833, (String) "TEKNOLINE"),
M_HIMEL_HONG_KONG_LIMITED((int) 773, (int) 834, (String) "HIMEL HONG KONG LIMITED"),
M_MICRONIC_KOREA_CO___LTD_((int) 774, (int) 835, (String) "Micronic Korea Co., Ltd."),
M_ROBUSTEL_LIMITED((int) 775, (int) 836, (String) "Robustel Limited"),
M_LEXA_LIFESTYLE((int) 776, (int) 837, (String) "Lexa LIFESTYLE"),
M_CASAMBI((int) 777, (int) 838, (String) "casambi"),
M_BELCAB_UK_LTD((int) 778, (int) 839, (String) "BELCAB UK LTD"),
M_CHANNEL_SMART_BUILDINGS((int) 779, (int) 840, (String) "Channel Smart Buildings"),
M_NANJING_KLEVEN_ELECTRONIC_TECHNOLOGY_CO___LTD(
(int) 780, (int) 841, (String) "Nanjing Kleven Electronic Technology Co., Ltd"),
M_ZHEJIANG_CHATNOW_NEW_MATERIAL_TECHNOLOGY_CO___LTD(
(int) 781, (int) 842, (String) "Zhejiang Chatnow New Material Technology Co., Ltd"),
M_OCCHIO_GMBH((int) 782, (int) 843, (String) "Occhio GmbH"),
M_INSTELL((int) 783, (int) 844, (String) "Instell"),
M_VOKA_VOGTLAENDISCHES_KABELWERK_GMBH(
(int) 784, (int) 845, (String) "VOKA Vogtländisches Kabelwerk GmbH"),
M_ABB___RESERVED((int) 785, (int) 43954, (String) "ABB - reserved"),
M_BUSCH_JAEGER_ELEKTRO___RESERVED(
(int) 769, (int) 43959, (String) "Busch-Jaeger Elektro - reserved");
(int) 786, (int) 43959, (String) "Busch-Jaeger Elektro - reserved");
private static final Map<Integer, KnxManufacturer> map;

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,13 @@ protected void serializeExtensionObjectWithMaskChild(WriteBuffer writeBuffer)
int bodyLength = (int) ((((getBody()) == (null)) ? 0 : getBody().getLengthInBytes()));
writeImplicitField("bodyLength", bodyLength, writeSignedInt(writeBuffer, 32));

// Simple Field (body)
writeSimpleField("body", body, writeComplex(writeBuffer));
// Manual Field (body)
writeManualField(
"body",
() ->
org.apache.plc4x.java.opcua.readwrite.utils.StaticHelper.serializeExtensionObjectBody(
writeBuffer, body),
writeBuffer);

writeBuffer.popContext("BinaryExtensionObjectWithMask");
}
Expand All @@ -93,8 +98,8 @@ public int getLengthInBits() {
// Implicit Field (bodyLength)
lengthInBits += 32;

// Simple field (body)
lengthInBits += body.getLengthInBits();
// Manual Field (body)
lengthInBits += (((body) == (null)) ? 0 : body.getLengthInBits());

return lengthInBits;
}
Expand All @@ -109,11 +114,13 @@ public static ExtensionObjectWithMaskBuilder staticParseExtensionObjectWithMaskB
int bodyLength = readImplicitField("bodyLength", readSignedInt(readBuffer, 32));

ExtensionObjectDefinition body =
readSimpleField(
readManualField(
"body",
readComplex(
() -> ExtensionObjectDefinition.staticParse(readBuffer, (int) (extensionId)),
readBuffer));
readBuffer,
() ->
(ExtensionObjectDefinition)
(org.apache.plc4x.java.opcua.readwrite.utils.StaticHelper
.parseExtensionObjectBody(readBuffer, extensionId, bodyLength)));

readBuffer.closeContext("BinaryExtensionObjectWithMask");
// Create the instance
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ public abstract class Variant implements Message {
protected final boolean arrayLengthSpecified;
protected final boolean arrayDimensionsSpecified;
protected final Integer noOfArrayDimensions;
protected final List<Boolean> arrayDimensions;
protected final List<Integer> arrayDimensions;

public Variant(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
super();
this.arrayLengthSpecified = arrayLengthSpecified;
this.arrayDimensionsSpecified = arrayDimensionsSpecified;
Expand All @@ -70,7 +70,7 @@ public Integer getNoOfArrayDimensions() {
return noOfArrayDimensions;
}

public List<Boolean> getArrayDimensions() {
public List<Integer> getArrayDimensions() {
return arrayDimensions;
}

Expand Down Expand Up @@ -99,7 +99,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException {
writeOptionalField("noOfArrayDimensions", noOfArrayDimensions, writeSignedInt(writeBuffer, 32));

// Array Field (arrayDimensions)
writeSimpleTypeArrayField("arrayDimensions", arrayDimensions, writeBoolean(writeBuffer));
writeSimpleTypeArrayField("arrayDimensions", arrayDimensions, writeSignedInt(writeBuffer, 32));

writeBuffer.popContext("Variant");
}
Expand Down Expand Up @@ -133,7 +133,7 @@ public int getLengthInBits() {

// Array field
if (arrayDimensions != null) {
lengthInBits += 1 * arrayDimensions.size();
lengthInBits += 32 * arrayDimensions.size();
}

return lengthInBits;
Expand Down Expand Up @@ -222,10 +222,10 @@ public static Variant staticParse(ReadBuffer readBuffer) throws ParseException {
readOptionalField(
"noOfArrayDimensions", readSignedInt(readBuffer, 32), arrayDimensionsSpecified);

List<Boolean> arrayDimensions =
List<Integer> arrayDimensions =
readCountArrayField(
"arrayDimensions",
readBoolean(readBuffer),
readSignedInt(readBuffer, 32),
(((noOfArrayDimensions) == (null)) ? 0 : noOfArrayDimensions));

readBuffer.closeContext("Variant");
Expand All @@ -241,7 +241,7 @@ Variant build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions);
List<Integer> arrayDimensions);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantBoolean(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
byte[] value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -136,7 +136,7 @@ public VariantBoolean build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantBoolean variantBoolean =
new VariantBoolean(
arrayLengthSpecified,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantByte(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
List<Short> value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -138,7 +138,7 @@ public VariantByte build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantByte variantByte =
new VariantByte(
arrayLengthSpecified,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantByteString(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
List<ByteStringArray> value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -142,7 +142,7 @@ public VariantByteString build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantByteString variantByteString =
new VariantByteString(
arrayLengthSpecified,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantDataValue(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
List<DataValue> value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -142,7 +142,7 @@ public VariantDataValue build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantDataValue variantDataValue =
new VariantDataValue(
arrayLengthSpecified,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantDateTime(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
List<Long> value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -136,7 +136,7 @@ public VariantDateTime build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantDateTime variantDateTime =
new VariantDateTime(
arrayLengthSpecified,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantDiagnosticInfo(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
List<DiagnosticInfo> value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -142,7 +142,7 @@ public VariantDiagnosticInfo build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantDiagnosticInfo variantDiagnosticInfo =
new VariantDiagnosticInfo(
arrayLengthSpecified,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantDouble(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
List<Double> value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -136,7 +136,7 @@ public VariantDouble build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantDouble variantDouble =
new VariantDouble(
arrayLengthSpecified,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantExpandedNodeId(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
List<ExpandedNodeId> value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -142,7 +142,7 @@ public VariantExpandedNodeId build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantExpandedNodeId variantExpandedNodeId =
new VariantExpandedNodeId(
arrayLengthSpecified,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public VariantExtensionObject(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions,
List<Integer> arrayDimensions,
Integer arrayLength,
List<ExtensionObject> value) {
super(arrayLengthSpecified, arrayDimensionsSpecified, noOfArrayDimensions, arrayDimensions);
Expand Down Expand Up @@ -143,7 +143,7 @@ public VariantExtensionObject build(
boolean arrayLengthSpecified,
boolean arrayDimensionsSpecified,
Integer noOfArrayDimensions,
List<Boolean> arrayDimensions) {
List<Integer> arrayDimensions) {
VariantExtensionObject variantExtensionObject =
new VariantExtensionObject(
arrayLengthSpecified,
Expand Down
Loading
Loading