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 2022/08/24 16:12:18 UTC
[plc4x] 09/12: chore(protocols/knx): Updated the XSLT to rename the second "Phoenix Contact" manufacturer entry.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/ads-symbol-discovery
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 71607402b3f3d3e2c05426fbd47bb9c57ff29c46
Author: Christofer Dutz <ch...@rivian.com>
AuthorDate: Wed Aug 24 18:09:08 2022 +0200
chore(protocols/knx): Updated the XSLT to rename the second "Phoenix Contact" manufacturer entry.
---
.../plc4x/include/plc4x_value_type.h | 11 ++++--
.../generated-sources/plc4x/src/plc4x_value_type.c | 42 ++++++++++++++++++----
.../knxnetip/readwrite/model/KnxManufacturer.go | 26 +++++++++++---
3 files changed, 65 insertions(+), 14 deletions(-)
diff --git a/plc4c/generated-sources/plc4x/include/plc4x_value_type.h b/plc4c/generated-sources/plc4x/include/plc4x_value_type.h
index 9ec657d0d..e5536525a 100644
--- a/plc4c/generated-sources/plc4x/include/plc4x_value_type.h
+++ b/plc4c/generated-sources/plc4x/include/plc4x_value_type.h
@@ -50,11 +50,16 @@ enum plc4c_plc4x_read_write_plc4x_value_type {
plc4c_plc4x_read_write_plc4x_value_type_STRING = 0x43,
plc4c_plc4x_read_write_plc4x_value_type_WSTRING = 0x44,
plc4c_plc4x_read_write_plc4x_value_type_TIME = 0x51,
- plc4c_plc4x_read_write_plc4x_value_type_TIME_OF_DAY = 0x52,
+ plc4c_plc4x_read_write_plc4x_value_type_LTIME = 0x52,
plc4c_plc4x_read_write_plc4x_value_type_DATE = 0x53,
- plc4c_plc4x_read_write_plc4x_value_type_DATE_AND_TIME = 0x54,
+ plc4c_plc4x_read_write_plc4x_value_type_LDATE = 0x54,
+ plc4c_plc4x_read_write_plc4x_value_type_TIME_OF_DAY = 0x55,
+ plc4c_plc4x_read_write_plc4x_value_type_LTIME_OF_DAY = 0x56,
+ plc4c_plc4x_read_write_plc4x_value_type_DATE_AND_TIME = 0x57,
+ plc4c_plc4x_read_write_plc4x_value_type_LDATE_AND_TIME = 0x58,
plc4c_plc4x_read_write_plc4x_value_type_Struct = 0x61,
- plc4c_plc4x_read_write_plc4x_value_type_List = 0x62
+ plc4c_plc4x_read_write_plc4x_value_type_List = 0x62,
+ plc4c_plc4x_read_write_plc4x_value_type_RAW_BYTE_ARRAY = 0x71
};
typedef enum plc4c_plc4x_read_write_plc4x_value_type plc4c_plc4x_read_write_plc4x_value_type;
diff --git a/plc4c/generated-sources/plc4x/src/plc4x_value_type.c b/plc4c/generated-sources/plc4x/src/plc4x_value_type.c
index 47002abd2..0e3096f7f 100644
--- a/plc4c/generated-sources/plc4x/src/plc4x_value_type.c
+++ b/plc4c/generated-sources/plc4x/src/plc4x_value_type.c
@@ -124,26 +124,41 @@ plc4c_plc4x_read_write_plc4x_value_type plc4c_plc4x_read_write_plc4x_value_type_
if(strcmp(value_string, "TIME") == 0) {
return plc4c_plc4x_read_write_plc4x_value_type_TIME;
}
- if(strcmp(value_string, "TIME_OF_DAY") == 0) {
- return plc4c_plc4x_read_write_plc4x_value_type_TIME_OF_DAY;
+ if(strcmp(value_string, "LTIME") == 0) {
+ return plc4c_plc4x_read_write_plc4x_value_type_LTIME;
}
if(strcmp(value_string, "DATE") == 0) {
return plc4c_plc4x_read_write_plc4x_value_type_DATE;
}
+ if(strcmp(value_string, "LDATE") == 0) {
+ return plc4c_plc4x_read_write_plc4x_value_type_LDATE;
+ }
+ if(strcmp(value_string, "TIME_OF_DAY") == 0) {
+ return plc4c_plc4x_read_write_plc4x_value_type_TIME_OF_DAY;
+ }
+ if(strcmp(value_string, "LTIME_OF_DAY") == 0) {
+ return plc4c_plc4x_read_write_plc4x_value_type_LTIME_OF_DAY;
+ }
if(strcmp(value_string, "DATE_AND_TIME") == 0) {
return plc4c_plc4x_read_write_plc4x_value_type_DATE_AND_TIME;
}
+ if(strcmp(value_string, "LDATE_AND_TIME") == 0) {
+ return plc4c_plc4x_read_write_plc4x_value_type_LDATE_AND_TIME;
+ }
if(strcmp(value_string, "Struct") == 0) {
return plc4c_plc4x_read_write_plc4x_value_type_Struct;
}
if(strcmp(value_string, "List") == 0) {
return plc4c_plc4x_read_write_plc4x_value_type_List;
}
+ if(strcmp(value_string, "RAW_BYTE_ARRAY") == 0) {
+ return plc4c_plc4x_read_write_plc4x_value_type_RAW_BYTE_ARRAY;
+ }
return -1;
}
int plc4c_plc4x_read_write_plc4x_value_type_num_values() {
- return 26;
+ return 31;
}
plc4c_plc4x_read_write_plc4x_value_type plc4c_plc4x_read_write_plc4x_value_type_value_for_index(int index) {
@@ -212,20 +227,35 @@ plc4c_plc4x_read_write_plc4x_value_type plc4c_plc4x_read_write_plc4x_value_type_
return plc4c_plc4x_read_write_plc4x_value_type_TIME;
}
case 21: {
- return plc4c_plc4x_read_write_plc4x_value_type_TIME_OF_DAY;
+ return plc4c_plc4x_read_write_plc4x_value_type_LTIME;
}
case 22: {
return plc4c_plc4x_read_write_plc4x_value_type_DATE;
}
case 23: {
- return plc4c_plc4x_read_write_plc4x_value_type_DATE_AND_TIME;
+ return plc4c_plc4x_read_write_plc4x_value_type_LDATE;
}
case 24: {
- return plc4c_plc4x_read_write_plc4x_value_type_Struct;
+ return plc4c_plc4x_read_write_plc4x_value_type_TIME_OF_DAY;
}
case 25: {
+ return plc4c_plc4x_read_write_plc4x_value_type_LTIME_OF_DAY;
+ }
+ case 26: {
+ return plc4c_plc4x_read_write_plc4x_value_type_DATE_AND_TIME;
+ }
+ case 27: {
+ return plc4c_plc4x_read_write_plc4x_value_type_LDATE_AND_TIME;
+ }
+ case 28: {
+ return plc4c_plc4x_read_write_plc4x_value_type_Struct;
+ }
+ case 29: {
return plc4c_plc4x_read_write_plc4x_value_type_List;
}
+ case 30: {
+ return plc4c_plc4x_read_write_plc4x_value_type_RAW_BYTE_ARRAY;
+ }
default: {
return -1;
}
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
index b2e4e5467..4cbb6c9da 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
@@ -634,8 +634,9 @@ const (
KnxManufacturer_M_KG_POWER KnxManufacturer = 594
KnxManufacturer_M_ZHEJIANG_MOORGEN_INTELLIGENT_TECHNOLOGY_CO___LTD KnxManufacturer = 595
KnxManufacturer_M_GUANGDONG_KANWAY KnxManufacturer = 596
- KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 597
- KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 598
+ KnxManufacturer_M_PHOENIX_CONTACT_2 KnxManufacturer = 597
+ KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 598
+ KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 599
)
var KnxManufacturerValues []KnxManufacturer
@@ -1240,6 +1241,7 @@ func init() {
KnxManufacturer_M_KG_POWER,
KnxManufacturer_M_ZHEJIANG_MOORGEN_INTELLIGENT_TECHNOLOGY_CO___LTD,
KnxManufacturer_M_GUANGDONG_KANWAY,
+ KnxManufacturer_M_PHOENIX_CONTACT_2,
KnxManufacturer_M_ABB___RESERVED,
KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED,
}
@@ -3461,10 +3463,14 @@ func (e KnxManufacturer) Number() uint16 {
}
case 597:
{ /* '597' */
- return 43954
+ return 655
}
case 598:
{ /* '598' */
+ return 43954
+ }
+ case 599:
+ { /* '599' */
return 43959
}
case 6:
@@ -5875,10 +5881,14 @@ func (e KnxManufacturer) Name() string {
}
case 597:
{ /* '597' */
- return "ABB - reserved"
+ return "Phoenix Contact"
}
case 598:
{ /* '598' */
+ return "ABB - reserved"
+ }
+ case 599:
+ { /* '599' */
return "Busch-Jaeger Elektro - reserved"
}
case 6:
@@ -7181,8 +7191,10 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) {
case 596:
return KnxManufacturer_M_GUANGDONG_KANWAY, true
case 597:
- return KnxManufacturer_M_ABB___RESERVED, true
+ return KnxManufacturer_M_PHOENIX_CONTACT_2, true
case 598:
+ return KnxManufacturer_M_ABB___RESERVED, true
+ case 599:
return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
case 6:
return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO, true
@@ -8384,6 +8396,8 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) {
return KnxManufacturer_M_ZHEJIANG_MOORGEN_INTELLIGENT_TECHNOLOGY_CO___LTD, true
case "M_GUANGDONG_KANWAY":
return KnxManufacturer_M_GUANGDONG_KANWAY, true
+ case "M_PHOENIX_CONTACT_2":
+ return KnxManufacturer_M_PHOENIX_CONTACT_2, true
case "M_ABB___RESERVED":
return KnxManufacturer_M_ABB___RESERVED, true
case "M_BUSCH_JAEGER_ELEKTRO___RESERVED":
@@ -9633,6 +9647,8 @@ func (e KnxManufacturer) PLC4XEnumName() string {
return "M_ZHEJIANG_MOORGEN_INTELLIGENT_TECHNOLOGY_CO___LTD"
case KnxManufacturer_M_GUANGDONG_KANWAY:
return "M_GUANGDONG_KANWAY"
+ case KnxManufacturer_M_PHOENIX_CONTACT_2:
+ return "M_PHOENIX_CONTACT_2"
case KnxManufacturer_M_ABB___RESERVED:
return "M_ABB___RESERVED"
case KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED: