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 2021/08/12 07:50:26 UTC
[plc4x] branch develop updated (985947e -> 3b51e81)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
from 985947e - Cleaned up in the names of the mspec types for PROFINET to follow a consistent pattern
new da01d72 - Added more manufacturers
new 3b51e81 - Streamlined the default implementation of PlcConnection.ping()
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/KnxManufacturer.go | 42 +++++++++++++++++++---
.../utils/connectionpool2/CachedPlcConnection.java | 5 ++-
2 files changed, 41 insertions(+), 6 deletions(-)
[plc4x] 02/02: - Streamlined the default implementation of
PlcConnection.ping()
Posted by cd...@apache.org.
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 3b51e81d65f16c6d60d690a86df93d855a5e34d0
Author: cdutz <ch...@c-ware.de>
AuthorDate: Thu Aug 12 09:50:16 2021 +0200
- Streamlined the default implementation of PlcConnection.ping()
---
.../apache/plc4x/java/utils/connectionpool2/CachedPlcConnection.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/plc4j/tools/connection-cache/src/main/java/org/apache/plc4x/java/utils/connectionpool2/CachedPlcConnection.java b/plc4j/tools/connection-cache/src/main/java/org/apache/plc4x/java/utils/connectionpool2/CachedPlcConnection.java
index 591db96..401c6c6 100644
--- a/plc4j/tools/connection-cache/src/main/java/org/apache/plc4x/java/utils/connectionpool2/CachedPlcConnection.java
+++ b/plc4j/tools/connection-cache/src/main/java/org/apache/plc4x/java/utils/connectionpool2/CachedPlcConnection.java
@@ -21,6 +21,7 @@ package org.apache.plc4x.java.utils.connectionpool2;
import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+import org.apache.plc4x.java.api.exceptions.PlcUnsupportedOperationException;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
@@ -171,7 +172,9 @@ public class CachedPlcConnection implements PlcConnection, PlcConnectionMetadata
@Override
public CompletableFuture<Void> ping() {
- throw new UnsupportedOperationException();
+ CompletableFuture<Void> future = new CompletableFuture<>();
+ future.completeExceptionally(new PlcUnsupportedOperationException("The connection does not support pinging"));
+ return future;
}
@Override
[plc4x] 01/02: - Added more manufacturers
Posted by cd...@apache.org.
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 da01d72166355f2acf9df9f3400e3650f2bfe069
Author: cdutz <ch...@c-ware.de>
AuthorDate: Thu Aug 12 09:49:42 2021 +0200
- Added more manufacturers
---
.../knxnetip/readwrite/model/KnxManufacturer.go | 42 +++++++++++++++++++---
1 file changed, 37 insertions(+), 5 deletions(-)
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxManufacturer.go
index 4081db8..c49a2fe 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxManufacturer.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxManufacturer.go
@@ -596,8 +596,10 @@ const (
KnxManufacturer_M_V_Y_C_SRL KnxManufacturer = 558
KnxManufacturer_M_TERMINUS_GROUP KnxManufacturer = 559
KnxManufacturer_M_WONDERFUL_CITY_TECHNOLOGY KnxManufacturer = 560
- KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 561
- KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 562
+ KnxManufacturer_M_QBICTECHNOLOGY KnxManufacturer = 561
+ KnxManufacturer_M_EMBEDDED_AUTOMATION_EQUIPMENT_SHANGHAI_KESSINGER KnxManufacturer = 562
+ KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 563
+ KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 564
)
var KnxManufacturerValues []KnxManufacturer
@@ -1166,6 +1168,8 @@ func init() {
KnxManufacturer_M_V_Y_C_SRL,
KnxManufacturer_M_TERMINUS_GROUP,
KnxManufacturer_M_WONDERFUL_CITY_TECHNOLOGY,
+ KnxManufacturer_M_QBICTECHNOLOGY,
+ KnxManufacturer_M_EMBEDDED_AUTOMATION_EQUIPMENT_SHANGHAI_KESSINGER,
KnxManufacturer_M_ABB___RESERVED,
KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED,
}
@@ -3231,10 +3235,18 @@ func (e KnxManufacturer) Number() uint16 {
}
case 561:
{ /* '561' */
- return 43954
+ return 618
}
case 562:
{ /* '562' */
+ return 619
+ }
+ case 563:
+ { /* '563' */
+ return 43954
+ }
+ case 564:
+ { /* '564' */
return 43959
}
case 57:
@@ -5501,10 +5513,18 @@ func (e KnxManufacturer) Name() string {
}
case 561:
{ /* '561' */
- return "ABB - reserved"
+ return "QbicTechnology"
}
case 562:
{ /* '562' */
+ return "Embedded Automation Equipment (Shanghai) Kessinger"
+ }
+ case 563:
+ { /* '563' */
+ return "ABB - reserved"
+ }
+ case 564:
+ { /* '564' */
return "Busch-Jaeger Elektro - reserved"
}
case 57:
@@ -6741,8 +6761,12 @@ func KnxManufacturerByValue(value uint16) KnxManufacturer {
case 560:
return KnxManufacturer_M_WONDERFUL_CITY_TECHNOLOGY
case 561:
- return KnxManufacturer_M_ABB___RESERVED
+ return KnxManufacturer_M_QBICTECHNOLOGY
case 562:
+ return KnxManufacturer_M_EMBEDDED_AUTOMATION_EQUIPMENT_SHANGHAI_KESSINGER
+ case 563:
+ return KnxManufacturer_M_ABB___RESERVED
+ case 564:
return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED
case 57:
return KnxManufacturer_M_ORAS
@@ -7872,6 +7896,10 @@ func KnxManufacturerByName(value string) KnxManufacturer {
return KnxManufacturer_M_WALTHER_WERKE
case "M_WONDERFUL_CITY_TECHNOLOGY":
return KnxManufacturer_M_WONDERFUL_CITY_TECHNOLOGY
+ case "M_QBICTECHNOLOGY":
+ return KnxManufacturer_M_QBICTECHNOLOGY
+ case "M_EMBEDDED_AUTOMATION_EQUIPMENT_SHANGHAI_KESSINGER":
+ return KnxManufacturer_M_EMBEDDED_AUTOMATION_EQUIPMENT_SHANGHAI_KESSINGER
case "M_ABB___RESERVED":
return KnxManufacturer_M_ABB___RESERVED
case "M_BUSCH_JAEGER_ELEKTRO___RESERVED":
@@ -9034,6 +9062,10 @@ func (e KnxManufacturer) name() string {
return "M_WALTHER_WERKE"
case KnxManufacturer_M_WONDERFUL_CITY_TECHNOLOGY:
return "M_WONDERFUL_CITY_TECHNOLOGY"
+ case KnxManufacturer_M_QBICTECHNOLOGY:
+ return "M_QBICTECHNOLOGY"
+ case KnxManufacturer_M_EMBEDDED_AUTOMATION_EQUIPMENT_SHANGHAI_KESSINGER:
+ return "M_EMBEDDED_AUTOMATION_EQUIPMENT_SHANGHAI_KESSINGER"
case KnxManufacturer_M_ABB___RESERVED:
return "M_ABB___RESERVED"
case KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED: