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 2024/09/13 10:17:27 UTC

(plc4x) branch develop updated (6e7a7d386d -> 46fa163f9d)

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 6e7a7d386d refactor(plc4go/bacnetip): reworked protocol logic
     new c93d711c79 feat(knxnetip): update vendors
     new b5ed1acf02 feat(bacnetip): update vendors
     new 46fa163f9d feat(bacnetip): avoid panic on garbage data

The 3 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:
 .../bacnetip/readwrite/model/BACnetVendorId.go     | 160 +++++++++++++++++++++
 plc4go/protocols/bacnetip/readwrite/model/NPDU.go  |   5 +
 .../knxnetip/readwrite/model/KnxManufacturer.go    |  72 +++++++---
 .../protocols/bacnetip/bacnet-vendorids.mspec      |  10 ++
 .../resources/protocols/bacnetip/bacnetip.mspec    |   1 +
 .../protocols/knxnetip/knx-master-data.mspec       |   8 +-
 6 files changed, 233 insertions(+), 23 deletions(-)


(plc4x) 03/03: feat(bacnetip): avoid panic on garbage data

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 46fa163f9defb989f39bd7602d9c6e586dd10bb7
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Fri Sep 13 12:17:20 2024 +0200

    feat(bacnetip): avoid panic on garbage data
---
 plc4go/protocols/bacnetip/readwrite/model/NPDU.go                    | 5 +++++
 .../bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec    | 1 +
 2 files changed, 6 insertions(+)

diff --git a/plc4go/protocols/bacnetip/readwrite/model/NPDU.go b/plc4go/protocols/bacnetip/readwrite/model/NPDU.go
index a47d89252d..a6003ceec3 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/NPDU.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/NPDU.go
@@ -342,6 +342,11 @@ func (m *_NPDU) parse(ctx context.Context, readBuffer utils.ReadBuffer, npduLeng
 	}
 	m.Control = control
 
