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 2026/03/19 15:07:04 UTC

(plc4x) branch develop updated (be10816c8c -> 0630f091b1)

This is an automated email from the ASF dual-hosted git repository.

sruehl pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git


    from be10816c8c build(deps-dev): bump org.testcontainers:testcontainers (#2497)
     new 4cc1e6414b fix(plc4go/codegen): consider length in bits of parent as parent
     new 0630f091b1 chore(plc4go/codegen): update Vendor fiules

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../templates/go/complex-type-template.go.ftlh     |   4 +
 .../bacnetip/readwrite/model/BACnetVendorId.go     | 176 +++++++++++++++++++++
 .../knxnetip/readwrite/model/KnxManufacturer.go    | 136 +++++++++++++---
 .../readwrite/model/ExtensionObjectWithMask.go     |   2 +-
 .../protocols/bacnetip/bacnet-vendorids.mspec      |  11 ++
 .../protocols/knxnetip/knx-master-data.mspec       |  12 +-
 6 files changed, 317 insertions(+), 24 deletions(-)


(plc4x) 01/02: fix(plc4go/codegen): consider length in bits of parent as parent

Posted by sr...@apache.org.
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 4cc1e6414b7ca0b7ca5efcbcddfc9edbef849d67
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Mar 19 16:06:35 2026 +0100

    fix(plc4go/codegen): consider length in bits of parent as parent
    
    Closes #2493
---
 .../go/src/main/resources/templates/go/complex-type-template.go.ftlh  | 4 ++++
 plc4go/protocols/opcua/readwrite/model/ExtensionObjectWithMask.go     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/code-generation/language/go/src/main/resources/templates/go/complex-type-template.go.ftlh b/code-generation/language/go/src/main/resources/templates/go/complex-type-template.go.ftlh
index 8192b1cba1..a61fd70b31 100644
--- a/code-generation/language/go/src/main/resources/templates/go/complex-type-template.go.ftlh
+++ b/code-generation/language/go/src/main/resources/templates/go/complex-type-template.go.ftlh
@@ -831,7 +831,11 @@ func (m *_${type.name}) GetLengthInBits(ctx context.Context) uint16 {
 
 <#if type.isDiscriminatedParentTypeDefinition()>
 func (m *_${type.name}) getLengthInBits(ctx context.Context) uint16 {
+	<#if type.parentType.isPresent()>
+	lengthInBits := uint16(m.${type.getParentType().orElseThrow().name}Contract.(*_${type.getParentType().orElseThrow().name}).getLengthInBits(ctx))
+	<#else>
 	lengthInBits := uint16(0)
+	</#if>
 	<#list type.fields as field>
 		<#switch field.typeName>
 			<#case "array">
diff --git a/plc4go/protocols/opcua/readwrite/model/ExtensionObjectWithMask.go b/plc4go/protocols/opcua/readwrite/model/ExtensionObjectWithMask.go
index 705ce79cff..7c53b42c0a 100644
--- a/plc4go/protocols/opcua/readwrite/model/ExtensionObjectWithMask.go
+++ b/plc4go/protocols/opcua/readwrite/model/ExtensionObjectWithMask.go
@@ -305,7 +305,7 @@ func (m *_ExtensionObjectWithMask) GetTypeName() string {
 }
 
 func (m *_ExtensionObjectWithMask) getLengthInBits(ctx context.Context) uint16 {
-	lengthInBits := uint16(0)
+	lengthInBits := uint16(m.ExtensionObjectContract.(*_ExtensionObject).getLengthInBits(ctx))
 
 	// Simple field (encodingMask)
 	lengthInBits += m.EncodingMask.GetLengthInBits(ctx)


(plc4x) 02/02: chore(plc4go/codegen): update Vendor fiules

Posted by sr...@apache.org.
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 0630f091b18170ba2d25a9615748b00e9099656a
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Mar 19 16:06:55 2026 +0100

    chore(plc4go/codegen): update Vendor fiules
---
 .../bacnetip/readwrite/model/BACnetVendorId.go     | 176 +++++++++++++++++++++
 .../knxnetip/readwrite/model/KnxManufacturer.go    | 136 +++++++++++++---
 .../protocols/bacnetip/bacnet-vendorids.mspec      |  11 ++
 .../protocols/knxnetip/knx-master-data.mspec       |  12 +-
 4 files changed, 312 insertions(+), 23 deletions(-)

diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
index 2f78bb1736..3a3852153e 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
@@ -1628,6 +1628,17 @@ const (
 	BACnetVendorId_ANDIVI                                                                       BACnetVendorId = 1592
 	BACnetVendorId_CHYI_LEE_INDUSTRY_CO_LTD                                                     BACnetVendorId = 1593
 	BACnetVendorId_ALLBEEBV                                                                     BACnetVendorId = 1594
+	BACnetVendorId_KAMPMANN_GMBH_COKG                                                           BACnetVendorId = 1595
+	BACnetVendorId_COSEL_ELEKTRONIK_OTOMASYON_SISTEMLERI_SAN_TIC_LTD_STI                        BACnetVendorId = 1596
+	BACnetVendorId_RACTL_DESIGNS                                                                BACnetVendorId = 1597
+	BACnetVendorId_DATABRIDGE_DYNAMIC_PVT_LTD                                                   BACnetVendorId = 1598
+	BACnetVendorId_EVOLO_TECHNOLOGIESAS                                                         BACnetVendorId = 1599
+	BACnetVendorId_ENERGY_PLUS_TEKNOLOJI_IMALAT_ITHALATVE_IHRACAT_SANAYIAS                      BACnetVendorId = 1600
+	BACnetVendorId_GAIAMESH_INC                                                                 BACnetVendorId = 1601
+	BACnetVendorId_LOVATO_ELECTRICSPA                                                           BACnetVendorId = 1602
+	BACnetVendorId_QPAC_SYSTEMS_INC                                                             BACnetVendorId = 1603
+	BACnetVendorId_YOBIIQ_INTELLIGENCEBV                                                        BACnetVendorId = 1604
+	BACnetVendorId_CAMFILUSA_INC                                                                BACnetVendorId = 1605
 	BACnetVendorId_UNKNOWN_VENDOR                                                               BACnetVendorId = 0xFFFF
 )
 
@@ -3221,6 +3232,17 @@ func init() {
 		BACnetVendorId_ANDIVI,
 		BACnetVendorId_CHYI_LEE_INDUSTRY_CO_LTD,
 		BACnetVendorId_ALLBEEBV,
+		BACnetVendorId_KAMPMANN_GMBH_COKG,
+		BACnetVendorId_COSEL_ELEKTRONIK_OTOMASYON_SISTEMLERI_SAN_TIC_LTD_STI,
+		BACnetVendorId_RACTL_DESIGNS,
+		BACnetVendorId_DATABRIDGE_DYNAMIC_PVT_LTD,
+		BACnetVendorId_EVOLO_TECHNOLOGIESAS,
+		BACnetVendorId_ENERGY_PLUS_TEKNOLOJI_IMALAT_ITHALATVE_IHRACAT_SANAYIAS,
+		BACnetVendorId_GAIAMESH_INC,
+		BACnetVendorId_LOVATO_ELECTRICSPA,
+		BACnetVendorId_QPAC_SYSTEMS_INC,
+		BACnetVendorId_YOBIIQ_INTELLIGENCEBV,
+		BACnetVendorId_CAMFILUSA_INC,
 		BACnetVendorId_UNKNOWN_VENDOR,
 	}
 }
@@ -5867,6 +5889,26 @@ func (e BACnetVendorId) VendorId() uint16 {
 		{ /* '1594' */
 			return 1594
 		}
+	case 1595:
+		{ /* '1595' */
+			return 1595
+		}
+	case 1596:
+		{ /* '1596' */
+			return 1596
+		}
+	case 1597:
+		{ /* '1597' */
+			return 1597
+		}
+	case 1598:
+		{ /* '1598' */
+			return 1598
+		}
+	case 1599:
+		{ /* '1599' */
+			return 1599
+		}
 	case 16:
 		{ /* '16' */
 			return 16
@@ -5875,6 +5917,30 @@ func (e BACnetVendorId) VendorId() uint16 {
 		{ /* '160' */
 			return 160
 		}
+	case 1600:
+		{ /* '1600' */
+			return 1600
+		}
+	case 1601:
+		{ /* '1601' */
+			return 1601
+		}
+	case 1602:
+		{ /* '1602' */
+			return 1602
+		}
+	case 1603:
+		{ /* '1603' */
+			return 1603
+		}
+	case 1604:
+		{ /* '1604' */
+			return 1604
+		}
+	case 1605:
+		{ /* '1605' */
+			return 1605
+		}
 	case 161:
 		{ /* '161' */
 			return 161
@@ -12229,6 +12295,26 @@ func (e BACnetVendorId) VendorName() string {
 		{ /* '1594' */
 			return "Allbee B.V."
 		}
+	case 1595:
+		{ /* '1595' */
+			return "Kampmann GmbH & Co. KG"
+		}
+	case 1596:
+		{ /* '1596' */
+			return "Cosel Elektronik Otomasyon Sistemleri San. Tic. Ltd. Sti."
+		}
+	case 1597:
+		{ /* '1597' */
+			return "Ractl Designs"
+		}
+	case 1598:
+		{ /* '1598' */
+			return "Databridge Dynamic Pvt Ltd"
+		}
+	case 1599:
+		{ /* '1599' */
+			return "Evolo Technologies AS"
+		}
 	case 16:
 		{ /* '16' */
 			return "United Technologies Carrier"
@@ -12237,6 +12323,30 @@ func (e BACnetVendorId) VendorName() string {
 		{ /* '160' */
 			return "Rockwell Automation"
 		}
+	case 1600:
+		{ /* '1600' */
+			return "EnergyPlus Teknoloji Imalat Ithalat ve Ihracat Sanayi AS"
+		}
+	case 1601:
+		{ /* '1601' */
+			return "Gaiamesh Inc."
+		}
+	case 1602:
+		{ /* '1602' */
+			return "Lovato Electric S.P.A."
+		}
+	case 1603:
+		{ /* '1603' */
+			return "Q-PAC Systems, Inc."
+		}
+	case 1604:
+		{ /* '1604' */
+			return "Yobiiq Intelligence B.V."
+		}
+	case 1605:
+		{ /* '1605' */
+			return "Camfil USA Inc."
+		}
 	case 161:
 		{ /* '161' */
 			return "Enflex Corp."
@@ -17270,10 +17380,32 @@ func BACnetVendorIdByValue(value uint16) (enum BACnetVendorId, ok bool) {
 		return BACnetVendorId_CHYI_LEE_INDUSTRY_CO_LTD, true
 	case 1594:
 		return BACnetVendorId_ALLBEEBV, true
+	case 1595:
+		return BACnetVendorId_KAMPMANN_GMBH_COKG, true
+	case 1596:
+		return BACnetVendorId_COSEL_ELEKTRONIK_OTOMASYON_SISTEMLERI_SAN_TIC_LTD_STI, true
+	case 1597:
+		return BACnetVendorId_RACTL_DESIGNS, true
+	case 1598:
+		return BACnetVendorId_DATABRIDGE_DYNAMIC_PVT_LTD, true
+	case 1599:
+		return BACnetVendorId_EVOLO_TECHNOLOGIESAS, true
 	case 16:
 		return BACnetVendorId_UNITED_TECHNOLOGIES_CARRIER, true
 	case 160:
 		return BACnetVendorId_ROCKWELL_AUTOMATION, true
+	case 1600:
+		return BACnetVendorId_ENERGY_PLUS_TEKNOLOJI_IMALAT_ITHALATVE_IHRACAT_SANAYIAS, true
+	case 1601:
+		return BACnetVendorId_GAIAMESH_INC, true
+	case 1602:
+		return BACnetVendorId_LOVATO_ELECTRICSPA, true
+	case 1603:
+		return BACnetVendorId_QPAC_SYSTEMS_INC, true
+	case 1604:
+		return BACnetVendorId_YOBIIQ_INTELLIGENCEBV, true
+	case 1605:
+		return BACnetVendorId_CAMFILUSA_INC, true
 	case 161:
 		return BACnetVendorId_ENFLEX_CORP, true
 	case 162:
@@ -20448,10 +20580,32 @@ func BACnetVendorIdByName(value string) (enum BACnetVendorId, ok bool) {
 		return BACnetVendorId_CHYI_LEE_INDUSTRY_CO_LTD, true
 	case "ALLBEEBV":
 		return BACnetVendorId_ALLBEEBV, true
+	case "KAMPMANN_GMBH_COKG":
+		return BACnetVendorId_KAMPMANN_GMBH_COKG, true
+	case "COSEL_ELEKTRONIK_OTOMASYON_SISTEMLERI_SAN_TIC_LTD_STI":
+		return BACnetVendorId_COSEL_ELEKTRONIK_OTOMASYON_SISTEMLERI_SAN_TIC_LTD_STI, true
+	case "RACTL_DESIGNS":
+		return BACnetVendorId_RACTL_DESIGNS, true
+	case "DATABRIDGE_DYNAMIC_PVT_LTD":
+		return BACnetVendorId_DATABRIDGE_DYNAMIC_PVT_LTD, true
+	case "EVOLO_TECHNOLOGIESAS":
+		return BACnetVendorId_EVOLO_TECHNOLOGIESAS, true
 	case "UNITED_TECHNOLOGIES_CARRIER":
 		return BACnetVendorId_UNITED_TECHNOLOGIES_CARRIER, true
 	case "ROCKWELL_AUTOMATION":
 		return BACnetVendorId_ROCKWELL_AUTOMATION, true
+	case "ENERGY_PLUS_TEKNOLOJI_IMALAT_ITHALATVE_IHRACAT_SANAYIAS":
+		return BACnetVendorId_ENERGY_PLUS_TEKNOLOJI_IMALAT_ITHALATVE_IHRACAT_SANAYIAS, true
+	case "GAIAMESH_INC":
+		return BACnetVendorId_GAIAMESH_INC, true
+	case "LOVATO_ELECTRICSPA":
+		return BACnetVendorId_LOVATO_ELECTRICSPA, true
+	case "QPAC_SYSTEMS_INC":
+		return BACnetVendorId_QPAC_SYSTEMS_INC, true
+	case "YOBIIQ_INTELLIGENCEBV":
+		return BACnetVendorId_YOBIIQ_INTELLIGENCEBV, true
+	case "CAMFILUSA_INC":
+		return BACnetVendorId_CAMFILUSA_INC, true
 	case "ENFLEX_CORP":
 		return BACnetVendorId_ENFLEX_CORP, true
 	case "ASI_CONTROLS":
@@ -23698,10 +23852,32 @@ func (e BACnetVendorId) PLC4XEnumName() string {
 		return "CHYI_LEE_INDUSTRY_CO_LTD"
 	case BACnetVendorId_ALLBEEBV:
 		return "ALLBEEBV"
+	case BACnetVendorId_KAMPMANN_GMBH_COKG:
+		return "KAMPMANN_GMBH_COKG"
+	case BACnetVendorId_COSEL_ELEKTRONIK_OTOMASYON_SISTEMLERI_SAN_TIC_LTD_STI:
+		return "COSEL_ELEKTRONIK_OTOMASYON_SISTEMLERI_SAN_TIC_LTD_STI"
+	case BACnetVendorId_RACTL_DESIGNS:
+		return "RACTL_DESIGNS"
+	case BACnetVendorId_DATABRIDGE_DYNAMIC_PVT_LTD:
+		return "DATABRIDGE_DYNAMIC_PVT_LTD"
+	case BACnetVendorId_EVOLO_TECHNOLOGIESAS:
+		return "EVOLO_TECHNOLOGIESAS"
 	case BACnetVendorId_UNITED_TECHNOLOGIES_CARRIER:
 		return "UNITED_TECHNOLOGIES_CARRIER"
 	case BACnetVendorId_ROCKWELL_AUTOMATION:
 		return "ROCKWELL_AUTOMATION"
+	case BACnetVendorId_ENERGY_PLUS_TEKNOLOJI_IMALAT_ITHALATVE_IHRACAT_SANAYIAS:
+		return "ENERGY_PLUS_TEKNOLOJI_IMALAT_ITHALATVE_IHRACAT_SANAYIAS"
+	case BACnetVendorId_GAIAMESH_INC:
+		return "GAIAMESH_INC"
+	case BACnetVendorId_LOVATO_ELECTRICSPA:
+		return "LOVATO_ELECTRICSPA"
+	case BACnetVendorId_QPAC_SYSTEMS_INC:
+		return "QPAC_SYSTEMS_INC"
+	case BACnetVendorId_YOBIIQ_INTELLIGENCEBV:
+		return "YOBIIQ_INTELLIGENCEBV"
+	case BACnetVendorId_CAMFILUSA_INC:
+		return "CAMFILUSA_INC"
 	case BACnetVendorId_ENFLEX_CORP:
 		return "ENFLEX_CORP"
 	case BACnetVendorId_ASI_CONTROLS:
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
index e5fad0bfbe..e4ed998a36 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
@@ -820,7 +820,7 @@ const (
 	KnxManufacturer_M_MICRONIC_KOREA_CO___LTD_                           KnxManufacturer = 774
 	KnxManufacturer_M_ROBUSTEL_LIMITED                                   KnxManufacturer = 775
 	KnxManufacturer_M_LEXA_LIFESTYLE                                     KnxManufacturer = 776
-	KnxManufacturer_M_CASAMBI                                            KnxManufacturer = 777
+	KnxManufacturer_M_CASAMBI_TECHNOLOGIES_OY                            KnxManufacturer = 777
 	KnxManufacturer_M_BELCAB_UK_LTD                                      KnxManufacturer = 778
 	KnxManufacturer_M_CHANNEL_SMART_BUILDINGS                            KnxManufacturer = 779
 	KnxManufacturer_M_NANJING_KLEVEN_ELECTRONIC_TECHNOLOGY_CO___LTD      KnxManufacturer = 780
@@ -828,8 +828,14 @@ const (
 	KnxManufacturer_M_OCCHIO_GMBH                                        KnxManufacturer = 782
 	KnxManufacturer_M_INSTELL                                            KnxManufacturer = 783
 	KnxManufacturer_M_VOKA_VOGTLAENDISCHES_KABELWERK_GMBH                KnxManufacturer = 784
-	KnxManufacturer_M_ABB___RESERVED                                     KnxManufacturer = 785
-	KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED                    KnxManufacturer = 786
+	KnxManufacturer_M_QINGDAO_MAISI_INTELLIGENT_TECHNOLOGY_CO__LTD       KnxManufacturer = 785
+	KnxManufacturer_M_CHONGQING_MEXIN_MESSON_DOORS_INDUSTRY_CO___LTD__   KnxManufacturer = 786
+	KnxManufacturer_M_HOLFMANN_CULTURE_ART_CO__LTD                       KnxManufacturer = 787
+	KnxManufacturer_M_GUANGZHOU_BAITE_IOT_TECHNOLOGY_CO___LTD            KnxManufacturer = 788
+	KnxManufacturer_M_OWL_AUTOMATA                                       KnxManufacturer = 789
+	KnxManufacturer_M_AUTOMATED_PTY_LTD                                  KnxManufacturer = 790
+	KnxManufacturer_M_ABB___RESERVED                                     KnxManufacturer = 791
+	KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED                    KnxManufacturer = 792
 )
 
 var KnxManufacturerValues []KnxManufacturer
@@ -1614,7 +1620,7 @@ func init() {
 		KnxManufacturer_M_MICRONIC_KOREA_CO___LTD_,
 		KnxManufacturer_M_ROBUSTEL_LIMITED,
 		KnxManufacturer_M_LEXA_LIFESTYLE,
-		KnxManufacturer_M_CASAMBI,
+		KnxManufacturer_M_CASAMBI_TECHNOLOGIES_OY,
 		KnxManufacturer_M_BELCAB_UK_LTD,
 		KnxManufacturer_M_CHANNEL_SMART_BUILDINGS,
 		KnxManufacturer_M_NANJING_KLEVEN_ELECTRONIC_TECHNOLOGY_CO___LTD,
@@ -1622,6 +1628,12 @@ func init() {
 		KnxManufacturer_M_OCCHIO_GMBH,
 		KnxManufacturer_M_INSTELL,
 		KnxManufacturer_M_VOKA_VOGTLAENDISCHES_KABELWERK_GMBH,
+		KnxManufacturer_M_QINGDAO_MAISI_INTELLIGENT_TECHNOLOGY_CO__LTD,
+		KnxManufacturer_M_CHONGQING_MEXIN_MESSON_DOORS_INDUSTRY_CO___LTD__,
+		KnxManufacturer_M_HOLFMANN_CULTURE_ART_CO__LTD,
+		KnxManufacturer_M_GUANGZHOU_BAITE_IOT_TECHNOLOGY_CO___LTD,
+		KnxManufacturer_M_OWL_AUTOMATA,
+		KnxManufacturer_M_AUTOMATED_PTY_LTD,
 		KnxManufacturer_M_ABB___RESERVED,
 		KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED,
 	}
@@ -4679,16 +4691,40 @@ func (e KnxManufacturer) Number() uint16 {
 		}
 	case 785:
 		{ /* '785' */
-			return 43954
+			return 846
 		}
 	case 786:
 		{ /* '786' */
-			return 43959
+			return 847
+		}
+	case 787:
+		{ /* '787' */
+			return 848
+		}
+	case 788:
+		{ /* '788' */
+			return 849
+		}
+	case 789:
+		{ /* '789' */
+			return 850
 		}
 	case 79:
 		{ /* '79' */
 			return 118
 		}
+	case 790:
+		{ /* '790' */
+			return 851
+		}
+	case 791:
+		{ /* '791' */
+			return 43954
+		}
+	case 792:
+		{ /* '792' */
+			return 43959
+		}
 	case 8:
 		{ /* '8' */
 			return 9
@@ -7809,7 +7845,7 @@ func (e KnxManufacturer) Name() string {
 		}
 	case 777:
 		{ /* '777' */
-			return "casambi"
+			return "Casambi Technologies Oy"
 		}
 	case 778:
 		{ /* '778' */
@@ -7845,16 +7881,40 @@ func (e KnxManufacturer) Name() string {
 		}
 	case 785:
 		{ /* '785' */
-			return "ABB - reserved"
+			return "Qingdao Maisi Intelligent Technology Co.,Ltd"
 		}
 	case 786:
 		{ /* '786' */
-			return "Busch-Jaeger Elektro - reserved"
+			return "Chongqing Mexin Messon Doors Industry Co., Ltd.,"
+		}
+	case 787:
+		{ /* '787' */
+			return "Holfmann Culture Art Co.,LTD"
+		}
+	case 788:
+		{ /* '788' */
+			return "Guangzhou Baite IoT Technology Co., Ltd"
+		}
+	case 789:
+		{ /* '789' */
+			return "OWL Automata"
 		}
 	case 79:
 		{ /* '79' */
 			return "Arcus-eds"
 		}
+	case 790:
+		{ /* '790' */
+			return "Automated Pty Ltd"
+		}
+	case 791:
+		{ /* '791' */
+			return "ABB - reserved"
+		}
+	case 792:
+		{ /* '792' */
+			return "Busch-Jaeger Elektro - reserved"
+		}
 	case 8:
 		{ /* '8' */
 			return "Hager Electro"
@@ -9467,7 +9527,7 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) {
 	case 776:
 		return KnxManufacturer_M_LEXA_LIFESTYLE, true
 	case 777:
-		return KnxManufacturer_M_CASAMBI, true
+		return KnxManufacturer_M_CASAMBI_TECHNOLOGIES_OY, true
 	case 778:
 		return KnxManufacturer_M_BELCAB_UK_LTD, true
 	case 779:
@@ -9485,11 +9545,23 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) {
 	case 784:
 		return KnxManufacturer_M_VOKA_VOGTLAENDISCHES_KABELWERK_GMBH, true
 	case 785:
-		return KnxManufacturer_M_ABB___RESERVED, true
+		return KnxManufacturer_M_QINGDAO_MAISI_INTELLIGENT_TECHNOLOGY_CO__LTD, true
 	case 786:
-		return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
+		return KnxManufacturer_M_CHONGQING_MEXIN_MESSON_DOORS_INDUSTRY_CO___LTD__, true
+	case 787:
+		return KnxManufacturer_M_HOLFMANN_CULTURE_ART_CO__LTD, true
+	case 788:
+		return KnxManufacturer_M_GUANGZHOU_BAITE_IOT_TECHNOLOGY_CO___LTD, true
+	case 789:
+		return KnxManufacturer_M_OWL_AUTOMATA, true
 	case 79:
 		return KnxManufacturer_M_ARCUS_EDS, true
+	case 790:
+		return KnxManufacturer_M_AUTOMATED_PTY_LTD, true
+	case 791:
+		return KnxManufacturer_M_ABB___RESERVED, true
+	case 792:
+		return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
 	case 8:
 		return KnxManufacturer_M_HAGER_ELECTRO, true
 	case 80:
@@ -11046,8 +11118,8 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) {
 		return KnxManufacturer_M_ROBUSTEL_LIMITED, true
 	case "M_LEXA_LIFESTYLE":
 		return KnxManufacturer_M_LEXA_LIFESTYLE, true
-	case "M_CASAMBI":
-		return KnxManufacturer_M_CASAMBI, true
+	case "M_CASAMBI_TECHNOLOGIES_OY":
+		return KnxManufacturer_M_CASAMBI_TECHNOLOGIES_OY, true
 	case "M_BELCAB_UK_LTD":
 		return KnxManufacturer_M_BELCAB_UK_LTD, true
 	case "M_CHANNEL_SMART_BUILDINGS":
@@ -11064,12 +11136,24 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) {
 		return KnxManufacturer_M_INSTELL, true
 	case "M_VOKA_VOGTLAENDISCHES_KABELWERK_GMBH":
 		return KnxManufacturer_M_VOKA_VOGTLAENDISCHES_KABELWERK_GMBH, true
+	case "M_QINGDAO_MAISI_INTELLIGENT_TECHNOLOGY_CO__LTD":
+		return KnxManufacturer_M_QINGDAO_MAISI_INTELLIGENT_TECHNOLOGY_CO__LTD, true
+	case "M_CHONGQING_MEXIN_MESSON_DOORS_INDUSTRY_CO___LTD__":
+		return KnxManufacturer_M_CHONGQING_MEXIN_MESSON_DOORS_INDUSTRY_CO___LTD__, true
+	case "M_HOLFMANN_CULTURE_ART_CO__LTD":
+		return KnxManufacturer_M_HOLFMANN_CULTURE_ART_CO__LTD, true
+	case "M_GUANGZHOU_BAITE_IOT_TECHNOLOGY_CO___LTD":
+		return KnxManufacturer_M_GUANGZHOU_BAITE_IOT_TECHNOLOGY_CO___LTD, true
+	case "M_OWL_AUTOMATA":
+		return KnxManufacturer_M_OWL_AUTOMATA, true
+	case "M_ARCUS_EDS":
+		return KnxManufacturer_M_ARCUS_EDS, true
+	case "M_AUTOMATED_PTY_LTD":
+		return KnxManufacturer_M_AUTOMATED_PTY_LTD, true
 	case "M_ABB___RESERVED":
 		return KnxManufacturer_M_ABB___RESERVED, true
 	case "M_BUSCH_JAEGER_ELEKTRO___RESERVED":
 		return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
-	case "M_ARCUS_EDS":
-		return KnxManufacturer_M_ARCUS_EDS, true
 	case "M_HAGER_ELECTRO":
 		return KnxManufacturer_M_HAGER_ELECTRO, true
 	case "M_INTESIS":
@@ -12698,8 +12782,8 @@ func (e KnxManufacturer) PLC4XEnumName() string {
 		return "M_ROBUSTEL_LIMITED"
 	case KnxManufacturer_M_LEXA_LIFESTYLE:
 		return "M_LEXA_LIFESTYLE"
-	case KnxManufacturer_M_CASAMBI:
-		return "M_CASAMBI"
+	case KnxManufacturer_M_CASAMBI_TECHNOLOGIES_OY:
+		return "M_CASAMBI_TECHNOLOGIES_OY"
 	case KnxManufacturer_M_BELCAB_UK_LTD:
 		return "M_BELCAB_UK_LTD"
 	case KnxManufacturer_M_CHANNEL_SMART_BUILDINGS:
@@ -12716,12 +12800,24 @@ func (e KnxManufacturer) PLC4XEnumName() string {
 		return "M_INSTELL"
 	case KnxManufacturer_M_VOKA_VOGTLAENDISCHES_KABELWERK_GMBH:
 		return "M_VOKA_VOGTLAENDISCHES_KABELWERK_GMBH"
+	case KnxManufacturer_M_QINGDAO_MAISI_INTELLIGENT_TECHNOLOGY_CO__LTD:
+		return "M_QINGDAO_MAISI_INTELLIGENT_TECHNOLOGY_CO__LTD"
+	case KnxManufacturer_M_CHONGQING_MEXIN_MESSON_DOORS_INDUSTRY_CO___LTD__:
+		return "M_CHONGQING_MEXIN_MESSON_DOORS_INDUSTRY_CO___LTD__"
+	case KnxManufacturer_M_HOLFMANN_CULTURE_ART_CO__LTD:
+		return "M_HOLFMANN_CULTURE_ART_CO__LTD"
+	case KnxManufacturer_M_GUANGZHOU_BAITE_IOT_TECHNOLOGY_CO___LTD:
+		return "M_GUANGZHOU_BAITE_IOT_TECHNOLOGY_CO___LTD"
+	case KnxManufacturer_M_OWL_AUTOMATA:
+		return "M_OWL_AUTOMATA"
+	case KnxManufacturer_M_ARCUS_EDS:
+		return "M_ARCUS_EDS"
+	case KnxManufacturer_M_AUTOMATED_PTY_LTD:
+		return "M_AUTOMATED_PTY_LTD"
 	case KnxManufacturer_M_ABB___RESERVED:
 		return "M_ABB___RESERVED"
 	case KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED:
 		return "M_BUSCH_JAEGER_ELEKTRO___RESERVED"
-	case KnxManufacturer_M_ARCUS_EDS:
-		return "M_ARCUS_EDS"
 	case KnxManufacturer_M_HAGER_ELECTRO:
 		return "M_HAGER_ELECTRO"
 	case KnxManufacturer_M_INTESIS:
diff --git a/protocols/bacnetip/src/main/generated/protocols/bacnetip/bacnet-vendorids.mspec b/protocols/bacnetip/src/main/generated/protocols/bacnetip/bacnet-vendorids.mspec
index bcf9e33291..6860f8431f 100644
--- a/protocols/bacnetip/src/main/generated/protocols/bacnetip/bacnet-vendorids.mspec
+++ b/protocols/bacnetip/src/main/generated/protocols/bacnetip/bacnet-vendorids.mspec
@@ -1606,6 +1606,17 @@
   ['1592' ANDIVI ['1592', '"Andivi"']]
   ['1593' CHYI_LEE_INDUSTRY_CO_LTD ['1593', '"Chyi Lee Industry Co., Ltd."']]
   ['1594' ALLBEEBV ['1594', '"Allbee B.V."']]
+  ['1595' KAMPMANN_GMBH_COKG ['1595', '"Kampmann GmbH & Co. KG"']]
+  ['1596' COSEL_ELEKTRONIK_OTOMASYON_SISTEMLERI_SAN_TIC_LTD_STI ['1596', '"Cosel Elektronik Otomasyon Sistemleri San. Tic. Ltd. Sti."']]
+  ['1597' RACTL_DESIGNS ['1597', '"Ractl Designs"']]
+  ['1598' DATABRIDGE_DYNAMIC_PVT_LTD ['1598', '"Databridge Dynamic Pvt Ltd"']]
+  ['1599' EVOLO_TECHNOLOGIESAS ['1599', '"Evolo Technologies AS"']]
+  ['1600' ENERGY_PLUS_TEKNOLOJI_IMALAT_ITHALATVE_IHRACAT_SANAYIAS ['1600', '"EnergyPlus Teknoloji Imalat Ithalat ve Ihracat Sanayi AS"']]
+  ['1601' GAIAMESH_INC ['1601', '"Gaiamesh Inc."']]
+  ['1602' LOVATO_ELECTRICSPA ['1602', '"Lovato Electric S.P.A."']]
+  ['1603' QPAC_SYSTEMS_INC ['1603', '"Q-PAC Systems, Inc."']]
+  ['1604' YOBIIQ_INTELLIGENCEBV ['1604', '"Yobiiq Intelligence B.V."']]
+  ['1605' CAMFILUSA_INC ['1605', '"Camfil USA Inc."']]
  
   ['0xFFFF' UNKNOWN_VENDOR ['0xFFFF', '"Unknown"']]
 ]
diff --git a/protocols/knxnetip/src/main/generated/protocols/knxnetip/knx-master-data.mspec b/protocols/knxnetip/src/main/generated/protocols/knxnetip/knx-master-data.mspec
index 4962ea9cfe..8029f5f5cd 100644
--- a/protocols/knxnetip/src/main/generated/protocols/knxnetip/knx-master-data.mspec
+++ b/protocols/knxnetip/src/main/generated/protocols/knxnetip/knx-master-data.mspec
@@ -1529,7 +1529,7 @@
     ['774' M_MICRONIC_KOREA_CO___LTD_ ['835', '"Micronic Korea Co., Ltd."']]
     ['775' M_ROBUSTEL_LIMITED ['836', '"Robustel Limited"']]
     ['776' M_LEXA_LIFESTYLE ['837', '"Lexa LIFESTYLE"']]
-    ['777' M_CASAMBI ['838', '"casambi"']]
+    ['777' M_CASAMBI_TECHNOLOGIES_OY ['838', '"Casambi Technologies Oy"']]
     ['778' M_BELCAB_UK_LTD ['839', '"BELCAB UK LTD"']]
     ['779' M_CHANNEL_SMART_BUILDINGS ['840', '"Channel Smart Buildings"']]
     ['780' M_NANJING_KLEVEN_ELECTRONIC_TECHNOLOGY_CO___LTD ['841', '"Nanjing Kleven Electronic Technology Co., Ltd"']]
@@ -1537,8 +1537,14 @@
     ['782' M_OCCHIO_GMBH ['843', '"Occhio GmbH"']]
     ['783' M_INSTELL ['844', '"Instell"']]
     ['784' M_VOKA_VOGTLAENDISCHES_KABELWERK_GMBH ['845', '"VOKA Vogtländisches Kabelwerk GmbH"']]
-    ['785' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
-    ['786' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']]
+    ['785' M_QINGDAO_MAISI_INTELLIGENT_TECHNOLOGY_CO__LTD ['846', '"Qingdao Maisi Intelligent Technology Co.,Ltd"']]
+    ['786' M_CHONGQING_MEXIN_MESSON_DOORS_INDUSTRY_CO___LTD__ ['847', '"Chongqing Mexin Messon Doors Industry Co., Ltd.,"']]
+    ['787' M_HOLFMANN_CULTURE_ART_CO__LTD ['848', '"Holfmann Culture Art Co.,LTD"']]
+    ['788' M_GUANGZHOU_BAITE_IOT_TECHNOLOGY_CO___LTD ['849', '"Guangzhou Baite IoT Technology Co., Ltd"']]
+    ['789' M_OWL_AUTOMATA ['850', '"OWL Automata"']]
+    ['790' M_AUTOMATED_PTY_LTD ['851', '"Automated Pty Ltd"']]
+    ['791' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
+    ['792' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']]
     
 ]