This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 08fc1cb3dc chore(code-gen): Added the "version" of the maven project
to the code-generation context.
08fc1cb3dc is described below
commit 08fc1cb3dc9f5e3c6e1b785bc68e3c844dad75dd
Author: cdutz <[email protected]>
AuthorDate: Thu Jun 9 17:43:38 2022 +0200
chore(code-gen): Added the "version" of the maven project to the
code-generation context.
---
.../freemarker/FreemarkerLanguageOutput.java | 2 +-
.../knxnetip/readwrite/model/KnxManufacturer.cs | 30 ++++++++++++++++------
2 files changed, 23 insertions(+), 9 deletions(-)
diff --git
a/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/FreemarkerLanguageOutput.java
b/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/FreemarkerLanguageOutput.java
index 35e59a7966..73df2de6f6 100644
---
a/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/FreemarkerLanguageOutput.java
+++
b/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/FreemarkerLanguageOutput.java
@@ -40,7 +40,7 @@ public abstract class FreemarkerLanguageOutput implements
LanguageOutput {
private static final Logger LOGGER =
LoggerFactory.getLogger(FreemarkerLanguageOutput.class);
@Override
- public void generate(File outputDir, String languageName, String
protocolName, String outputFlavor, Map<String, TypeDefinition> types,
+ public void generate(File outputDir, String version, String languageName,
String protocolName, String outputFlavor, Map<String, TypeDefinition> types,
Map<String, String> options)
throws GenerationException {
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 3dc124e45b..7d2316bd51 100644
---
a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
+++
b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
@@ -613,8 +613,10 @@ namespace
org.apache.plc4net.drivers.knxnetip.readwrite.model
M_LARFE = 586,
M_DONGGUAN_MUHCCI_ELECTRICAL = 587,
M_STEC = 588,
- M_ABB___RESERVED = 589,
- M_BUSCH_JAEGER_ELEKTRO___RESERVED = 590,
+ M_ARIGO_SOFTWARE_GMBH = 589,
+ M_FEISHELEC = 590,
+ M_ABB___RESERVED = 591,
+ M_BUSCH_JAEGER_ELEKTRO___RESERVED = 592,
}
public static class KnxManufacturerInfo
@@ -2256,13 +2258,19 @@ namespace
org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_STEC: { /* '588' */
return 646;
}
- case KnxManufacturer.M_ABB___RESERVED: { /* '589' */
- return 43954;
+ case KnxManufacturer.M_ARIGO_SOFTWARE_GMBH: { /* '589' */
+ return 647;
}
case KnxManufacturer.M_ELECTRAK: { /* '59' */
return 98;
}
- case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /*
'590' */
+ case KnxManufacturer.M_FEISHELEC: { /* '590' */
+ return 648;
+ }
+ case KnxManufacturer.M_ABB___RESERVED: { /* '591' */
+ return 43954;
+ }
+ case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /*
'592' */
return 43959;
}
case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO: { /* '6' */
@@ -4039,13 +4047,19 @@ namespace
org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_STEC: { /* '588' */
return "STEC";
}
- case KnxManufacturer.M_ABB___RESERVED: { /* '589' */
- return "ABB - reserved";
+ case KnxManufacturer.M_ARIGO_SOFTWARE_GMBH: { /* '589' */
+ return "ARIGO Software GmbH";
}
case KnxManufacturer.M_ELECTRAK: { /* '59' */
return "Electrak";
}
- case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /*
'590' */
+ case KnxManufacturer.M_FEISHELEC: { /* '590' */
+ return "Feishelec";
+ }
+ case KnxManufacturer.M_ABB___RESERVED: { /* '591' */
+ return "ABB - reserved";
+ }
+ case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /*
'592' */
return "Busch-Jaeger Elektro - reserved";
}
case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO: { /* '6' */