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/07/01 08:39:30 UTC
[plc4x] 03/05: chore(protocols/knx): Minor updates
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
commit bbdbf36e9e201d4fd3b08815acf7200459b8ab2a
Author: christoferdutz <ch...@c-ware.de>
AuthorDate: Fri Jul 1 10:38:20 2022 +0200
chore(protocols/knx): Minor updates
---
.../knxnetip-test/resources/logback-test.xml | 36 ++++++++++++++++++++++
.../knxnetip/readwrite/model/KnxManufacturer.cs | 19 ++++++++----
2 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/plc4net/drivers/knxnetip-test/resources/logback-test.xml b/plc4net/drivers/knxnetip-test/resources/logback-test.xml
new file mode 100644
index 000000000..cc4250b21
--- /dev/null
+++ b/plc4net/drivers/knxnetip-test/resources/logback-test.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
+<configuration xmlns="http://ch.qos.logback/xml/ns/logback"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://ch.qos.logback/xml/ns/logback
+ https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd">
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="info">
+ <appender-ref ref="STDOUT" />
+ </root>
+
+</configuration>
\ No newline at end of file
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 790e572b4..7e1adac6e 100644
--- a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
+++ b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
@@ -616,8 +616,9 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
M_ARIGO_SOFTWARE_GMBH = 589,
M_FEISHELEC = 590,
M_GORDIC = 591,
- M_ABB___RESERVED = 592,
- M_BUSCH_JAEGER_ELEKTRO___RESERVED = 593,
+ M_DELTA_ELECTRONICS = 592,
+ M_ABB___RESERVED = 593,
+ M_BUSCH_JAEGER_ELEKTRO___RESERVED = 594,
}
public static class KnxManufacturerInfo
@@ -2271,10 +2272,13 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_GORDIC: { /* '591' */
return 649;
}
- case KnxManufacturer.M_ABB___RESERVED: { /* '592' */
+ case KnxManufacturer.M_DELTA_ELECTRONICS: { /* '592' */
+ return 650;
+ }
+ case KnxManufacturer.M_ABB___RESERVED: { /* '593' */
return 43954;
}
- case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '593' */
+ case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '594' */
return 43959;
}
case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO: { /* '6' */
@@ -4063,10 +4067,13 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_GORDIC: { /* '591' */
return "GORDIC";
}
- case KnxManufacturer.M_ABB___RESERVED: { /* '592' */
+ case KnxManufacturer.M_DELTA_ELECTRONICS: { /* '592' */
+ return "Delta Electronics";
+ }
+ case KnxManufacturer.M_ABB___RESERVED: { /* '593' */
return "ABB - reserved";
}
- case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '593' */
+ case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '594' */
return "Busch-Jaeger Elektro - reserved";
}
case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO: { /* '6' */