+	// Validation
+	if !(bool((control) != (nil))) {
+		return nil, errors.WithStack(utils.ParseValidationError{Message: "control required for further processing"})
+	}
+
 	var destinationNetworkAddress *uint16
 	destinationNetworkAddress, err = ReadOptionalField[uint16](ctx, "destinationNetworkAddress", ReadUnsignedShort(readBuffer, uint8(16)), control.GetDestinationSpecified())
 	if err != nil {
diff --git a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
index 8cee11b75a..848b6ec0cf 100644
--- a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
+++ b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
@@ -98,6 +98,7 @@
 [type NPDU(uint 16 npduLength)
     [simple   uint 8      protocolVersionNumber                                                                   ]
     [simple   NPDUControl control                                                                                 ]
+    [validation    'control != null'    "control required for further processing"                                 ]
     [optional uint 16     destinationNetworkAddress   'control.destinationSpecified'                              ]
     [optional uint 8      destinationLength           'control.destinationSpecified'                              ]
     [array    uint 8      destinationAddress count    'control.destinationSpecified ? destinationLength : 0'      ]


(plc4x) 02/03: feat(bacnetip): update vendors

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 b5ed1acf02047309104155dfd7fc88b488c524ec
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Fri Sep 13 12:16:56 2024 +0200

    feat(bacnetip): update vendors
---
 .../bacnetip/readwrite/model/BACnetVendorId.go     | 160 +++++++++++++++++++++
 .../protocols/bacnetip/bacnet-vendorids.mspec      |  10 ++
 2 files changed, 170 insertions(+)

diff --git a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
index bdf6c123d1..63f58f9112 100644
--- a/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
+++ b/plc4go/protocols/bacnetip/readwrite/model/BACnetVendorId.go
@@ -1527,6 +1527,16 @@ const (
 	BACnetVendorId_ADVECO                                                                       BACnetVendorId = 1490
 	BACnetVendorId_EURA_DRIVES_ELECTRIC_CO_LTD                                                  BACnetVendorId = 1491
 	BACnetVendorId_CALEB_CONTROLS                                                               BACnetVendorId = 1492
+	BACnetVendorId_IN_BIOT_MONITORINGSL                                                         BACnetVendorId = 1493
+	BACnetVendorId_QINGDAO_HAIER_AIR_CONDITIONER_ELECTRIC_CO_LTD                                BACnetVendorId = 1494
+	BACnetVendorId_HANGZHOU_WEIYL_TECHNOLOGY_CO_LTD                                             BACnetVendorId = 1495
+	BACnetVendorId_YORDSRL                                                                      BACnetVendorId = 1496
+	BACnetVendorId_INFINITUM_ELECTRIC                                                           BACnetVendorId = 1497
+	BACnetVendorId_RED_BEAN_SYSTEMS_LIMITED                                                     BACnetVendorId = 1498
+	BACnetVendorId_BLUE_TIME_CONCEPTSA                                                          BACnetVendorId = 1499
+	BACnetVendorId_SHENZHENINVT_ELECTRIC_CO_LTD                                                 BACnetVendorId = 1500
+	BACnetVendorId_MESSUNG_SYSTEMS_PVT_LTD                                                      BACnetVendorId = 1501
+	BACnetVendorId_ABB_ELECTRIFICATION_CANADA_INC                                               BACnetVendorId = 1502
 	BACnetVendorId_UNKNOWN_VENDOR                                                               BACnetVendorId = 0xFFFF
 )
 
@@ -3019,6 +3029,16 @@ func init() {
 		BACnetVendorId_ADVECO,
 		BACnetVendorId_EURA_DRIVES_ELECTRIC_CO_LTD,
 		BACnetVendorId_CALEB_CONTROLS,
+		BACnetVendorId_IN_BIOT_MONITORINGSL,
+		BACnetVendorId_QINGDAO_HAIER_AIR_CONDITIONER_ELECTRIC_CO_LTD,
+		BACnetVendorId_HANGZHOU_WEIYL_TECHNOLOGY_CO_LTD,
+		BACnetVendorId_YORDSRL,
+		BACnetVendorId_INFINITUM_ELECTRIC,
+		BACnetVendorId_RED_BEAN_SYSTEMS_LIMITED,
+		BACnetVendorId_BLUE_TIME_CONCEPTSA,
+		BACnetVendorId_SHENZHENINVT_ELECTRIC_CO_LTD,
+		BACnetVendorId_MESSUNG_SYSTEMS_PVT_LTD,
+		BACnetVendorId_ABB_ELECTRIFICATION_CANADA_INC,
 		BACnetVendorId_UNKNOWN_VENDOR,
 	}
 }
@@ -5217,6 +5237,34 @@ func (e BACnetVendorId) VendorId() uint16 {
 		{ /* '1492' */
 			return 1492
 		}
+	case 1493:
+		{ /* '1493' */
+			return 1493
+		}
+	case 1494:
+		{ /* '1494' */
+			return 1494
+		}
+	case 1495:
+		{ /* '1495' */
+			return 1495
+		}
+	case 1496:
+		{ /* '1496' */
+			return 1496
+		}
+	case 1497:
+		{ /* '1497' */
+			return 1497
+		}
+	case 1498:
+		{ /* '1498' */
+			return 1498
+		}
+	case 1499:
+		{ /* '1499' */
+			return 1499
+		}
 	case 15:
 		{ /* '15' */
 			return 15
@@ -5225,6 +5273,18 @@ func (e BACnetVendorId) VendorId() uint16 {
 		{ /* '150' */
 			return 150
 		}
+	case 1500:
+		{ /* '1500' */
+			return 1500
+		}
+	case 1501:
+		{ /* '1501' */
+			return 1501
+		}
+	case 1502:
+		{ /* '1502' */
+			return 1502
+		}
 	case 151:
 		{ /* '151' */
 			return 151
@@ -11175,6 +11235,34 @@ func (e BACnetVendorId) VendorName() string {
 		{ /* '1492' */
 			return "Caleb Controls"
 		}
+	case 1493:
+		{ /* '1493' */
+			return "InBiot Monitoring S.L"
+		}
+	case 1494:
+		{ /* '1494' */
+			return "Qingdao Haier Air Conditioner Electric Co., Ltd."
+		}
+	case 1495:
+		{ /* '1495' */
+			return "Hangzhou Weiyl Technology Co., Ltd."
+		}
+	case 1496:
+		{ /* '1496' */
+			return "yord sàrl"
+		}
+	case 1497:
+		{ /* '1497' */
+			return "Infinitum Electric"
+		}
+	case 1498:
+		{ /* '1498' */
+			return "Red Bean Systems Limited"
+		}
+	case 1499:
+		{ /* '1499' */
+			return "Blue Time Concept SA"
+		}
 	case 15:
 		{ /* '15' */
 			return "Cornell University"
@@ -11183,6 +11271,18 @@ func (e BACnetVendorId) VendorName() string {
 		{ /* '150' */
 			return "Advantech Corporation"
 		}
+	case 1500:
+		{ /* '1500' */
+			return "Shenzhen INVT Electric Co., Ltd."
+		}
+	case 1501:
+		{ /* '1501' */
+			return "Messung Systems Pvt Ltd."
+		}
+	case 1502:
+		{ /* '1502' */
+			return "ABB Electrification Canada Inc."
+		}
 	case 151:
 		{ /* '151' */
 			return "Titan Products, Ltd."
@@ -16036,10 +16136,30 @@ func BACnetVendorIdByValue(value uint16) (enum BACnetVendorId, ok bool) {
 		return BACnetVendorId_EURA_DRIVES_ELECTRIC_CO_LTD, true
 	case 1492:
 		return BACnetVendorId_CALEB_CONTROLS, true
+	case 1493:
+		return BACnetVendorId_IN_BIOT_MONITORINGSL, true
+	case 1494:
+		return BACnetVendorId_QINGDAO_HAIER_AIR_CONDITIONER_ELECTRIC_CO_LTD, true
+	case 1495:
+		return BACnetVendorId_HANGZHOU_WEIYL_TECHNOLOGY_CO_LTD, true
+	case 1496:
+		return BACnetVendorId_YORDSRL, true
+	case 1497:
+		return BACnetVendorId_INFINITUM_ELECTRIC, true
+	case 1498:
+		return BACnetVendorId_RED_BEAN_SYSTEMS_LIMITED, true
+	case 1499:
+		return BACnetVendorId_BLUE_TIME_CONCEPTSA, true
 	case 15:
 		return BACnetVendorId_CORNELL_UNIVERSITY, true
 	case 150:
 		return BACnetVendorId_ADVANTECH_CORPORATION, true
+	case 1500:
+		return BACnetVendorId_SHENZHENINVT_ELECTRIC_CO_LTD, true
+	case 1501:
+		return BACnetVendorId_MESSUNG_SYSTEMS_PVT_LTD, true
+	case 1502:
+		return BACnetVendorId_ABB_ELECTRIFICATION_CANADA_INC, true
 	case 151:
 		return BACnetVendorId_TITAN_PRODUCTS_LTD, true
 	case 152:
@@ -19012,10 +19132,30 @@ func BACnetVendorIdByName(value string) (enum BACnetVendorId, ok bool) {
 		return BACnetVendorId_EURA_DRIVES_ELECTRIC_CO_LTD, true
 	case "CALEB_CONTROLS":
 		return BACnetVendorId_CALEB_CONTROLS, true
+	case "IN_BIOT_MONITORINGSL":
+		return BACnetVendorId_IN_BIOT_MONITORINGSL, true
+	case "QINGDAO_HAIER_AIR_CONDITIONER_ELECTRIC_CO_LTD":
+		return BACnetVendorId_QINGDAO_HAIER_AIR_CONDITIONER_ELECTRIC_CO_LTD, true
+	case "HANGZHOU_WEIYL_TECHNOLOGY_CO_LTD":
+		return BACnetVendorId_HANGZHOU_WEIYL_TECHNOLOGY_CO_LTD, true
+	case "YORDSRL":
+		return BACnetVendorId_YORDSRL, true
+	case "INFINITUM_ELECTRIC":
+		return BACnetVendorId_INFINITUM_ELECTRIC, true
+	case "RED_BEAN_SYSTEMS_LIMITED":
+		return BACnetVendorId_RED_BEAN_SYSTEMS_LIMITED, true
+	case "BLUE_TIME_CONCEPTSA":
+		return BACnetVendorId_BLUE_TIME_CONCEPTSA, true
 	case "CORNELL_UNIVERSITY":
 		return BACnetVendorId_CORNELL_UNIVERSITY, true
 	case "ADVANTECH_CORPORATION":
 		return BACnetVendorId_ADVANTECH_CORPORATION, true
+	case "SHENZHENINVT_ELECTRIC_CO_LTD":
+		return BACnetVendorId_SHENZHENINVT_ELECTRIC_CO_LTD, true
+	case "MESSUNG_SYSTEMS_PVT_LTD":
+		return BACnetVendorId_MESSUNG_SYSTEMS_PVT_LTD, true
+	case "ABB_ELECTRIFICATION_CANADA_INC":
+		return BACnetVendorId_ABB_ELECTRIFICATION_CANADA_INC, true
 	case "TITAN_PRODUCTS_LTD":
 		return BACnetVendorId_TITAN_PRODUCTS_LTD, true
 	case "REGEL_PARTNERS":
@@ -22060,10 +22200,30 @@ func (e BACnetVendorId) PLC4XEnumName() string {
 		return "EURA_DRIVES_ELECTRIC_CO_LTD"
 	case BACnetVendorId_CALEB_CONTROLS:
 		return "CALEB_CONTROLS"
+	case BACnetVendorId_IN_BIOT_MONITORINGSL:
+		return "IN_BIOT_MONITORINGSL"
+	case BACnetVendorId_QINGDAO_HAIER_AIR_CONDITIONER_ELECTRIC_CO_LTD:
+		return "QINGDAO_HAIER_AIR_CONDITIONER_ELECTRIC_CO_LTD"
+	case BACnetVendorId_HANGZHOU_WEIYL_TECHNOLOGY_CO_LTD:
+		return "HANGZHOU_WEIYL_TECHNOLOGY_CO_LTD"
+	case BACnetVendorId_YORDSRL:
+		return "YORDSRL"
+	case BACnetVendorId_INFINITUM_ELECTRIC:
+		return "INFINITUM_ELECTRIC"
+	case BACnetVendorId_RED_BEAN_SYSTEMS_LIMITED:
+		return "RED_BEAN_SYSTEMS_LIMITED"
+	case BACnetVendorId_BLUE_TIME_CONCEPTSA:
+		return "BLUE_TIME_CONCEPTSA"
 	case BACnetVendorId_CORNELL_UNIVERSITY:
 		return "CORNELL_UNIVERSITY"
 	case BACnetVendorId_ADVANTECH_CORPORATION:
 		return "ADVANTECH_CORPORATION"
+	case BACnetVendorId_SHENZHENINVT_ELECTRIC_CO_LTD:
+		return "SHENZHENINVT_ELECTRIC_CO_LTD"
+	case BACnetVendorId_MESSUNG_SYSTEMS_PVT_LTD:
+		return "MESSUNG_SYSTEMS_PVT_LTD"
+	case BACnetVendorId_ABB_ELECTRIFICATION_CANADA_INC:
+		return "ABB_ELECTRIFICATION_CANADA_INC"
 	case BACnetVendorId_TITAN_PRODUCTS_LTD:
 		return "TITAN_PRODUCTS_LTD"
 	case BACnetVendorId_REGEL_PARTNERS:
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 72df63983b..1ecb6de2cc 100644
--- a/protocols/bacnetip/src/main/generated/protocols/bacnetip/bacnet-vendorids.mspec
+++ b/protocols/bacnetip/src/main/generated/protocols/bacnetip/bacnet-vendorids.mspec
@@ -1505,6 +1505,16 @@
   ['1490' ADVECO ['1490', '"Adveco"']]
   ['1491' EURA_DRIVES_ELECTRIC_CO_LTD ['1491', '"Eura Drives Electric Co., Ltd."']]
   ['1492' CALEB_CONTROLS ['1492', '"Caleb Controls"']]
+  ['1493' IN_BIOT_MONITORINGSL ['1493', '"InBiot Monitoring S.L"']]
+  ['1494' QINGDAO_HAIER_AIR_CONDITIONER_ELECTRIC_CO_LTD ['1494', '"Qingdao Haier Air Conditioner Electric Co., Ltd."']]
+  ['1495' HANGZHOU_WEIYL_TECHNOLOGY_CO_LTD ['1495', '"Hangzhou Weiyl Technology Co., Ltd."']]
+  ['1496' YORDSRL ['1496', '"yord sàrl"']]
+  ['1497' INFINITUM_ELECTRIC ['1497', '"Infinitum Electric"']]
+  ['1498' RED_BEAN_SYSTEMS_LIMITED ['1498', '"Red Bean Systems Limited"']]
+  ['1499' BLUE_TIME_CONCEPTSA ['1499', '"Blue Time Concept SA"']]
+  ['1500' SHENZHENINVT_ELECTRIC_CO_LTD ['1500', '"Shenzhen INVT Electric Co., Ltd."']]
+  ['1501' MESSUNG_SYSTEMS_PVT_LTD ['1501', '"Messung Systems Pvt Ltd."']]
+  ['1502' ABB_ELECTRIFICATION_CANADA_INC ['1502', '"ABB Electrification Canada Inc."']]
  
   ['0xFFFF' UNKNOWN_VENDOR ['0xFFFF', '"Unknown"']]
 ]


(plc4x) 01/03: feat(knxnetip): update vendors

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 c93d711c79f8ab2c577be6393c96f5abb6244915
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Fri Sep 13 12:16:40 2024 +0200

    feat(knxnetip): update vendors
---
 .../knxnetip/readwrite/model/KnxManufacturer.go    | 72 ++++++++++++++++------
 .../protocols/knxnetip/knx-master-data.mspec       |  8 ++-
 2 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
index 0b14d33924..76e093de07 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
@@ -137,7 +137,7 @@ const (
 	KnxManufacturer_M_VESTAMATIC                                         KnxManufacturer = 91
 	KnxManufacturer_M_MDT_TECHNOLOGIES                                   KnxManufacturer = 92
 	KnxManufacturer_M_WARENDORFER_KUECHEN_GMBH                           KnxManufacturer = 93
-	KnxManufacturer_M_VIDEO_STAR                                         KnxManufacturer = 94
+	KnxManufacturer_M_GVS                                                KnxManufacturer = 94
 	KnxManufacturer_M_SITEK                                              KnxManufacturer = 95
 	KnxManufacturer_M_CONTROLTRONIC                                      KnxManufacturer = 96
 	KnxManufacturer_M_FUNCTION_TECHNOLOGY                                KnxManufacturer = 97
@@ -731,8 +731,10 @@ const (
 	KnxManufacturer_M_ZHEJIANG_FORICK__INTELLIGENT_TECHNOLOGY_CO___LTD   KnxManufacturer = 685
 	KnxManufacturer_M_VARNI_DIGITAL_PRIVATE_LIMITED                      KnxManufacturer = 686
 	KnxManufacturer_M_3A_ENTREPRISE_APS                                  KnxManufacturer = 687
-	KnxManufacturer_M_ABB___RESERVED                                     KnxManufacturer = 688
-	KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED                    KnxManufacturer = 689
+	KnxManufacturer_M_ITALIANA_CONDUTTORI_SRL                            KnxManufacturer = 688
+	KnxManufacturer_M_XIAMEN_LEELEN_TECHNOLOGY_CO__LTD_                  KnxManufacturer = 689
+	KnxManufacturer_M_ABB___RESERVED                                     KnxManufacturer = 690
+	KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED                    KnxManufacturer = 691
 )
 
 var KnxManufacturerValues []KnxManufacturer
@@ -834,7 +836,7 @@ func init() {
 		KnxManufacturer_M_VESTAMATIC,
 		KnxManufacturer_M_MDT_TECHNOLOGIES,
 		KnxManufacturer_M_WARENDORFER_KUECHEN_GMBH,
-		KnxManufacturer_M_VIDEO_STAR,
+		KnxManufacturer_M_GVS,
 		KnxManufacturer_M_SITEK,
 		KnxManufacturer_M_CONTROLTRONIC,
 		KnxManufacturer_M_FUNCTION_TECHNOLOGY,
@@ -1428,6 +1430,8 @@ func init() {
 		KnxManufacturer_M_ZHEJIANG_FORICK__INTELLIGENT_TECHNOLOGY_CO___LTD,
 		KnxManufacturer_M_VARNI_DIGITAL_PRIVATE_LIMITED,
 		KnxManufacturer_M_3A_ENTREPRISE_APS,
+		KnxManufacturer_M_ITALIANA_CONDUTTORI_SRL,
+		KnxManufacturer_M_XIAMEN_LEELEN_TECHNOLOGY_CO__LTD_,
 		KnxManufacturer_M_ABB___RESERVED,
 		KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED,
 	}
@@ -4053,16 +4057,24 @@ func (e KnxManufacturer) Number() uint16 {
 		}
 	case 688:
 		{ /* '688' */
-			return 43954
+			return 746
 		}
 	case 689:
 		{ /* '689' */
-			return 43959
+			return 747
 		}
 	case 69:
 		{ /* '69' */
 			return 108
 		}
+	case 690:
+		{ /* '690' */
+			return 43954
+		}
+	case 691:
+		{ /* '691' */
+			return 43959
+		}
 	case 7:
 		{ /* '7' */
 			return 8
@@ -6831,16 +6843,24 @@ func (e KnxManufacturer) Name() string {
 		}
 	case 688:
 		{ /* '688' */
-			return "ABB - reserved"
+			return "Italiana Conduttori srl"
 		}
 	case 689:
 		{ /* '689' */
-			return "Busch-Jaeger Elektro - reserved"
+			return "Xiamen Leelen Technology Co.,Ltd."
 		}
 	case 69:
 		{ /* '69' */
 			return "Eelectron"
 		}
+	case 690:
+		{ /* '690' */
+			return "ABB - reserved"
+		}
+	case 691:
+		{ /* '691' */
+			return "Busch-Jaeger Elektro - reserved"
+		}
 	case 7:
 		{ /* '7' */
 			return "GIRA Giersiepen"
@@ -6951,7 +6971,7 @@ func (e KnxManufacturer) Name() string {
 		}
 	case 94:
 		{ /* '94' */
-			return "Video-Star"
+			return "GVS"
 		}
 	case 95:
 		{ /* '95' */
@@ -8299,11 +8319,15 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) {
 	case 687:
 		return KnxManufacturer_M_3A_ENTREPRISE_APS, true
 	case 688:
-		return KnxManufacturer_M_ABB___RESERVED, true
+		return KnxManufacturer_M_ITALIANA_CONDUTTORI_SRL, true
 	case 689:
-		return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
+		return KnxManufacturer_M_XIAMEN_LEELEN_TECHNOLOGY_CO__LTD_, true
 	case 69:
 		return KnxManufacturer_M_EELECTRON, true
+	case 690:
+		return KnxManufacturer_M_ABB___RESERVED, true
+	case 691:
+		return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
 	case 7:
 		return KnxManufacturer_M_GIRA_GIERSIEPEN, true
 	case 70:
@@ -8359,7 +8383,7 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) {
 	case 93:
 		return KnxManufacturer_M_WARENDORFER_KUECHEN_GMBH, true
 	case 94:
-		return KnxManufacturer_M_VIDEO_STAR, true
+		return KnxManufacturer_M_GVS, true
 	case 95:
 		return KnxManufacturer_M_SITEK, true
 	case 96:
@@ -9684,12 +9708,16 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) {
 		return KnxManufacturer_M_VARNI_DIGITAL_PRIVATE_LIMITED, true
 	case "M_3A_ENTREPRISE_APS":
 		return KnxManufacturer_M_3A_ENTREPRISE_APS, true
+	case "M_ITALIANA_CONDUTTORI_SRL":
+		return KnxManufacturer_M_ITALIANA_CONDUTTORI_SRL, true
+	case "M_XIAMEN_LEELEN_TECHNOLOGY_CO__LTD_":
+		return KnxManufacturer_M_XIAMEN_LEELEN_TECHNOLOGY_CO__LTD_, true
+	case "M_EELECTRON":
+		return KnxManufacturer_M_EELECTRON, 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_EELECTRON":
-		return KnxManufacturer_M_EELECTRON, true
 	case "M_GIRA_GIERSIEPEN":
 		return KnxManufacturer_M_GIRA_GIERSIEPEN, true
 	case "M_BELDEN_WIRE_AND_CABLE_B_V_":
@@ -9744,8 +9772,8 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) {
 		return KnxManufacturer_M_MDT_TECHNOLOGIES, true
 	case "M_WARENDORFER_KUECHEN_GMBH":
 		return KnxManufacturer_M_WARENDORFER_KUECHEN_GMBH, true
-	case "M_VIDEO_STAR":
-		return KnxManufacturer_M_VIDEO_STAR, true
+	case "M_GVS":
+		return KnxManufacturer_M_GVS, true
 	case "M_SITEK":
 		return KnxManufacturer_M_SITEK, true
 	case "M_CONTROLTRONIC":
@@ -11142,12 +11170,16 @@ func (e KnxManufacturer) PLC4XEnumName() string {
 		return "M_VARNI_DIGITAL_PRIVATE_LIMITED"
 	case KnxManufacturer_M_3A_ENTREPRISE_APS:
 		return "M_3A_ENTREPRISE_APS"
+	case KnxManufacturer_M_ITALIANA_CONDUTTORI_SRL:
+		return "M_ITALIANA_CONDUTTORI_SRL"
+	case KnxManufacturer_M_XIAMEN_LEELEN_TECHNOLOGY_CO__LTD_:
+		return "M_XIAMEN_LEELEN_TECHNOLOGY_CO__LTD_"
+	case KnxManufacturer_M_EELECTRON:
+		return "M_EELECTRON"
 	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_EELECTRON:
-		return "M_EELECTRON"
 	case KnxManufacturer_M_GIRA_GIERSIEPEN:
 		return "M_GIRA_GIERSIEPEN"
 	case KnxManufacturer_M_BELDEN_WIRE_AND_CABLE_B_V_:
@@ -11202,8 +11234,8 @@ func (e KnxManufacturer) PLC4XEnumName() string {
 		return "M_MDT_TECHNOLOGIES"
 	case KnxManufacturer_M_WARENDORFER_KUECHEN_GMBH:
 		return "M_WARENDORFER_KUECHEN_GMBH"
-	case KnxManufacturer_M_VIDEO_STAR:
-		return "M_VIDEO_STAR"
+	case KnxManufacturer_M_GVS:
+		return "M_GVS"
 	case KnxManufacturer_M_SITEK:
 		return "M_SITEK"
 	case KnxManufacturer_M_CONTROLTRONIC:
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 680dfba4ad..5dabc63863 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
@@ -843,7 +843,7 @@
     ['91' M_VESTAMATIC ['130', '"Vestamatic"']]
     ['92' M_MDT_TECHNOLOGIES ['131', '"MDT technologies"']]
     ['93' M_WARENDORFER_KUECHEN_GMBH ['132', '"Warendorfer Küchen GmbH"']]
-    ['94' M_VIDEO_STAR ['133', '"Video-Star"']]
+    ['94' M_GVS ['133', '"GVS"']]
     ['95' M_SITEK ['134', '"Sitek"']]
     ['96' M_CONTROLTRONIC ['135', '"CONTROLtronic"']]
     ['97' M_FUNCTION_TECHNOLOGY ['136', '"function Technology"']]
@@ -1437,8 +1437,10 @@
     ['685' M_ZHEJIANG_FORICK__INTELLIGENT_TECHNOLOGY_CO___LTD ['743', '"Zhejiang FORICK, Intelligent Technology Co., LTD"']]
     ['686' M_VARNI_DIGITAL_PRIVATE_LIMITED ['744', '"Varni Digital Private Limited"']]
     ['687' M_3A_ENTREPRISE_APS ['745', '"3a entreprise aps"']]
-    ['688' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
-    ['689' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']]
+    ['688' M_ITALIANA_CONDUTTORI_SRL ['746', '"Italiana Conduttori srl"']]
+    ['689' M_XIAMEN_LEELEN_TECHNOLOGY_CO__LTD_ ['747', '"Xiamen Leelen Technology Co.,Ltd."']]
+    ['690' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
+    ['691' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']]
     
 ]