You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2026/09/03 15:08:01 UTC
(plc4x) branch develop updated (dac01134a4 -> 51fcab7c56)
This is an automated email from the ASF dual-hosted git repository.
chrisdutz pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
from dac01134a4 doc: Updated and streamlined the driver documentation.
new d5deee8701 chore: Updated the knx master data
new 51fcab7c56 doc: Corrected a stale comment.
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:
.../knxnetip/readwrite/model/KnxDatapoint.go | 54 ++++
.../knxnetip/readwrite/model/KnxDatapointType.go | 240 ++++++++++--------
.../knxnetip/readwrite/model/KnxManufacturer.go | 34 ++-
.../java/knxnetip/readwrite/KnxDatapoint.java | 52 ++++
.../java/knxnetip/readwrite/KnxDatapointType.java | 40 +--
.../java/knxnetip/readwrite/KnxManufacturer.java | 6 +-
.../knxnetip/readwrite/model/KnxDatapoint.cs | 37 +++
.../knxnetip/readwrite/model/KnxDatapointType.cs | 280 +++++++++++----------
.../knxnetip/readwrite/model/KnxManufacturer.cs | 23 +-
pom.xml | 24 +-
.../protocols/knxnetip/knx-master-data.mspec | 57 +++--
11 files changed, 544 insertions(+), 303 deletions(-)
(plc4x) 01/02: chore: Updated the knx master data
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chrisdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit d5deee87014cb117ddbaf28ba7b776713743378b
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Sep 3 17:07:26 2026 +0200
chore: Updated the knx master data
---
.../knxnetip/readwrite/model/KnxDatapoint.go | 54 ++++
.../knxnetip/readwrite/model/KnxDatapointType.go | 240 ++++++++++--------
.../knxnetip/readwrite/model/KnxManufacturer.go | 34 ++-
.../java/knxnetip/readwrite/KnxDatapoint.java | 52 ++++
.../java/knxnetip/readwrite/KnxDatapointType.java | 40 +--
.../java/knxnetip/readwrite/KnxManufacturer.java | 6 +-
.../knxnetip/readwrite/model/KnxDatapoint.cs | 37 +++
.../knxnetip/readwrite/model/KnxDatapointType.cs | 280 +++++++++++----------
.../knxnetip/readwrite/model/KnxManufacturer.cs | 23 +-
.../protocols/knxnetip/knx-master-data.mspec | 57 +++--
10 files changed, 526 insertions(+), 297 deletions(-)
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxDatapoint.go b/plc4go/protocols/knxnetip/readwrite/model/KnxDatapoint.go
index 325f2bff67..542276fd30 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxDatapoint.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxDatapoint.go
@@ -7178,6 +7178,40 @@ func KnxDatapointParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffe
_ = b // TODO: temporary till we fix TIME stuff in golang (see above in the template)
readBuffer.CloseContext("KnxDatapoint")
return values.NewPlcStruct(_map), nil
+ case datapointType == KnxDatapointType_DPT_Colour_HSV: // Struct
+ // Struct
+ _map := map[string]api.PlcValue{}
+
+ // Reserved Field (Just skip the bytes)
+ if _, _err := /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.ReadUint8("reserved", 8); _err != nil {
+ return nil, errors.Wrap(_err, "Error parsing reserved field")
+ }
+
+ // Simple Field (h)
+ h, _hErr := /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.ReadUint8("h", 8)
+ if _hErr != nil {
+ return nil, errors.Wrap(_hErr, "Error parsing 'h' field")
+ }
+ _map["Struct"] = values.NewPlcUSINT(h)
+ _ = h // TODO: temporary till we fix TIME stuff in golang (see above in the template)
+
+ // Simple Field (s)
+ s, _sErr := /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.ReadUint8("s", 8)
+ if _sErr != nil {
+ return nil, errors.Wrap(_sErr, "Error parsing 's' field")
+ }
+ _map["Struct"] = values.NewPlcUSINT(s)
+ _ = s // TODO: temporary till we fix TIME stuff in golang (see above in the template)
+
+ // Simple Field (v)
+ v, _vErr := /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.ReadUint8("v", 8)
+ if _vErr != nil {
+ return nil, errors.Wrap(_vErr, "Error parsing 'v' field")
+ }
+ _map["Struct"] = values.NewPlcUSINT(v)
+ _ = v // TODO: temporary till we fix TIME stuff in golang (see above in the template)
+ readBuffer.CloseContext("KnxDatapoint")
+ return values.NewPlcStruct(_map), nil
case datapointType == KnxDatapointType_DPT_LanguageCodeAlpha2_ASCII: // STRING
// Reserved Field (Just skip the bytes)
if _, _err := /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.ReadUint8("reserved", 8); _err != nil {
@@ -13178,6 +13212,26 @@ func KnxDatapointSerializeWithWriteBuffer(ctx context.Context, writeBuffer utils
if _err := /*TODO: migrate me*/ writeBuffer.WriteUint8("b", 8, uint8(value.GetUint8())); _err != nil {
return errors.Wrap(_err, "Error serializing 'b' field")
}
+ case datapointType == KnxDatapointType_DPT_Colour_HSV: // Struct
+ // Reserved Field (Just skip the bytes)
+ if _err := /*TODO: migrate me*/ writeBuffer.WriteUint8("reserved", 8, uint8(uint8(0x00))); _err != nil {
+ return errors.Wrap(_err, "Error serializing reserved field")
+ }
+
+ // Simple Field (h)
+ if _err := /*TODO: migrate me*/ writeBuffer.WriteUint8("h", 8, uint8(value.GetUint8())); _err != nil {
+ return errors.Wrap(_err, "Error serializing 'h' field")
+ }
+
+ // Simple Field (s)
+ if _err := /*TODO: migrate me*/ writeBuffer.WriteUint8("s", 8, uint8(value.GetUint8())); _err != nil {
+ return errors.Wrap(_err, "Error serializing 's' field")
+ }
+
+ // Simple Field (v)
+ if _err := /*TODO: migrate me*/ writeBuffer.WriteUint8("v", 8, uint8(value.GetUint8())); _err != nil {
+ return errors.Wrap(_err, "Error serializing 'v' field")
+ }
case datapointType == KnxDatapointType_DPT_LanguageCodeAlpha2_ASCII: // STRING
// Reserved Field (Just skip the bytes)
if _err := /*TODO: migrate me*/ writeBuffer.WriteUint8("reserved", 8, uint8(uint8(0x00))); _err != nil {
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointType.go b/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointType.go
index 511eeb27aa..13750168ad 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointType.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxDatapointType.go
@@ -383,25 +383,26 @@ const (
KnxDatapointType_DPT_MeteringValue KnxDatapointType = 333
KnxDatapointType_DPT_MBus_Address KnxDatapointType = 334
KnxDatapointType_DPT_Colour_RGB KnxDatapointType = 335
- KnxDatapointType_DPT_LanguageCodeAlpha2_ASCII KnxDatapointType = 336
- KnxDatapointType_DPT_Tariff_ActiveEnergy KnxDatapointType = 337
- KnxDatapointType_DPT_Prioritised_Mode_Control KnxDatapointType = 338
- KnxDatapointType_DPT_DALI_Control_Gear_Diagnostic KnxDatapointType = 339
- KnxDatapointType_DPT_DALI_Diagnostics KnxDatapointType = 340
- KnxDatapointType_DPT_CombinedPosition KnxDatapointType = 341
- KnxDatapointType_DPT_StatusSAB KnxDatapointType = 342
- KnxDatapointType_DPT_Colour_xyY KnxDatapointType = 343
- KnxDatapointType_DPT_Converter_Status KnxDatapointType = 344
- KnxDatapointType_DPT_Converter_Test_Result KnxDatapointType = 345
- KnxDatapointType_DPT_Battery_Info KnxDatapointType = 346
- KnxDatapointType_DPT_Brightness_Colour_Temperature_Transition KnxDatapointType = 347
- KnxDatapointType_DPT_Brightness_Colour_Temperature_Control KnxDatapointType = 348
- KnxDatapointType_DPT_Colour_RGBW KnxDatapointType = 349
- KnxDatapointType_DPT_Relative_Control_RGBW KnxDatapointType = 350
- KnxDatapointType_DPT_Relative_Control_RGB KnxDatapointType = 351
- KnxDatapointType_DPT_GeographicalLocation KnxDatapointType = 352
- KnxDatapointType_DPT_TempRoomSetpSetF16_4 KnxDatapointType = 353
- KnxDatapointType_DPT_TempRoomSetpSetShiftF16_4 KnxDatapointType = 354
+ KnxDatapointType_DPT_Colour_HSV KnxDatapointType = 336
+ KnxDatapointType_DPT_LanguageCodeAlpha2_ASCII KnxDatapointType = 337
+ KnxDatapointType_DPT_Tariff_ActiveEnergy KnxDatapointType = 338
+ KnxDatapointType_DPT_Prioritised_Mode_Control KnxDatapointType = 339
+ KnxDatapointType_DPT_DALI_Control_Gear_Diagnostic KnxDatapointType = 340
+ KnxDatapointType_DPT_DALI_Diagnostics KnxDatapointType = 341
+ KnxDatapointType_DPT_CombinedPosition KnxDatapointType = 342
+ KnxDatapointType_DPT_StatusSAB KnxDatapointType = 343
+ KnxDatapointType_DPT_Colour_xyY KnxDatapointType = 344
+ KnxDatapointType_DPT_Converter_Status KnxDatapointType = 345
+ KnxDatapointType_DPT_Converter_Test_Result KnxDatapointType = 346
+ KnxDatapointType_DPT_Battery_Info KnxDatapointType = 347
+ KnxDatapointType_DPT_Brightness_Colour_Temperature_Transition KnxDatapointType = 348
+ KnxDatapointType_DPT_Brightness_Colour_Temperature_Control KnxDatapointType = 349
+ KnxDatapointType_DPT_Colour_RGBW KnxDatapointType = 350
+ KnxDatapointType_DPT_Relative_Control_RGBW KnxDatapointType = 351
+ KnxDatapointType_DPT_Relative_Control_RGB KnxDatapointType = 352
+ KnxDatapointType_DPT_GeographicalLocation KnxDatapointType = 353
+ KnxDatapointType_DPT_TempRoomSetpSetF16_4 KnxDatapointType = 354
+ KnxDatapointType_DPT_TempRoomSetpSetShiftF16_4 KnxDatapointType = 355
)
var KnxDatapointTypeValues []KnxDatapointType
@@ -745,6 +746,7 @@ func init() {
KnxDatapointType_DPT_MeteringValue,
KnxDatapointType_DPT_MBus_Address,
KnxDatapointType_DPT_Colour_RGB,
+ KnxDatapointType_DPT_Colour_HSV,
KnxDatapointType_DPT_LanguageCodeAlpha2_ASCII,
KnxDatapointType_DPT_Tariff_ActiveEnergy,
KnxDatapointType_DPT_Prioritised_Mode_Control,
@@ -1827,7 +1829,7 @@ func (e KnxDatapointType) Number() uint16 {
}
case 336:
{ /* '336' */
- return 1
+ return 601
}
case 337:
{ /* '337' */
@@ -1839,7 +1841,7 @@ func (e KnxDatapointType) Number() uint16 {
}
case 339:
{ /* '339' */
- return 600
+ return 1
}
case 34:
{ /* '34' */
@@ -1851,7 +1853,7 @@ func (e KnxDatapointType) Number() uint16 {
}
case 341:
{ /* '341' */
- return 800
+ return 600
}
case 342:
{ /* '342' */
@@ -1859,7 +1861,7 @@ func (e KnxDatapointType) Number() uint16 {
}
case 343:
{ /* '343' */
- return 600
+ return 800
}
case 344:
{ /* '344' */
@@ -1899,14 +1901,18 @@ func (e KnxDatapointType) Number() uint16 {
}
case 352:
{ /* '352' */
- return 1
+ return 600
}
case 353:
{ /* '353' */
- return 100
+ return 1
}
case 354:
{ /* '354' */
+ return 100
+ }
+ case 355:
+ { /* '355' */
return 101
}
case 36:
@@ -3265,11 +3271,11 @@ func (e KnxDatapointType) PlcValueTpe() values.PlcValueType {
}
case 336:
{ /* '336' */
- return values.STRING
+ return values.Struct
}
case 337:
{ /* '337' */
- return values.Struct
+ return values.STRING
}
case 338:
{ /* '338' */
@@ -3347,6 +3353,10 @@ func (e KnxDatapointType) PlcValueTpe() values.PlcValueType {
{ /* '354' */
return values.Struct
}
+ case 355:
+ { /* '355' */
+ return values.Struct
+ }
case 36:
{ /* '36' */
return values.BOOL
@@ -4703,19 +4713,19 @@ func (e KnxDatapointType) Name() string {
}
case 336:
{ /* '336' */
- return "language code (ASCII)"
+ return "Colour HSV"
}
case 337:
{ /* '337' */
- return "electrical energy with tariff"
+ return "language code (ASCII)"
}
case 338:
{ /* '338' */
- return "priority control"
+ return "electrical energy with tariff"
}
case 339:
{ /* '339' */
- return "diagnostic value"
+ return "priority control"
}
case 34:
{ /* '34' */
@@ -4727,39 +4737,39 @@ func (e KnxDatapointType) Name() string {
}
case 341:
{ /* '341' */
- return "combined position"
+ return "diagnostic value"
}
case 342:
{ /* '342' */
- return "status sunblind & shutter actuator"
+ return "combined position"
}
case 343:
{ /* '343' */
- return "colour xyY"
+ return "status sunblind & shutter actuator"
}
case 344:
{ /* '344' */
- return "DALI converter status"
+ return "colour xyY"
}
case 345:
{ /* '345' */
- return "DALI converter test result"
+ return "DALI converter status"
}
case 346:
{ /* '346' */
- return "Battery Information"
+ return "DALI converter test result"
}
case 347:
{ /* '347' */
- return "brightness colour temperature transition"
+ return "Battery Information"
}
case 348:
{ /* '348' */
- return "brightness colour temperature control"
+ return "brightness colour temperature transition"
}
case 349:
{ /* '349' */
- return "RGBW value 4x(0..100%)"
+ return "brightness colour temperature control"
}
case 35:
{ /* '35' */
@@ -4767,22 +4777,26 @@ func (e KnxDatapointType) Name() string {
}
case 350:
{ /* '350' */
- return "RGBW relative control"
+ return "RGBW value 4x(0..100%)"
}
case 351:
{ /* '351' */
- return "RGB relative control"
+ return "RGBW relative control"
}
case 352:
{ /* '352' */
- return "geographical location (longitude and latitude) expressed in degrees"
+ return "RGB relative control"
}
case 353:
{ /* '353' */
- return "Temperature setpoint setting for 4 HVAC Modes"
+ return "geographical location (longitude and latitude) expressed in degrees"
}
case 354:
{ /* '354' */
+ return "Temperature setpoint setting for 4 HVAC Modes"
+ }
+ case 355:
+ { /* '355' */
return "Temperature setpoint shift setting for 4 HVAC Modes"
}
case 36:
@@ -6141,19 +6155,19 @@ func (e KnxDatapointType) Id() string {
}
case 336:
{ /* '336' */
- return "DPST-234-1"
+ return "DPST-232-601"
}
case 337:
{ /* '337' */
- return "DPST-235-1"
+ return "DPST-234-1"
}
case 338:
{ /* '338' */
- return "DPST-236-1"
+ return "DPST-235-1"
}
case 339:
{ /* '339' */
- return "DPST-237-600"
+ return "DPST-236-1"
}
case 34:
{ /* '34' */
@@ -6161,43 +6175,43 @@ func (e KnxDatapointType) Id() string {
}
case 340:
{ /* '340' */
- return "DPST-238-600"
+ return "DPST-237-600"
}
case 341:
{ /* '341' */
- return "DPST-240-800"
+ return "DPST-238-600"
}
case 342:
{ /* '342' */
- return "DPST-241-800"
+ return "DPST-240-800"
}
case 343:
{ /* '343' */
- return "DPST-242-600"
+ return "DPST-241-800"
}
case 344:
{ /* '344' */
- return "DPST-244-600"
+ return "DPST-242-600"
}
case 345:
{ /* '345' */
- return "DPST-245-600"
+ return "DPST-244-600"
}
case 346:
{ /* '346' */
- return "DPST-246-600"
+ return "DPST-245-600"
}
case 347:
{ /* '347' */
- return "DPST-249-600"
+ return "DPST-246-600"
}
case 348:
{ /* '348' */
- return "DPST-250-600"
+ return "DPST-249-600"
}
case 349:
{ /* '349' */
- return "DPST-251-600"
+ return "DPST-250-600"
}
case 35:
{ /* '35' */
@@ -6205,22 +6219,26 @@ func (e KnxDatapointType) Id() string {
}
case 350:
{ /* '350' */
- return "DPST-252-600"
+ return "DPST-251-600"
}
case 351:
{ /* '351' */
- return "DPST-254-600"
+ return "DPST-252-600"
}
case 352:
{ /* '352' */
- return "DPST-255-1"
+ return "DPST-254-600"
}
case 353:
{ /* '353' */
- return "DPST-275-100"
+ return "DPST-255-1"
}
case 354:
{ /* '354' */
+ return "DPST-275-100"
+ }
+ case 355:
+ { /* '355' */
return "DPST-275-101"
}
case 36:
@@ -7579,19 +7597,19 @@ func (e KnxDatapointType) DatapointMainType() KnxDatapointMainType {
}
case 336:
{ /* '336' */
- return KnxDatapointMainType_DPT_LANGUAGE_CODE_ISO_639_1
+ return KnxDatapointMainType_DPT_3_BYTE_COLOUR_RGB
}
case 337:
{ /* '337' */
- return KnxDatapointMainType_DPT_SIGNED_VALUE_WITH_CLASSIFICATION_AND_VALIDITY
+ return KnxDatapointMainType_DPT_LANGUAGE_CODE_ISO_639_1
}
case 338:
{ /* '338' */
- return KnxDatapointMainType_DPT_PRIORITISED_MODE_CONTROL
+ return KnxDatapointMainType_DPT_SIGNED_VALUE_WITH_CLASSIFICATION_AND_VALIDITY
}
case 339:
{ /* '339' */
- return KnxDatapointMainType_DPT_CONFIGURATION_DIAGNOSTICS_16_BIT
+ return KnxDatapointMainType_DPT_PRIORITISED_MODE_CONTROL
}
case 34:
{ /* '34' */
@@ -7599,43 +7617,43 @@ func (e KnxDatapointType) DatapointMainType() KnxDatapointMainType {
}
case 340:
{ /* '340' */
- return KnxDatapointMainType_DPT_CONFIGURATION_DIAGNOSTICS_8_BIT
+ return KnxDatapointMainType_DPT_CONFIGURATION_DIAGNOSTICS_16_BIT
}
case 341:
{ /* '341' */
- return KnxDatapointMainType_DPT_POSITIONS
+ return KnxDatapointMainType_DPT_CONFIGURATION_DIAGNOSTICS_8_BIT
}
case 342:
{ /* '342' */
- return KnxDatapointMainType_DPT_STATUS_32_BIT
+ return KnxDatapointMainType_DPT_POSITIONS
}
case 343:
{ /* '343' */
- return KnxDatapointMainType_DPT_STATUS_48_BIT
+ return KnxDatapointMainType_DPT_STATUS_32_BIT
}
case 344:
{ /* '344' */
- return KnxDatapointMainType_DPT_CONVERTER_STATUS
+ return KnxDatapointMainType_DPT_STATUS_48_BIT
}
case 345:
{ /* '345' */
- return KnxDatapointMainType_DPT_CONVERTER_TEST_RESULT
+ return KnxDatapointMainType_DPT_CONVERTER_STATUS
}
case 346:
{ /* '346' */
- return KnxDatapointMainType_DPT_BATTERY_INFORMATION
+ return KnxDatapointMainType_DPT_CONVERTER_TEST_RESULT
}
case 347:
{ /* '347' */
- return KnxDatapointMainType_DPT_BRIGHTNESS_COLOUR_TEMPERATURE_TRANSITION
+ return KnxDatapointMainType_DPT_BATTERY_INFORMATION
}
case 348:
{ /* '348' */
- return KnxDatapointMainType_DPT_STATUS_24_BIT
+ return KnxDatapointMainType_DPT_BRIGHTNESS_COLOUR_TEMPERATURE_TRANSITION
}
case 349:
{ /* '349' */
- return KnxDatapointMainType_DPT_COLOUR_RGBW
+ return KnxDatapointMainType_DPT_STATUS_24_BIT
}
case 35:
{ /* '35' */
@@ -7643,24 +7661,28 @@ func (e KnxDatapointType) DatapointMainType() KnxDatapointMainType {
}
case 350:
{ /* '350' */
- return KnxDatapointMainType_DPT_RELATIVE_CONTROL_RGBW
+ return KnxDatapointMainType_DPT_COLOUR_RGBW
}
case 351:
{ /* '351' */
- return KnxDatapointMainType_DPT_RELATIVE_CONTROL_RGB
+ return KnxDatapointMainType_DPT_RELATIVE_CONTROL_RGBW
}
case 352:
{ /* '352' */
- return KnxDatapointMainType_DPT_F32F32
+ return KnxDatapointMainType_DPT_RELATIVE_CONTROL_RGB
}
case 353:
{ /* '353' */
- return KnxDatapointMainType_DPT_F16F16F16F16
+ return KnxDatapointMainType_DPT_F32F32
}
case 354:
{ /* '354' */
return KnxDatapointMainType_DPT_F16F16F16F16
}
+ case 355:
+ { /* '355' */
+ return KnxDatapointMainType_DPT_F16F16F16F16
+ }
case 36:
{ /* '36' */
return KnxDatapointMainType_DPT_1_BIT
@@ -8487,46 +8509,48 @@ func KnxDatapointTypeByValue(value uint32) (enum KnxDatapointType, ok bool) {
case 335:
return KnxDatapointType_DPT_Colour_RGB, true
case 336:
- return KnxDatapointType_DPT_LanguageCodeAlpha2_ASCII, true
+ return KnxDatapointType_DPT_Colour_HSV, true
case 337:
- return KnxDatapointType_DPT_Tariff_ActiveEnergy, true
+ return KnxDatapointType_DPT_LanguageCodeAlpha2_ASCII, true
case 338:
- return KnxDatapointType_DPT_Prioritised_Mode_Control, true
+ return KnxDatapointType_DPT_Tariff_ActiveEnergy, true
case 339:
- return KnxDatapointType_DPT_DALI_Control_Gear_Diagnostic, true
+ return KnxDatapointType_DPT_Prioritised_Mode_Control, true
case 34:
return KnxDatapointType_DPT_UpDown, true
case 340:
- return KnxDatapointType_DPT_DALI_Diagnostics, true
+ return KnxDatapointType_DPT_DALI_Control_Gear_Diagnostic, true
case 341:
- return KnxDatapointType_DPT_CombinedPosition, true
+ return KnxDatapointType_DPT_DALI_Diagnostics, true
case 342:
- return KnxDatapointType_DPT_StatusSAB, true
+ return KnxDatapointType_DPT_CombinedPosition, true
case 343:
- return KnxDatapointType_DPT_Colour_xyY, true
+ return KnxDatapointType_DPT_StatusSAB, true
case 344:
- return KnxDatapointType_DPT_Converter_Status, true
+ return KnxDatapointType_DPT_Colour_xyY, true
case 345:
- return KnxDatapointType_DPT_Converter_Test_Result, true
+ return KnxDatapointType_DPT_Converter_Status, true
case 346:
- return KnxDatapointType_DPT_Battery_Info, true
+ return KnxDatapointType_DPT_Converter_Test_Result, true
case 347:
- return KnxDatapointType_DPT_Brightness_Colour_Temperature_Transition, true
+ return KnxDatapointType_DPT_Battery_Info, true
case 348:
- return KnxDatapointType_DPT_Brightness_Colour_Temperature_Control, true
+ return KnxDatapointType_DPT_Brightness_Colour_Temperature_Transition, true
case 349:
- return KnxDatapointType_DPT_Colour_RGBW, true
+ return KnxDatapointType_DPT_Brightness_Colour_Temperature_Control, true
case 35:
return KnxDatapointType_DPT_OpenClose, true
case 350:
- return KnxDatapointType_DPT_Relative_Control_RGBW, true
+ return KnxDatapointType_DPT_Colour_RGBW, true
case 351:
- return KnxDatapointType_DPT_Relative_Control_RGB, true
+ return KnxDatapointType_DPT_Relative_Control_RGBW, true
case 352:
- return KnxDatapointType_DPT_GeographicalLocation, true
+ return KnxDatapointType_DPT_Relative_Control_RGB, true
case 353:
- return KnxDatapointType_DPT_TempRoomSetpSetF16_4, true
+ return KnxDatapointType_DPT_GeographicalLocation, true
case 354:
+ return KnxDatapointType_DPT_TempRoomSetpSetF16_4, true
+ case 355:
return KnxDatapointType_DPT_TempRoomSetpSetShiftF16_4, true
case 36:
return KnxDatapointType_DPT_Start, true
@@ -9202,16 +9226,18 @@ func KnxDatapointTypeByName(value string) (enum KnxDatapointType, ok bool) {
return KnxDatapointType_DPT_MBus_Address, true
case "DPT_Colour_RGB":
return KnxDatapointType_DPT_Colour_RGB, true
+ case "DPT_Colour_HSV":
+ return KnxDatapointType_DPT_Colour_HSV, true
case "DPT_LanguageCodeAlpha2_ASCII":
return KnxDatapointType_DPT_LanguageCodeAlpha2_ASCII, true
case "DPT_Tariff_ActiveEnergy":
return KnxDatapointType_DPT_Tariff_ActiveEnergy, true
case "DPT_Prioritised_Mode_Control":
return KnxDatapointType_DPT_Prioritised_Mode_Control, true
- case "DPT_DALI_Control_Gear_Diagnostic":
- return KnxDatapointType_DPT_DALI_Control_Gear_Diagnostic, true
case "DPT_UpDown":
return KnxDatapointType_DPT_UpDown, true
+ case "DPT_DALI_Control_Gear_Diagnostic":
+ return KnxDatapointType_DPT_DALI_Control_Gear_Diagnostic, true
case "DPT_DALI_Diagnostics":
return KnxDatapointType_DPT_DALI_Diagnostics, true
case "DPT_CombinedPosition":
@@ -9230,10 +9256,10 @@ func KnxDatapointTypeByName(value string) (enum KnxDatapointType, ok bool) {
return KnxDatapointType_DPT_Brightness_Colour_Temperature_Transition, true
case "DPT_Brightness_Colour_Temperature_Control":
return KnxDatapointType_DPT_Brightness_Colour_Temperature_Control, true
- case "DPT_Colour_RGBW":
- return KnxDatapointType_DPT_Colour_RGBW, true
case "DPT_OpenClose":
return KnxDatapointType_DPT_OpenClose, true
+ case "DPT_Colour_RGBW":
+ return KnxDatapointType_DPT_Colour_RGBW, true
case "DPT_Relative_Control_RGBW":
return KnxDatapointType_DPT_Relative_Control_RGBW, true
case "DPT_Relative_Control_RGB":
@@ -9999,16 +10025,18 @@ func (e KnxDatapointType) PLC4XEnumName() string {
return "DPT_MBus_Address"
case KnxDatapointType_DPT_Colour_RGB:
return "DPT_Colour_RGB"
+ case KnxDatapointType_DPT_Colour_HSV:
+ return "DPT_Colour_HSV"
case KnxDatapointType_DPT_LanguageCodeAlpha2_ASCII:
return "DPT_LanguageCodeAlpha2_ASCII"
case KnxDatapointType_DPT_Tariff_ActiveEnergy:
return "DPT_Tariff_ActiveEnergy"
case KnxDatapointType_DPT_Prioritised_Mode_Control:
return "DPT_Prioritised_Mode_Control"
- case KnxDatapointType_DPT_DALI_Control_Gear_Diagnostic:
- return "DPT_DALI_Control_Gear_Diagnostic"
case KnxDatapointType_DPT_UpDown:
return "DPT_UpDown"
+ case KnxDatapointType_DPT_DALI_Control_Gear_Diagnostic:
+ return "DPT_DALI_Control_Gear_Diagnostic"
case KnxDatapointType_DPT_DALI_Diagnostics:
return "DPT_DALI_Diagnostics"
case KnxDatapointType_DPT_CombinedPosition:
@@ -10027,10 +10055,10 @@ func (e KnxDatapointType) PLC4XEnumName() string {
return "DPT_Brightness_Colour_Temperature_Transition"
case KnxDatapointType_DPT_Brightness_Colour_Temperature_Control:
return "DPT_Brightness_Colour_Temperature_Control"
- case KnxDatapointType_DPT_Colour_RGBW:
- return "DPT_Colour_RGBW"
case KnxDatapointType_DPT_OpenClose:
return "DPT_OpenClose"
+ case KnxDatapointType_DPT_Colour_RGBW:
+ return "DPT_Colour_RGBW"
case KnxDatapointType_DPT_Relative_Control_RGBW:
return "DPT_Relative_Control_RGBW"
case KnxDatapointType_DPT_Relative_Control_RGB:
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
index 97eae457c8..4e80eb4891 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
@@ -872,8 +872,9 @@ const (
KnxManufacturer_M_GUANGZHOU_YINGLIGHT_TECHNOLOGY_CO__LTD_ KnxManufacturer = 826
KnxManufacturer_M_RUEDIGER_WOLF_AB KnxManufacturer = 827
KnxManufacturer_M_KOLORS_INDIA_PRIVATE_LIMITED KnxManufacturer = 828
- KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 829
- KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 830
+ KnxManufacturer_M_GERALD_DOCENKO KnxManufacturer = 829
+ KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 830
+ KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 831
)
var KnxManufacturerValues []KnxManufacturer
@@ -1710,6 +1711,7 @@ func init() {
KnxManufacturer_M_GUANGZHOU_YINGLIGHT_TECHNOLOGY_CO__LTD_,
KnxManufacturer_M_RUEDIGER_WOLF_AB,
KnxManufacturer_M_KOLORS_INDIA_PRIVATE_LIMITED,
+ KnxManufacturer_M_GERALD_DOCENKO,
KnxManufacturer_M_ABB___RESERVED,
KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED,
}
@@ -4963,7 +4965,7 @@ func (e KnxManufacturer) Number() uint16 {
}
case 829:
{ /* '829' */
- return 43954
+ return 891
}
case 83:
{ /* '83' */
@@ -4971,6 +4973,10 @@ func (e KnxManufacturer) Number() uint16 {
}
case 830:
{ /* '830' */
+ return 43954
+ }
+ case 831:
+ { /* '831' */
return 43959
}
case 84:
@@ -8305,7 +8311,7 @@ func (e KnxManufacturer) Name() string {
}
case 829:
{ /* '829' */
- return "ABB - reserved"
+ return "Gerald Docenko"
}
case 83:
{ /* '83' */
@@ -8313,6 +8319,10 @@ func (e KnxManufacturer) Name() string {
}
case 830:
{ /* '830' */
+ return "ABB - reserved"
+ }
+ case 831:
+ { /* '831' */
return "Busch-Jaeger Elektro - reserved"
}
case 84:
@@ -10023,10 +10033,12 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) {
case 828:
return KnxManufacturer_M_KOLORS_INDIA_PRIVATE_LIMITED, true
case 829:
- return KnxManufacturer_M_ABB___RESERVED, true
+ return KnxManufacturer_M_GERALD_DOCENKO, true
case 83:
return KnxManufacturer_M_DURABLE_TECHNOLOGIES, true
case 830:
+ return KnxManufacturer_M_ABB___RESERVED, true
+ case 831:
return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
case 84:
return KnxManufacturer_M_INNOTEAM, true
@@ -11690,10 +11702,12 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) {
return KnxManufacturer_M_RUEDIGER_WOLF_AB, true
case "M_KOLORS_INDIA_PRIVATE_LIMITED":
return KnxManufacturer_M_KOLORS_INDIA_PRIVATE_LIMITED, true
- case "M_ABB___RESERVED":
- return KnxManufacturer_M_ABB___RESERVED, true
+ case "M_GERALD_DOCENKO":
+ return KnxManufacturer_M_GERALD_DOCENKO, true
case "M_DURABLE_TECHNOLOGIES":
return KnxManufacturer_M_DURABLE_TECHNOLOGIES, 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_INNOTEAM":
@@ -13430,10 +13444,12 @@ func (e KnxManufacturer) PLC4XEnumName() string {
return "M_RUEDIGER_WOLF_AB"
case KnxManufacturer_M_KOLORS_INDIA_PRIVATE_LIMITED:
return "M_KOLORS_INDIA_PRIVATE_LIMITED"
- case KnxManufacturer_M_ABB___RESERVED:
- return "M_ABB___RESERVED"
+ case KnxManufacturer_M_GERALD_DOCENKO:
+ return "M_GERALD_DOCENKO"
case KnxManufacturer_M_DURABLE_TECHNOLOGIES:
return "M_DURABLE_TECHNOLOGIES"
+ 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_INNOTEAM:
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 150c8a6878..9e1e9d2210 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
@@ -5311,6 +5311,28 @@ public class KnxDatapoint {
_map.put("g", new PlcUSINT(g));
_map.put("b", new PlcUSINT(b));
return new PlcStruct(_map);
+ } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_Colour_HSV)) {
+ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ // Struct
+ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+ // Reserved Field
+ FieldReaderFactory.readReservedField(DataReaderFactory.readUnsignedShort(readBuffer, 8), (short) 0x00, WithOption.WithName("KnxDatapoint.reserved0"));
+
+ // Simple Field: h
+ short h = FieldReaderFactory.readSimpleField(DataReaderFactory.readUnsignedShort(readBuffer, 8), WithOption.WithName("h"));
+
+ // Simple Field: s
+ short s = FieldReaderFactory.readSimpleField(DataReaderFactory.readUnsignedShort(readBuffer, 8), WithOption.WithName("s"));
+
+ // Simple Field: v
+ short v = FieldReaderFactory.readSimpleField(DataReaderFactory.readUnsignedShort(readBuffer, 8), WithOption.WithName("v"));
+
+ Map<String, PlcValue> _map = new HashMap<>();
+ _map.put("h", new PlcUSINT(h));
+ _map.put("s", new PlcUSINT(s));
+ _map.put("v", new PlcUSINT(v));
+ return new PlcStruct(_map);
} else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_LanguageCodeAlpha2_ASCII)) {
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// STRING
@@ -9892,6 +9914,21 @@ public class KnxDatapoint {
// Simple Field: b
FieldWriterFactory.writeSimpleField((short) _value.getStruct().get("b").getShort(), DataWriterFactory.writeUnsignedShort(writeBuffer, 8), WithOption.WithName("b"));
+ } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_Colour_HSV)) {
+ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ // Struct
+ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ // Reserved Field
+ FieldWriterFactory.writeReservedField((short) 0x00, DataWriterFactory.writeUnsignedShort(writeBuffer, 8));
+
+ // Simple Field: h
+ FieldWriterFactory.writeSimpleField((short) _value.getStruct().get("h").getShort(), DataWriterFactory.writeUnsignedShort(writeBuffer, 8), WithOption.WithName("h"));
+
+ // Simple Field: s
+ FieldWriterFactory.writeSimpleField((short) _value.getStruct().get("s").getShort(), DataWriterFactory.writeUnsignedShort(writeBuffer, 8), WithOption.WithName("s"));
+
+ // Simple Field: v
+ FieldWriterFactory.writeSimpleField((short) _value.getStruct().get("v").getShort(), DataWriterFactory.writeUnsignedShort(writeBuffer, 8), WithOption.WithName("v"));
} else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_LanguageCodeAlpha2_ASCII)) {
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// STRING
@@ -14292,6 +14329,21 @@ public class KnxDatapoint {
// Simple Field: b
lengthInBits += 8;
+ } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_Colour_HSV)) {
+ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ // Struct
+ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ // Reserved Field
+ lengthInBits += 8;
+
+ // Simple Field: h
+ lengthInBits += 8;
+
+ // Simple Field: s
+ lengthInBits += 8;
+
+ // Simple Field: v
+ lengthInBits += 8;
} else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_LanguageCodeAlpha2_ASCII)) {
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// STRING
diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxDatapointType.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxDatapointType.java
index 7fb0f014c7..0ca738097d 100644
--- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxDatapointType.java
+++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxDatapointType.java
@@ -698,43 +698,45 @@ public enum KnxDatapointType {
DPT_Colour_RGB((long) 335L, (int) 600, PlcValueType.Struct, "RGB value 3x(0..255)", "DPST-232-600", KnxDatapointMainType.DPT_3_BYTE_COLOUR_RGB),
- DPT_LanguageCodeAlpha2_ASCII((long) 336L, (int) 1, PlcValueType.STRING, "language code (ASCII)", "DPST-234-1", KnxDatapointMainType.DPT_LANGUAGE_CODE_ISO_639_1),
+ DPT_Colour_HSV((long) 336L, (int) 601, PlcValueType.Struct, "Colour HSV", "DPST-232-601", KnxDatapointMainType.DPT_3_BYTE_COLOUR_RGB),
- DPT_Tariff_ActiveEnergy((long) 337L, (int) 1, PlcValueType.Struct, "electrical energy with tariff", "DPST-235-1", KnxDatapointMainType.DPT_SIGNED_VALUE_WITH_CLASSIFICATION_AND_VALIDITY),
+ DPT_LanguageCodeAlpha2_ASCII((long) 337L, (int) 1, PlcValueType.STRING, "language code (ASCII)", "DPST-234-1", KnxDatapointMainType.DPT_LANGUAGE_CODE_ISO_639_1),
- DPT_Prioritised_Mode_Control((long) 338L, (int) 1, PlcValueType.Struct, "priority control", "DPST-236-1", KnxDatapointMainType.DPT_PRIORITISED_MODE_CONTROL),
+ DPT_Tariff_ActiveEnergy((long) 338L, (int) 1, PlcValueType.Struct, "electrical energy with tariff", "DPST-235-1", KnxDatapointMainType.DPT_SIGNED_VALUE_WITH_CLASSIFICATION_AND_VALIDITY),
- DPT_DALI_Control_Gear_Diagnostic((long) 339L, (int) 600, PlcValueType.Struct, "diagnostic value", "DPST-237-600", KnxDatapointMainType.DPT_CONFIGURATION_DIAGNOSTICS_16_BIT),
+ DPT_Prioritised_Mode_Control((long) 339L, (int) 1, PlcValueType.Struct, "priority control", "DPST-236-1", KnxDatapointMainType.DPT_PRIORITISED_MODE_CONTROL),
- DPT_DALI_Diagnostics((long) 340L, (int) 600, PlcValueType.Struct, "diagnostic value", "DPST-238-600", KnxDatapointMainType.DPT_CONFIGURATION_DIAGNOSTICS_8_BIT),
+ DPT_DALI_Control_Gear_Diagnostic((long) 340L, (int) 600, PlcValueType.Struct, "diagnostic value", "DPST-237-600", KnxDatapointMainType.DPT_CONFIGURATION_DIAGNOSTICS_16_BIT),
- DPT_CombinedPosition((long) 341L, (int) 800, PlcValueType.Struct, "combined position", "DPST-240-800", KnxDatapointMainType.DPT_POSITIONS),
+ DPT_DALI_Diagnostics((long) 341L, (int) 600, PlcValueType.Struct, "diagnostic value", "DPST-238-600", KnxDatapointMainType.DPT_CONFIGURATION_DIAGNOSTICS_8_BIT),
- DPT_StatusSAB((long) 342L, (int) 800, PlcValueType.Struct, "status sunblind & shutter actuator", "DPST-241-800", KnxDatapointMainType.DPT_STATUS_32_BIT),
+ DPT_CombinedPosition((long) 342L, (int) 800, PlcValueType.Struct, "combined position", "DPST-240-800", KnxDatapointMainType.DPT_POSITIONS),
- DPT_Colour_xyY((long) 343L, (int) 600, PlcValueType.Struct, "colour xyY", "DPST-242-600", KnxDatapointMainType.DPT_STATUS_48_BIT),
+ DPT_StatusSAB((long) 343L, (int) 800, PlcValueType.Struct, "status sunblind & shutter actuator", "DPST-241-800", KnxDatapointMainType.DPT_STATUS_32_BIT),
- DPT_Converter_Status((long) 344L, (int) 600, PlcValueType.Struct, "DALI converter status", "DPST-244-600", KnxDatapointMainType.DPT_CONVERTER_STATUS),
+ DPT_Colour_xyY((long) 344L, (int) 600, PlcValueType.Struct, "colour xyY", "DPST-242-600", KnxDatapointMainType.DPT_STATUS_48_BIT),
- DPT_Converter_Test_Result((long) 345L, (int) 600, PlcValueType.Struct, "DALI converter test result", "DPST-245-600", KnxDatapointMainType.DPT_CONVERTER_TEST_RESULT),
+ DPT_Converter_Status((long) 345L, (int) 600, PlcValueType.Struct, "DALI converter status", "DPST-244-600", KnxDatapointMainType.DPT_CONVERTER_STATUS),
- DPT_Battery_Info((long) 346L, (int) 600, PlcValueType.Struct, "Battery Information", "DPST-246-600", KnxDatapointMainType.DPT_BATTERY_INFORMATION),
+ DPT_Converter_Test_Result((long) 346L, (int) 600, PlcValueType.Struct, "DALI converter test result", "DPST-245-600", KnxDatapointMainType.DPT_CONVERTER_TEST_RESULT),
- DPT_Brightness_Colour_Temperature_Transition((long) 347L, (int) 600, PlcValueType.Struct, "brightness colour temperature transition", "DPST-249-600", KnxDatapointMainType.DPT_BRIGHTNESS_COLOUR_TEMPERATURE_TRANSITION),
+ DPT_Battery_Info((long) 347L, (int) 600, PlcValueType.Struct, "Battery Information", "DPST-246-600", KnxDatapointMainType.DPT_BATTERY_INFORMATION),
- DPT_Brightness_Colour_Temperature_Control((long) 348L, (int) 600, PlcValueType.Struct, "brightness colour temperature control", "DPST-250-600", KnxDatapointMainType.DPT_STATUS_24_BIT),
+ DPT_Brightness_Colour_Temperature_Transition((long) 348L, (int) 600, PlcValueType.Struct, "brightness colour temperature transition", "DPST-249-600", KnxDatapointMainType.DPT_BRIGHTNESS_COLOUR_TEMPERATURE_TRANSITION),
- DPT_Colour_RGBW((long) 349L, (int) 600, PlcValueType.Struct, "RGBW value 4x(0..100%)", "DPST-251-600", KnxDatapointMainType.DPT_COLOUR_RGBW),
+ DPT_Brightness_Colour_Temperature_Control((long) 349L, (int) 600, PlcValueType.Struct, "brightness colour temperature control", "DPST-250-600", KnxDatapointMainType.DPT_STATUS_24_BIT),
- DPT_Relative_Control_RGBW((long) 350L, (int) 600, PlcValueType.Struct, "RGBW relative control", "DPST-252-600", KnxDatapointMainType.DPT_RELATIVE_CONTROL_RGBW),
+ DPT_Colour_RGBW((long) 350L, (int) 600, PlcValueType.Struct, "RGBW value 4x(0..100%)", "DPST-251-600", KnxDatapointMainType.DPT_COLOUR_RGBW),
- DPT_Relative_Control_RGB((long) 351L, (int) 600, PlcValueType.Struct, "RGB relative control", "DPST-254-600", KnxDatapointMainType.DPT_RELATIVE_CONTROL_RGB),
+ DPT_Relative_Control_RGBW((long) 351L, (int) 600, PlcValueType.Struct, "RGBW relative control", "DPST-252-600", KnxDatapointMainType.DPT_RELATIVE_CONTROL_RGBW),
- DPT_GeographicalLocation((long) 352L, (int) 1, PlcValueType.Struct, "geographical location (longitude and latitude) expressed in degrees", "DPST-255-1", KnxDatapointMainType.DPT_F32F32),
+ DPT_Relative_Control_RGB((long) 352L, (int) 600, PlcValueType.Struct, "RGB relative control", "DPST-254-600", KnxDatapointMainType.DPT_RELATIVE_CONTROL_RGB),
- DPT_TempRoomSetpSetF16_4((long) 353L, (int) 100, PlcValueType.Struct, "Temperature setpoint setting for 4 HVAC Modes", "DPST-275-100", KnxDatapointMainType.DPT_F16F16F16F16),
+ DPT_GeographicalLocation((long) 353L, (int) 1, PlcValueType.Struct, "geographical location (longitude and latitude) expressed in degrees", "DPST-255-1", KnxDatapointMainType.DPT_F32F32),
- DPT_TempRoomSetpSetShiftF16_4((long) 354L, (int) 101, PlcValueType.Struct, "Temperature setpoint shift setting for 4 HVAC Modes", "DPST-275-101", KnxDatapointMainType.DPT_F16F16F16F16);
+ DPT_TempRoomSetpSetF16_4((long) 354L, (int) 100, PlcValueType.Struct, "Temperature setpoint setting for 4 HVAC Modes", "DPST-275-100", KnxDatapointMainType.DPT_F16F16F16F16),
+
+ DPT_TempRoomSetpSetShiftF16_4((long) 355L, (int) 101, PlcValueType.Struct, "Temperature setpoint shift setting for 4 HVAC Modes", "DPST-275-101", KnxDatapointMainType.DPT_F16F16F16F16);
private static final Map<Long, KnxDatapointType> map;
diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java
index 09d3594eed..1ec20a0989 100644
--- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java
+++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java
@@ -1683,9 +1683,11 @@ public enum KnxManufacturer {
M_KOLORS_INDIA_PRIVATE_LIMITED((int) 828, (int) 890, "KOLORS INDIA PRIVATE LIMITED"),
- M_ABB___RESERVED((int) 829, (int) 43954, "ABB - reserved"),
+ M_GERALD_DOCENKO((int) 829, (int) 891, "Gerald Docenko"),
- M_BUSCH_JAEGER_ELEKTRO___RESERVED((int) 830, (int) 43959, "Busch-Jaeger Elektro - reserved");
+ M_ABB___RESERVED((int) 830, (int) 43954, "ABB - reserved"),
+
+ M_BUSCH_JAEGER_ELEKTRO___RESERVED((int) 831, (int) 43959, "Busch-Jaeger Elektro - reserved");
private static final Map<Integer, KnxManufacturer> map;
diff --git a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxDatapoint.cs b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxDatapoint.cs
index 1c07b1d3d9..44f019a796 100644
--- a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxDatapoint.cs
+++ b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxDatapoint.cs
@@ -5847,6 +5847,28 @@ if( datapointType == KnxDatapointType.BOOL ) { // BOOL
var _map = new Dictionary<string, IPlcValue>();
+ return new PlcStruct(_map);
+ } if( datapointType == KnxDatapointType.DPT_Colour_HSV ) { // Struct
+
+ // Reserved Field (Compartmentalized so the "reserved" variable can't leak)
+ {
+ var reserved = readBuffer.ReadByte("", 8);
+ if(reserved != 0x00) {
+ Logger.Info("Expected constant value {expected} but got {got} for reserved field.", 0x00, reserved);
+ }
+ }
+
+ // Simple Field (h)
+ var h = readBuffer.ReadByte("", 8);
+
+ // Simple Field (s)
+ var s = readBuffer.ReadByte("", 8);
+
+ // Simple Field (v)
+ var v = readBuffer.ReadByte("", 8);
+
+ var _map = new Dictionary<string, IPlcValue>();
+
return new PlcStruct(_map);
} if( datapointType == KnxDatapointType.DPT_LanguageCodeAlpha2_ASCII ) { // STRING
@@ -10463,6 +10485,21 @@ if( datapointType == KnxDatapointType.BOOL ) { // BOOL
var b = (byte) _value.GetStruct()["b"].GetByte();
writeBuffer.WriteByte("", 8, (byte) (b));
return writeBuffer;
+ } if( datapointType == KnxDatapointType.DPT_Colour_HSV ) { // Struct
+ var writeBuffer = new WriteBuffer();
+
+ // Reserved Field
+ writeBuffer.WriteByte("", 8, (byte) 0x00);
+ // Simple Field (h)
+ var h = (byte) _value.GetStruct()["h"].GetByte();
+ writeBuffer.WriteByte("", 8, (byte) (h));
+ // Simple Field (s)
+ var s = (byte) _value.GetStruct()["s"].GetByte();
+ writeBuffer.WriteByte("", 8, (byte) (s));
+ // Simple Field (v)
+ var v = (byte) _value.GetStruct()["v"].GetByte();
+ writeBuffer.WriteByte("", 8, (byte) (v));
+ return writeBuffer;
} if( datapointType == KnxDatapointType.DPT_LanguageCodeAlpha2_ASCII ) { // STRING
var writeBuffer = new WriteBuffer();
diff --git a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxDatapointType.cs b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxDatapointType.cs
index 525a9521a8..5c388c5383 100644
--- a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxDatapointType.cs
+++ b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxDatapointType.cs
@@ -361,25 +361,26 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
DPT_MeteringValue = 333,
DPT_MBus_Address = 334,
DPT_Colour_RGB = 335,
- DPT_LanguageCodeAlpha2_ASCII = 336,
- DPT_Tariff_ActiveEnergy = 337,
- DPT_Prioritised_Mode_Control = 338,
- DPT_DALI_Control_Gear_Diagnostic = 339,
- DPT_DALI_Diagnostics = 340,
- DPT_CombinedPosition = 341,
- DPT_StatusSAB = 342,
- DPT_Colour_xyY = 343,
- DPT_Converter_Status = 344,
- DPT_Converter_Test_Result = 345,
- DPT_Battery_Info = 346,
- DPT_Brightness_Colour_Temperature_Transition = 347,
- DPT_Brightness_Colour_Temperature_Control = 348,
- DPT_Colour_RGBW = 349,
- DPT_Relative_Control_RGBW = 350,
- DPT_Relative_Control_RGB = 351,
- DPT_GeographicalLocation = 352,
- DPT_TempRoomSetpSetF16_4 = 353,
- DPT_TempRoomSetpSetShiftF16_4 = 354,
+ DPT_Colour_HSV = 336,
+ DPT_LanguageCodeAlpha2_ASCII = 337,
+ DPT_Tariff_ActiveEnergy = 338,
+ DPT_Prioritised_Mode_Control = 339,
+ DPT_DALI_Control_Gear_Diagnostic = 340,
+ DPT_DALI_Diagnostics = 341,
+ DPT_CombinedPosition = 342,
+ DPT_StatusSAB = 343,
+ DPT_Colour_xyY = 344,
+ DPT_Converter_Status = 345,
+ DPT_Converter_Test_Result = 346,
+ DPT_Battery_Info = 347,
+ DPT_Brightness_Colour_Temperature_Transition = 348,
+ DPT_Brightness_Colour_Temperature_Control = 349,
+ DPT_Colour_RGBW = 350,
+ DPT_Relative_Control_RGBW = 351,
+ DPT_Relative_Control_RGB = 352,
+ DPT_GeographicalLocation = 353,
+ DPT_TempRoomSetpSetF16_4 = 354,
+ DPT_TempRoomSetpSetShiftF16_4 = 355,
}
public static class KnxDatapointTypeInfo
@@ -1181,67 +1182,70 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxDatapointType.DPT_Colour_RGB: { /* '335' */
return 600;
}
- case KnxDatapointType.DPT_LanguageCodeAlpha2_ASCII: { /* '336' */
- return 1;
+ case KnxDatapointType.DPT_Colour_HSV: { /* '336' */
+ return 601;
}
- case KnxDatapointType.DPT_Tariff_ActiveEnergy: { /* '337' */
+ case KnxDatapointType.DPT_LanguageCodeAlpha2_ASCII: { /* '337' */
return 1;
}
- case KnxDatapointType.DPT_Prioritised_Mode_Control: { /* '338' */
+ case KnxDatapointType.DPT_Tariff_ActiveEnergy: { /* '338' */
return 1;
}
- case KnxDatapointType.DPT_DALI_Control_Gear_Diagnostic: { /* '339' */
- return 600;
+ case KnxDatapointType.DPT_Prioritised_Mode_Control: { /* '339' */
+ return 1;
}
case KnxDatapointType.DPT_UpDown: { /* '34' */
return 8;
}
- case KnxDatapointType.DPT_DALI_Diagnostics: { /* '340' */
+ case KnxDatapointType.DPT_DALI_Control_Gear_Diagnostic: { /* '340' */
return 600;
}
- case KnxDatapointType.DPT_CombinedPosition: { /* '341' */
- return 800;
+ case KnxDatapointType.DPT_DALI_Diagnostics: { /* '341' */
+ return 600;
}
- case KnxDatapointType.DPT_StatusSAB: { /* '342' */
+ case KnxDatapointType.DPT_CombinedPosition: { /* '342' */
return 800;
}
- case KnxDatapointType.DPT_Colour_xyY: { /* '343' */
- return 600;
+ case KnxDatapointType.DPT_StatusSAB: { /* '343' */
+ return 800;
}
- case KnxDatapointType.DPT_Converter_Status: { /* '344' */
+ case KnxDatapointType.DPT_Colour_xyY: { /* '344' */
return 600;
}
- case KnxDatapointType.DPT_Converter_Test_Result: { /* '345' */
+ case KnxDatapointType.DPT_Converter_Status: { /* '345' */
return 600;
}
- case KnxDatapointType.DPT_Battery_Info: { /* '346' */
+ case KnxDatapointType.DPT_Converter_Test_Result: { /* '346' */
return 600;
}
- case KnxDatapointType.DPT_Brightness_Colour_Temperature_Transition: { /* '347' */
+ case KnxDatapointType.DPT_Battery_Info: { /* '347' */
return 600;
}
- case KnxDatapointType.DPT_Brightness_Colour_Temperature_Control: { /* '348' */
+ case KnxDatapointType.DPT_Brightness_Colour_Temperature_Transition: { /* '348' */
return 600;
}
- case KnxDatapointType.DPT_Colour_RGBW: { /* '349' */
+ case KnxDatapointType.DPT_Brightness_Colour_Temperature_Control: { /* '349' */
return 600;
}
case KnxDatapointType.DPT_OpenClose: { /* '35' */
return 9;
}
- case KnxDatapointType.DPT_Relative_Control_RGBW: { /* '350' */
+ case KnxDatapointType.DPT_Colour_RGBW: { /* '350' */
return 600;
}
- case KnxDatapointType.DPT_Relative_Control_RGB: { /* '351' */
+ case KnxDatapointType.DPT_Relative_Control_RGBW: { /* '351' */
return 600;
}
- case KnxDatapointType.DPT_GeographicalLocation: { /* '352' */
+ case KnxDatapointType.DPT_Relative_Control_RGB: { /* '352' */
+ return 600;
+ }
+ case KnxDatapointType.DPT_GeographicalLocation: { /* '353' */
return 1;
}
- case KnxDatapointType.DPT_TempRoomSetpSetF16_4: { /* '353' */
+ case KnxDatapointType.DPT_TempRoomSetpSetF16_4: { /* '354' */
return 100;
}
- case KnxDatapointType.DPT_TempRoomSetpSetShiftF16_4: { /* '354' */
+ case KnxDatapointType.DPT_TempRoomSetpSetShiftF16_4: { /* '355' */
return 101;
}
case KnxDatapointType.DPT_Start: { /* '36' */
@@ -2256,67 +2260,70 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxDatapointType.DPT_Colour_RGB: { /* '335' */
return types.PlcValueType.Struct;
}
- case KnxDatapointType.DPT_LanguageCodeAlpha2_ASCII: { /* '336' */
- return types.PlcValueType.STRING;
- }
- case KnxDatapointType.DPT_Tariff_ActiveEnergy: { /* '337' */
+ case KnxDatapointType.DPT_Colour_HSV: { /* '336' */
return types.PlcValueType.Struct;
}
- case KnxDatapointType.DPT_Prioritised_Mode_Control: { /* '338' */
+ case KnxDatapointType.DPT_LanguageCodeAlpha2_ASCII: { /* '337' */
+ return types.PlcValueType.STRING;
+ }
+ case KnxDatapointType.DPT_Tariff_ActiveEnergy: { /* '338' */
return types.PlcValueType.Struct;
}
- case KnxDatapointType.DPT_DALI_Control_Gear_Diagnostic: { /* '339' */
+ case KnxDatapointType.DPT_Prioritised_Mode_Control: { /* '339' */
return types.PlcValueType.Struct;
}
case KnxDatapointType.DPT_UpDown: { /* '34' */
return types.PlcValueType.BOOL;
}
- case KnxDatapointType.DPT_DALI_Diagnostics: { /* '340' */
+ case KnxDatapointType.DPT_DALI_Control_Gear_Diagnostic: { /* '340' */
return types.PlcValueType.Struct;
}
- case KnxDatapointType.DPT_CombinedPosition: { /* '341' */
+ case KnxDatapointType.DPT_DALI_Diagnostics: { /* '341' */
return types.PlcValueType.Struct;
}
- case KnxDatapointType.DPT_StatusSAB: { /* '342' */
+ case KnxDatapointType.DPT_CombinedPosition: { /* '342' */
return types.PlcValueType.Struct;
}
- case KnxDatapointType.DPT_Colour_xyY: { /* '343' */
+ case KnxDatapointType.DPT_StatusSAB: { /* '343' */
return types.PlcValueType.Struct;
}
- case KnxDatapointType.DPT_Converter_Status: { /* '344' */
+ case KnxDatapointType.DPT_Colour_xyY: { /* '344' */
return types.PlcValueType.Struct;
}
- case KnxDatapointType.DPT_Converter_Test_Result: { /* '345' */
+ case KnxDatapointType.DPT_Converter_Status: { /* '345' */
return types.PlcValueType.Struct;
}
- case KnxDatapointType.DPT_Battery_Info: { /* '346' */
+ case KnxDatapointType.DPT_Converter_Test_Result: { /* '346' */
return types.PlcValueType.Struct;
}
- case KnxDatapointType.DPT_Brightness_Colour_Temperature_Transition: { /* '347' */
+ case KnxDatapointType.DPT_Battery_Info: { /* '347' */
return types.PlcValueType.Struct;
}
- case KnxDatapointType.DPT_Brightness_Colour_Temperature_Control: { /* '348' */
+ case KnxDatapointType.DPT_Brightness_Colour_Temperature_Transition: { /* '348' */
return types.PlcValueType.Struct;
}
- case KnxDatapointType.DPT_Colour_RGBW: { /* '349' */
+ case KnxDatapointType.DPT_Brightness_Colour_Temperature_Control: { /* '349' */
return types.PlcValueType.Struct;
}
case KnxDatapointType.DPT_OpenClose: { /* '35' */
return types.PlcValueType.BOOL;
}
- case KnxDatapointType.DPT_Relative_Control_RGBW: { /* '350' */
+ case KnxDatapointType.DPT_Colour_RGBW: { /* '350' */
return types.PlcValueType.Struct;
}
- case KnxDatapointType.DPT_Relative_Control_RGB: { /* '351' */
+ case KnxDatapointType.DPT_Relative_Control_RGBW: { /* '351' */
return types.PlcValueType.Struct;
}
- case KnxDatapointType.DPT_GeographicalLocation: { /* '352' */
+ case KnxDatapointType.DPT_Relative_Control_RGB: { /* '352' */
return types.PlcValueType.Struct;
}
- case KnxDatapointType.DPT_TempRoomSetpSetF16_4: { /* '353' */
+ case KnxDatapointType.DPT_GeographicalLocation: { /* '353' */
return types.PlcValueType.Struct;
}
- case KnxDatapointType.DPT_TempRoomSetpSetShiftF16_4: { /* '354' */
+ case KnxDatapointType.DPT_TempRoomSetpSetF16_4: { /* '354' */
+ return types.PlcValueType.Struct;
+ }
+ case KnxDatapointType.DPT_TempRoomSetpSetShiftF16_4: { /* '355' */
return types.PlcValueType.Struct;
}
case KnxDatapointType.DPT_Start: { /* '36' */
@@ -3331,67 +3338,70 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxDatapointType.DPT_Colour_RGB: { /* '335' */
return "RGB value 3x(0..255)";
}
- case KnxDatapointType.DPT_LanguageCodeAlpha2_ASCII: { /* '336' */
+ case KnxDatapointType.DPT_Colour_HSV: { /* '336' */
+ return "Colour HSV";
+ }
+ case KnxDatapointType.DPT_LanguageCodeAlpha2_ASCII: { /* '337' */
return "language code (ASCII)";
}
- case KnxDatapointType.DPT_Tariff_ActiveEnergy: { /* '337' */
+ case KnxDatapointType.DPT_Tariff_ActiveEnergy: { /* '338' */
return "electrical energy with tariff";
}
- case KnxDatapointType.DPT_Prioritised_Mode_Control: { /* '338' */
+ case KnxDatapointType.DPT_Prioritised_Mode_Control: { /* '339' */
return "priority control";
}
- case KnxDatapointType.DPT_DALI_Control_Gear_Diagnostic: { /* '339' */
- return "diagnostic value";
- }
case KnxDatapointType.DPT_UpDown: { /* '34' */
return "up/down";
}
- case KnxDatapointType.DPT_DALI_Diagnostics: { /* '340' */
+ case KnxDatapointType.DPT_DALI_Control_Gear_Diagnostic: { /* '340' */
return "diagnostic value";
}
- case KnxDatapointType.DPT_CombinedPosition: { /* '341' */
+ case KnxDatapointType.DPT_DALI_Diagnostics: { /* '341' */
+ return "diagnostic value";
+ }
+ case KnxDatapointType.DPT_CombinedPosition: { /* '342' */
return "combined position";
}
- case KnxDatapointType.DPT_StatusSAB: { /* '342' */
+ case KnxDatapointType.DPT_StatusSAB: { /* '343' */
return "status sunblind & shutter actuator";
}
- case KnxDatapointType.DPT_Colour_xyY: { /* '343' */
+ case KnxDatapointType.DPT_Colour_xyY: { /* '344' */
return "colour xyY";
}
- case KnxDatapointType.DPT_Converter_Status: { /* '344' */
+ case KnxDatapointType.DPT_Converter_Status: { /* '345' */
return "DALI converter status";
}
- case KnxDatapointType.DPT_Converter_Test_Result: { /* '345' */
+ case KnxDatapointType.DPT_Converter_Test_Result: { /* '346' */
return "DALI converter test result";
}
- case KnxDatapointType.DPT_Battery_Info: { /* '346' */
+ case KnxDatapointType.DPT_Battery_Info: { /* '347' */
return "Battery Information";
}
- case KnxDatapointType.DPT_Brightness_Colour_Temperature_Transition: { /* '347' */
+ case KnxDatapointType.DPT_Brightness_Colour_Temperature_Transition: { /* '348' */
return "brightness colour temperature transition";
}
- case KnxDatapointType.DPT_Brightness_Colour_Temperature_Control: { /* '348' */
+ case KnxDatapointType.DPT_Brightness_Colour_Temperature_Control: { /* '349' */
return "brightness colour temperature control";
}
- case KnxDatapointType.DPT_Colour_RGBW: { /* '349' */
- return "RGBW value 4x(0..100%)";
- }
case KnxDatapointType.DPT_OpenClose: { /* '35' */
return "open/close";
}
- case KnxDatapointType.DPT_Relative_Control_RGBW: { /* '350' */
+ case KnxDatapointType.DPT_Colour_RGBW: { /* '350' */
+ return "RGBW value 4x(0..100%)";
+ }
+ case KnxDatapointType.DPT_Relative_Control_RGBW: { /* '351' */
return "RGBW relative control";
}
- case KnxDatapointType.DPT_Relative_Control_RGB: { /* '351' */
+ case KnxDatapointType.DPT_Relative_Control_RGB: { /* '352' */
return "RGB relative control";
}
- case KnxDatapointType.DPT_GeographicalLocation: { /* '352' */
+ case KnxDatapointType.DPT_GeographicalLocation: { /* '353' */
return "geographical location (longitude and latitude) expressed in degrees";
}
- case KnxDatapointType.DPT_TempRoomSetpSetF16_4: { /* '353' */
+ case KnxDatapointType.DPT_TempRoomSetpSetF16_4: { /* '354' */
return "Temperature setpoint setting for 4 HVAC Modes";
}
- case KnxDatapointType.DPT_TempRoomSetpSetShiftF16_4: { /* '354' */
+ case KnxDatapointType.DPT_TempRoomSetpSetShiftF16_4: { /* '355' */
return "Temperature setpoint shift setting for 4 HVAC Modes";
}
case KnxDatapointType.DPT_Start: { /* '36' */
@@ -4406,67 +4416,70 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxDatapointType.DPT_Colour_RGB: { /* '335' */
return "DPST-232-600";
}
- case KnxDatapointType.DPT_LanguageCodeAlpha2_ASCII: { /* '336' */
+ case KnxDatapointType.DPT_Colour_HSV: { /* '336' */
+ return "DPST-232-601";
+ }
+ case KnxDatapointType.DPT_LanguageCodeAlpha2_ASCII: { /* '337' */
return "DPST-234-1";
}
- case KnxDatapointType.DPT_Tariff_ActiveEnergy: { /* '337' */
+ case KnxDatapointType.DPT_Tariff_ActiveEnergy: { /* '338' */
return "DPST-235-1";
}
- case KnxDatapointType.DPT_Prioritised_Mode_Control: { /* '338' */
+ case KnxDatapointType.DPT_Prioritised_Mode_Control: { /* '339' */
return "DPST-236-1";
}
- case KnxDatapointType.DPT_DALI_Control_Gear_Diagnostic: { /* '339' */
- return "DPST-237-600";
- }
case KnxDatapointType.DPT_UpDown: { /* '34' */
return "DPST-1-8";
}
- case KnxDatapointType.DPT_DALI_Diagnostics: { /* '340' */
+ case KnxDatapointType.DPT_DALI_Control_Gear_Diagnostic: { /* '340' */
+ return "DPST-237-600";
+ }
+ case KnxDatapointType.DPT_DALI_Diagnostics: { /* '341' */
return "DPST-238-600";
}
- case KnxDatapointType.DPT_CombinedPosition: { /* '341' */
+ case KnxDatapointType.DPT_CombinedPosition: { /* '342' */
return "DPST-240-800";
}
- case KnxDatapointType.DPT_StatusSAB: { /* '342' */
+ case KnxDatapointType.DPT_StatusSAB: { /* '343' */
return "DPST-241-800";
}
- case KnxDatapointType.DPT_Colour_xyY: { /* '343' */
+ case KnxDatapointType.DPT_Colour_xyY: { /* '344' */
return "DPST-242-600";
}
- case KnxDatapointType.DPT_Converter_Status: { /* '344' */
+ case KnxDatapointType.DPT_Converter_Status: { /* '345' */
return "DPST-244-600";
}
- case KnxDatapointType.DPT_Converter_Test_Result: { /* '345' */
+ case KnxDatapointType.DPT_Converter_Test_Result: { /* '346' */
return "DPST-245-600";
}
- case KnxDatapointType.DPT_Battery_Info: { /* '346' */
+ case KnxDatapointType.DPT_Battery_Info: { /* '347' */
return "DPST-246-600";
}
- case KnxDatapointType.DPT_Brightness_Colour_Temperature_Transition: { /* '347' */
+ case KnxDatapointType.DPT_Brightness_Colour_Temperature_Transition: { /* '348' */
return "DPST-249-600";
}
- case KnxDatapointType.DPT_Brightness_Colour_Temperature_Control: { /* '348' */
+ case KnxDatapointType.DPT_Brightness_Colour_Temperature_Control: { /* '349' */
return "DPST-250-600";
}
- case KnxDatapointType.DPT_Colour_RGBW: { /* '349' */
- return "DPST-251-600";
- }
case KnxDatapointType.DPT_OpenClose: { /* '35' */
return "DPST-1-9";
}
- case KnxDatapointType.DPT_Relative_Control_RGBW: { /* '350' */
+ case KnxDatapointType.DPT_Colour_RGBW: { /* '350' */
+ return "DPST-251-600";
+ }
+ case KnxDatapointType.DPT_Relative_Control_RGBW: { /* '351' */
return "DPST-252-600";
}
- case KnxDatapointType.DPT_Relative_Control_RGB: { /* '351' */
+ case KnxDatapointType.DPT_Relative_Control_RGB: { /* '352' */
return "DPST-254-600";
}
- case KnxDatapointType.DPT_GeographicalLocation: { /* '352' */
+ case KnxDatapointType.DPT_GeographicalLocation: { /* '353' */
return "DPST-255-1";
}
- case KnxDatapointType.DPT_TempRoomSetpSetF16_4: { /* '353' */
+ case KnxDatapointType.DPT_TempRoomSetpSetF16_4: { /* '354' */
return "DPST-275-100";
}
- case KnxDatapointType.DPT_TempRoomSetpSetShiftF16_4: { /* '354' */
+ case KnxDatapointType.DPT_TempRoomSetpSetShiftF16_4: { /* '355' */
return "DPST-275-101";
}
case KnxDatapointType.DPT_Start: { /* '36' */
@@ -5481,67 +5494,70 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxDatapointType.DPT_Colour_RGB: { /* '335' */
return model.KnxDatapointMainType.DPT_3_BYTE_COLOUR_RGB;
}
- case KnxDatapointType.DPT_LanguageCodeAlpha2_ASCII: { /* '336' */
+ case KnxDatapointType.DPT_Colour_HSV: { /* '336' */
+ return model.KnxDatapointMainType.DPT_3_BYTE_COLOUR_RGB;
+ }
+ case KnxDatapointType.DPT_LanguageCodeAlpha2_ASCII: { /* '337' */
return model.KnxDatapointMainType.DPT_LANGUAGE_CODE_ISO_639_1;
}
- case KnxDatapointType.DPT_Tariff_ActiveEnergy: { /* '337' */
+ case KnxDatapointType.DPT_Tariff_ActiveEnergy: { /* '338' */
return model.KnxDatapointMainType.DPT_SIGNED_VALUE_WITH_CLASSIFICATION_AND_VALIDITY;
}
- case KnxDatapointType.DPT_Prioritised_Mode_Control: { /* '338' */
+ case KnxDatapointType.DPT_Prioritised_Mode_Control: { /* '339' */
return model.KnxDatapointMainType.DPT_PRIORITISED_MODE_CONTROL;
}
- case KnxDatapointType.DPT_DALI_Control_Gear_Diagnostic: { /* '339' */
- return model.KnxDatapointMainType.DPT_CONFIGURATION_DIAGNOSTICS_16_BIT;
- }
case KnxDatapointType.DPT_UpDown: { /* '34' */
return model.KnxDatapointMainType.DPT_1_BIT;
}
- case KnxDatapointType.DPT_DALI_Diagnostics: { /* '340' */
+ case KnxDatapointType.DPT_DALI_Control_Gear_Diagnostic: { /* '340' */
+ return model.KnxDatapointMainType.DPT_CONFIGURATION_DIAGNOSTICS_16_BIT;
+ }
+ case KnxDatapointType.DPT_DALI_Diagnostics: { /* '341' */
return model.KnxDatapointMainType.DPT_CONFIGURATION_DIAGNOSTICS_8_BIT;
}
- case KnxDatapointType.DPT_CombinedPosition: { /* '341' */
+ case KnxDatapointType.DPT_CombinedPosition: { /* '342' */
return model.KnxDatapointMainType.DPT_POSITIONS;
}
- case KnxDatapointType.DPT_StatusSAB: { /* '342' */
+ case KnxDatapointType.DPT_StatusSAB: { /* '343' */
return model.KnxDatapointMainType.DPT_STATUS_32_BIT;
}
- case KnxDatapointType.DPT_Colour_xyY: { /* '343' */
+ case KnxDatapointType.DPT_Colour_xyY: { /* '344' */
return model.KnxDatapointMainType.DPT_STATUS_48_BIT;
}
- case KnxDatapointType.DPT_Converter_Status: { /* '344' */
+ case KnxDatapointType.DPT_Converter_Status: { /* '345' */
return model.KnxDatapointMainType.DPT_CONVERTER_STATUS;
}
- case KnxDatapointType.DPT_Converter_Test_Result: { /* '345' */
+ case KnxDatapointType.DPT_Converter_Test_Result: { /* '346' */
return model.KnxDatapointMainType.DPT_CONVERTER_TEST_RESULT;
}
- case KnxDatapointType.DPT_Battery_Info: { /* '346' */
+ case KnxDatapointType.DPT_Battery_Info: { /* '347' */
return model.KnxDatapointMainType.DPT_BATTERY_INFORMATION;
}
- case KnxDatapointType.DPT_Brightness_Colour_Temperature_Transition: { /* '347' */
+ case KnxDatapointType.DPT_Brightness_Colour_Temperature_Transition: { /* '348' */
return model.KnxDatapointMainType.DPT_BRIGHTNESS_COLOUR_TEMPERATURE_TRANSITION;
}
- case KnxDatapointType.DPT_Brightness_Colour_Temperature_Control: { /* '348' */
+ case KnxDatapointType.DPT_Brightness_Colour_Temperature_Control: { /* '349' */
return model.KnxDatapointMainType.DPT_STATUS_24_BIT;
}
- case KnxDatapointType.DPT_Colour_RGBW: { /* '349' */
- return model.KnxDatapointMainType.DPT_COLOUR_RGBW;
- }
case KnxDatapointType.DPT_OpenClose: { /* '35' */
return model.KnxDatapointMainType.DPT_1_BIT;
}
- case KnxDatapointType.DPT_Relative_Control_RGBW: { /* '350' */
+ case KnxDatapointType.DPT_Colour_RGBW: { /* '350' */
+ return model.KnxDatapointMainType.DPT_COLOUR_RGBW;
+ }
+ case KnxDatapointType.DPT_Relative_Control_RGBW: { /* '351' */
return model.KnxDatapointMainType.DPT_RELATIVE_CONTROL_RGBW;
}
- case KnxDatapointType.DPT_Relative_Control_RGB: { /* '351' */
+ case KnxDatapointType.DPT_Relative_Control_RGB: { /* '352' */
return model.KnxDatapointMainType.DPT_RELATIVE_CONTROL_RGB;
}
- case KnxDatapointType.DPT_GeographicalLocation: { /* '352' */
+ case KnxDatapointType.DPT_GeographicalLocation: { /* '353' */
return model.KnxDatapointMainType.DPT_F32F32;
}
- case KnxDatapointType.DPT_TempRoomSetpSetF16_4: { /* '353' */
+ case KnxDatapointType.DPT_TempRoomSetpSetF16_4: { /* '354' */
return model.KnxDatapointMainType.DPT_F16F16F16F16;
}
- case KnxDatapointType.DPT_TempRoomSetpSetShiftF16_4: { /* '354' */
+ case KnxDatapointType.DPT_TempRoomSetpSetShiftF16_4: { /* '355' */
return model.KnxDatapointMainType.DPT_F16F16F16F16;
}
case KnxDatapointType.DPT_Start: { /* '36' */
diff --git a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
index 2a5a85f7de..c34ba35cfe 100644
--- a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
+++ b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
@@ -854,8 +854,9 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
M_GUANGZHOU_YINGLIGHT_TECHNOLOGY_CO__LTD_ = 826,
M_RUEDIGER_WOLF_AB = 827,
M_KOLORS_INDIA_PRIVATE_LIMITED = 828,
- M_ABB___RESERVED = 829,
- M_BUSCH_JAEGER_ELEKTRO___RESERVED = 830,
+ M_GERALD_DOCENKO = 829,
+ M_ABB___RESERVED = 830,
+ M_BUSCH_JAEGER_ELEKTRO___RESERVED = 831,
}
public static class KnxManufacturerInfo
@@ -3298,13 +3299,16 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_KOLORS_INDIA_PRIVATE_LIMITED: { /* '828' */
return 890;
}
- case KnxManufacturer.M_ABB___RESERVED: { /* '829' */
- return 43954;
+ case KnxManufacturer.M_GERALD_DOCENKO: { /* '829' */
+ return 891;
}
case KnxManufacturer.M_DURABLE_TECHNOLOGIES: { /* '83' */
return 122;
}
- case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '830' */
+ case KnxManufacturer.M_ABB___RESERVED: { /* '830' */
+ return 43954;
+ }
+ case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '831' */
return 43959;
}
case KnxManufacturer.M_INNOTEAM: { /* '84' */
@@ -5801,13 +5805,16 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_KOLORS_INDIA_PRIVATE_LIMITED: { /* '828' */
return "KOLORS INDIA PRIVATE LIMITED";
}
- case KnxManufacturer.M_ABB___RESERVED: { /* '829' */
- return "ABB - reserved";
+ case KnxManufacturer.M_GERALD_DOCENKO: { /* '829' */
+ return "Gerald Docenko";
}
case KnxManufacturer.M_DURABLE_TECHNOLOGIES: { /* '83' */
return "Durable Technologies";
}
- case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '830' */
+ case KnxManufacturer.M_ABB___RESERVED: { /* '830' */
+ return "ABB - reserved";
+ }
+ case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '831' */
return "Busch-Jaeger Elektro - reserved";
}
case KnxManufacturer.M_INNOTEAM: { /* '84' */
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 ea5e535938..4951ff54d6 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
@@ -426,25 +426,26 @@
['333' DPT_MeteringValue ['DPST-229-1', '1', 'DPT_4_1_1_BYTE_COMBINED_INFORMATION', '"metering value (value,encoding,cmd)"', 'Struct']]
['334' DPT_MBus_Address ['DPST-230-1000', '1000', 'DPT_MBUS_ADDRESS', '"MBus address"', 'Struct']]
['335' DPT_Colour_RGB ['DPST-232-600', '600', 'DPT_3_BYTE_COLOUR_RGB', '"RGB value 3x(0..255)"', 'Struct']]
- ['336' DPT_LanguageCodeAlpha2_ASCII ['DPST-234-1', '1', 'DPT_LANGUAGE_CODE_ISO_639_1', '"language code (ASCII)"', 'STRING']]
- ['337' DPT_Tariff_ActiveEnergy ['DPST-235-1', '1', 'DPT_SIGNED_VALUE_WITH_CLASSIFICATION_AND_VALIDITY', '"electrical energy with tariff"', 'Struct']]
- ['338' DPT_Prioritised_Mode_Control ['DPST-236-1', '1', 'DPT_PRIORITISED_MODE_CONTROL', '"priority control"', 'Struct']]
- ['339' DPT_DALI_Control_Gear_Diagnostic ['DPST-237-600', '600', 'DPT_CONFIGURATION_DIAGNOSTICS_16_BIT', '"diagnostic value"', 'Struct']]
- ['340' DPT_DALI_Diagnostics ['DPST-238-600', '600', 'DPT_CONFIGURATION_DIAGNOSTICS_8_BIT', '"diagnostic value"', 'Struct']]
- ['341' DPT_CombinedPosition ['DPST-240-800', '800', 'DPT_POSITIONS', '"combined position"', 'Struct']]
- ['342' DPT_StatusSAB ['DPST-241-800', '800', 'DPT_STATUS_32_BIT', '"status sunblind & shutter actuator"', 'Struct']]
- ['343' DPT_Colour_xyY ['DPST-242-600', '600', 'DPT_STATUS_48_BIT', '"colour xyY"', 'Struct']]
- ['344' DPT_Converter_Status ['DPST-244-600', '600', 'DPT_CONVERTER_STATUS', '"DALI converter status"', 'Struct']]
- ['345' DPT_Converter_Test_Result ['DPST-245-600', '600', 'DPT_CONVERTER_TEST_RESULT', '"DALI converter test result"', 'Struct']]
- ['346' DPT_Battery_Info ['DPST-246-600', '600', 'DPT_BATTERY_INFORMATION', '"Battery Information"', 'Struct']]
- ['347' DPT_Brightness_Colour_Temperature_Transition ['DPST-249-600', '600', 'DPT_BRIGHTNESS_COLOUR_TEMPERATURE_TRANSITION', '"brightness colour temperature transition"', 'Struct']]
- ['348' DPT_Brightness_Colour_Temperature_Control ['DPST-250-600', '600', 'DPT_STATUS_24_BIT', '"brightness colour temperature control"', 'Struct']]
- ['349' DPT_Colour_RGBW ['DPST-251-600', '600', 'DPT_COLOUR_RGBW', '"RGBW value 4x(0..100%)"', 'Struct']]
- ['350' DPT_Relative_Control_RGBW ['DPST-252-600', '600', 'DPT_RELATIVE_CONTROL_RGBW', '"RGBW relative control"', 'Struct']]
- ['351' DPT_Relative_Control_RGB ['DPST-254-600', '600', 'DPT_RELATIVE_CONTROL_RGB', '"RGB relative control"', 'Struct']]
- ['352' DPT_GeographicalLocation ['DPST-255-1', '1', 'DPT_F32F32', '"geographical location (longitude and latitude) expressed in degrees"', 'Struct']]
- ['353' DPT_TempRoomSetpSetF16_4 ['DPST-275-100', '100', 'DPT_F16F16F16F16', '"Temperature setpoint setting for 4 HVAC Modes"', 'Struct']]
- ['354' DPT_TempRoomSetpSetShiftF16_4 ['DPST-275-101', '101', 'DPT_F16F16F16F16', '"Temperature setpoint shift setting for 4 HVAC Modes"', 'Struct']]
+ ['336' DPT_Colour_HSV ['DPST-232-601', '601', 'DPT_3_BYTE_COLOUR_RGB', '"Colour HSV"', 'Struct']]
+ ['337' DPT_LanguageCodeAlpha2_ASCII ['DPST-234-1', '1', 'DPT_LANGUAGE_CODE_ISO_639_1', '"language code (ASCII)"', 'STRING']]
+ ['338' DPT_Tariff_ActiveEnergy ['DPST-235-1', '1', 'DPT_SIGNED_VALUE_WITH_CLASSIFICATION_AND_VALIDITY', '"electrical energy with tariff"', 'Struct']]
+ ['339' DPT_Prioritised_Mode_Control ['DPST-236-1', '1', 'DPT_PRIORITISED_MODE_CONTROL', '"priority control"', 'Struct']]
+ ['340' DPT_DALI_Control_Gear_Diagnostic ['DPST-237-600', '600', 'DPT_CONFIGURATION_DIAGNOSTICS_16_BIT', '"diagnostic value"', 'Struct']]
+ ['341' DPT_DALI_Diagnostics ['DPST-238-600', '600', 'DPT_CONFIGURATION_DIAGNOSTICS_8_BIT', '"diagnostic value"', 'Struct']]
+ ['342' DPT_CombinedPosition ['DPST-240-800', '800', 'DPT_POSITIONS', '"combined position"', 'Struct']]
+ ['343' DPT_StatusSAB ['DPST-241-800', '800', 'DPT_STATUS_32_BIT', '"status sunblind & shutter actuator"', 'Struct']]
+ ['344' DPT_Colour_xyY ['DPST-242-600', '600', 'DPT_STATUS_48_BIT', '"colour xyY"', 'Struct']]
+ ['345' DPT_Converter_Status ['DPST-244-600', '600', 'DPT_CONVERTER_STATUS', '"DALI converter status"', 'Struct']]
+ ['346' DPT_Converter_Test_Result ['DPST-245-600', '600', 'DPT_CONVERTER_TEST_RESULT', '"DALI converter test result"', 'Struct']]
+ ['347' DPT_Battery_Info ['DPST-246-600', '600', 'DPT_BATTERY_INFORMATION', '"Battery Information"', 'Struct']]
+ ['348' DPT_Brightness_Colour_Temperature_Transition ['DPST-249-600', '600', 'DPT_BRIGHTNESS_COLOUR_TEMPERATURE_TRANSITION', '"brightness colour temperature transition"', 'Struct']]
+ ['349' DPT_Brightness_Colour_Temperature_Control ['DPST-250-600', '600', 'DPT_STATUS_24_BIT', '"brightness colour temperature control"', 'Struct']]
+ ['350' DPT_Colour_RGBW ['DPST-251-600', '600', 'DPT_COLOUR_RGBW', '"RGBW value 4x(0..100%)"', 'Struct']]
+ ['351' DPT_Relative_Control_RGBW ['DPST-252-600', '600', 'DPT_RELATIVE_CONTROL_RGBW', '"RGBW relative control"', 'Struct']]
+ ['352' DPT_Relative_Control_RGB ['DPST-254-600', '600', 'DPT_RELATIVE_CONTROL_RGB', '"RGB relative control"', 'Struct']]
+ ['353' DPT_GeographicalLocation ['DPST-255-1', '1', 'DPT_F32F32', '"geographical location (longitude and latitude) expressed in degrees"', 'Struct']]
+ ['354' DPT_TempRoomSetpSetF16_4 ['DPST-275-100', '100', 'DPT_F16F16F16F16', '"Temperature setpoint setting for 4 HVAC Modes"', 'Struct']]
+ ['355' DPT_TempRoomSetpSetShiftF16_4 ['DPST-275-101', '101', 'DPT_F16F16F16F16', '"Temperature setpoint shift setting for 4 HVAC Modes"', 'Struct']]
]
@@ -1581,8 +1582,9 @@
['826' M_GUANGZHOU_YINGLIGHT_TECHNOLOGY_CO__LTD_ ['888', '"Guangzhou YingLight technology Co.,Ltd."']]
['827' M_RUEDIGER_WOLF_AB ['889', '"RĂ¼diger Wolf AB"']]
['828' M_KOLORS_INDIA_PRIVATE_LIMITED ['890', '"KOLORS INDIA PRIVATE LIMITED"']]
- ['829' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
- ['830' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']]
+ ['829' M_GERALD_DOCENKO ['891', '"Gerald Docenko"']]
+ ['830' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
+ ['831' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro - reserved"']]
]
@@ -4516,6 +4518,19 @@
]
+ ['DPT_Colour_HSV' Struct
+ // Field Size 24
+ [reserved uint 8 '0x00']
+
+
+ [simple uint 8 h]
+
+ [simple uint 8 s]
+
+ [simple uint 8 v]
+
+ ]
+
['DPT_LanguageCodeAlpha2_ASCII' STRING
[reserved uint 8 '0x00']
[simple string 16 value encoding='"ASCII"']
(plc4x) 02/02: doc: Corrected a stale comment.
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chrisdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 51fcab7c56ab6703dca29aa1cf7ed22ef900abca
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Sep 3 17:07:50 2026 +0200
doc: Corrected a stale comment.
---
pom.xml | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0bdc6a9d4f..e92a311ff7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,6 +159,7 @@
<jakarta-annotation.version>3.0.0</jakarta-annotation.version>
<java-websocket.version>1.6.0</java-websocket.version>
<javapoet.version>0.17.0</javapoet.version>
+ <jaxb.version>4.0.5</jaxb.version>
<jna.version>5.19.1</jna.version>
<joda-time.version>2.14.3</joda-time.version>
<jserialcom.version>2.11.4</jserialcom.version>
@@ -493,12 +494,8 @@
<version>20260814</version>
</dependency>
- <!-- NOTE: xmlunit-core is what drags "jakarta.xml.bind:jakarta.xml.bind-api" into the
- build - test scope only, and only in the modules using plc4j-utils-test-utils.
- It is deliberately left unmanaged: the last time a jaxb version was pinned in this
- pom it broke the Milo stack (see commit 54c90dba81, which moved that pin out again).
- If you ever do need to manage it, do it in the transitive-dependencies section
- below and re-run the opcua tests. -->
+ <!-- NOTE: xmlunit-core is what pulls "jakarta.xml.bind:jakarta.xml.bind-api" into the
+ build (test scope only). It is managed in the transitive section below. -->
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
@@ -660,6 +657,21 @@
<version>${bouncycastle.version}</version>
</dependency>
+ <!-- Pulled in by xmlunit-core (test scope), which declares it in a JDK9+ profile for its
+ optional JaxbBuilder. No PLC4X code imports javax.xml.bind / jakarta.xml.bind, so the
+ jar is never actually loaded - it is managed purely to keep the old 2.3.3 line, and
+ its CVE surface, out of the build.
+ History: a jaxb pin in this pom once broke the embedded Milo stack and was moved out
+ again (commit 54c90dba81). That failure mode is gone - neither Milo nor jaxb-runtime
+ is part of this build any more. Verified 2026-09-03 that moving to the 4.x line (a
+ javax -> jakarta package rename, so the riskiest possible bump) keeps the opcua
+ driver suite green, including its Milo container integration tests. -->
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
+