You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2023/03/22 13:40:44 UTC
[plc4x] branch develop updated (55066a78fe -> b8650774cc)
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
from 55066a78fe fix(plc4go/knx): use queues for discovery to not overwhelm small devices
new 75ea6f8b6e fix(plc4go/bacnet): disable excessive logging on Task
new a96b8d24a9 feat(plc4go/knx): update manufacturer
new 7a4b5eb8cc chore(plc4go/cbus): added todo for bridge commands
new b8650774cc chore(plc4go/bacnet): update manufacturer
The 4 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:
plc4go/internal/bacnetip/Task.go | 2 +-
plc4go/internal/cbus/CBusMessageFactory.go | 1 +
.../knxnetip/readwrite/model/KnxManufacturer.go | 88 +++++++++++++++++++---
.../java/bacnetip/readwrite/BACnetVendorId.java | 4 +-
.../java/knxnetip/readwrite/KnxManufacturer.java | 10 ++-
5 files changed, 89 insertions(+), 16 deletions(-)
[plc4x] 03/04: chore(plc4go/cbus): added todo for bridge commands
Posted by sr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 7a4b5eb8cc29c05afca0d3055409ee4a636ca99f
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Wed Mar 22 14:29:45 2023 +0100
chore(plc4go/cbus): added todo for bridge commands
---
plc4go/internal/cbus/CBusMessageFactory.go | 1 +
1 file changed, 1 insertion(+)
diff --git a/plc4go/internal/cbus/CBusMessageFactory.go b/plc4go/internal/cbus/CBusMessageFactory.go
index 36b1b9416e..e162c27b28 100644
--- a/plc4go/internal/cbus/CBusMessageFactory.go
+++ b/plc4go/internal/cbus/CBusMessageFactory.go
@@ -41,6 +41,7 @@ func TagToCBusMessage(tag model.PlcTag, value values.PlcValue, alphaGenerator *A
case StatusRequestTypeLevel:
statusRequest = readWriteModel.NewStatusRequestLevel(tagType.application, *tagType.startingGroupAddressLabel, 0x73)
}
+ //TODO: we need support for bridged commands
command := readWriteModel.NewCBusPointToMultiPointCommandStatus(statusRequest, byte(tagType.application), cbusOptions)
header := readWriteModel.NewCBusHeader(readWriteModel.PriorityClass_Class4, false, 0, readWriteModel.DestinationAddressType_PointToMultiPoint)
cbusCommand := readWriteModel.NewCBusCommandPointToMultiPoint(command, header, cbusOptions)
[plc4x] 02/04: feat(plc4go/knx): update manufacturer
Posted by sr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit a96b8d24a949a7f77b20029c0101e4cc5700f851
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Wed Mar 22 14:29:21 2023 +0100
feat(plc4go/knx): update manufacturer
---
.../knxnetip/readwrite/model/KnxManufacturer.go | 88 +++++++++++++++++++---
.../java/knxnetip/readwrite/KnxManufacturer.java | 10 ++-
2 files changed, 84 insertions(+), 14 deletions(-)
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
index 95acd43cb8..829d571434 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
@@ -652,8 +652,12 @@ const (
KnxManufacturer_M_SMART_BUILDING_SERVICES_GMBH KnxManufacturer = 612
KnxManufacturer_M_BSS_GMBH KnxManufacturer = 613
KnxManufacturer_M_LUMI_ELECTRONICS KnxManufacturer = 614
- KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 615
- KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 616
+ KnxManufacturer_M_OJEAELECTRONICS KnxManufacturer = 615
+ KnxManufacturer_M_SMART_NODE KnxManufacturer = 616
+ KnxManufacturer_M_NEXHOME KnxManufacturer = 617
+ KnxManufacturer_M_HUOTENG_WULIAN_JIANGSU_CO___LTD KnxManufacturer = 618
+ KnxManufacturer_M_ABB___RESERVED KnxManufacturer = 619
+ KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED KnxManufacturer = 620
)
var KnxManufacturerValues []KnxManufacturer
@@ -1276,6 +1280,10 @@ func init() {
KnxManufacturer_M_SMART_BUILDING_SERVICES_GMBH,
KnxManufacturer_M_BSS_GMBH,
KnxManufacturer_M_LUMI_ELECTRONICS,
+ KnxManufacturer_M_OJEAELECTRONICS,
+ KnxManufacturer_M_SMART_NODE,
+ KnxManufacturer_M_NEXHOME,
+ KnxManufacturer_M_HUOTENG_WULIAN_JIANGSU_CO___LTD,
KnxManufacturer_M_ABB___RESERVED,
KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED,
}
@@ -3581,16 +3589,32 @@ func (e KnxManufacturer) Number() uint16 {
}
case 615:
{ /* '615' */
- return 43954
+ return 674
}
case 616:
{ /* '616' */
- return 43959
+ return 675
+ }
+ case 617:
+ { /* '617' */
+ return 676
+ }
+ case 618:
+ { /* '618' */
+ return 677
+ }
+ case 619:
+ { /* '619' */
+ return 43954
}
case 62:
{ /* '62' */
return 101
}
+ case 620:
+ { /* '620' */
+ return 43959
+ }
case 63:
{ /* '63' */
return 102
@@ -6067,16 +6091,32 @@ func (e KnxManufacturer) Name() string {
}
case 615:
{ /* '615' */
- return "ABB - reserved"
+ return "OjeaElectronics"
}
case 616:
{ /* '616' */
- return "Busch-Jaeger Elektro - reserved"
+ return "Smart Node"
+ }
+ case 617:
+ { /* '617' */
+ return "NEXhome"
+ }
+ case 618:
+ { /* '618' */
+ return "Huoteng Wulian (Jiangsu) Co., Ltd"
+ }
+ case 619:
+ { /* '619' */
+ return "ABB - reserved"
}
case 62:
{ /* '62' */
return "WHD Wilhelm Huber + Söhne"
}
+ case 620:
+ { /* '620' */
+ return "Busch-Jaeger Elektro - reserved"
+ }
case 63:
{ /* '63' */
return "Bischoff Elektronik"
@@ -7403,11 +7443,19 @@ func KnxManufacturerByValue(value uint16) (enum KnxManufacturer, ok bool) {
case 614:
return KnxManufacturer_M_LUMI_ELECTRONICS, true
case 615:
- return KnxManufacturer_M_ABB___RESERVED, true
+ return KnxManufacturer_M_OJEAELECTRONICS, true
case 616:
- return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
+ return KnxManufacturer_M_SMART_NODE, true
+ case 617:
+ return KnxManufacturer_M_NEXHOME, true
+ case 618:
+ return KnxManufacturer_M_HUOTENG_WULIAN_JIANGSU_CO___LTD, true
+ case 619:
+ return KnxManufacturer_M_ABB___RESERVED, true
case 62:
return KnxManufacturer_M_WHD_WILHELM_HUBER_Plus_SOEHNE, true
+ case 620:
+ return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
case 63:
return KnxManufacturer_M_BISCHOFF_ELEKTRONIK, true
case 64:
@@ -8642,12 +8690,20 @@ func KnxManufacturerByName(value string) (enum KnxManufacturer, ok bool) {
return KnxManufacturer_M_BSS_GMBH, true
case "M_LUMI_ELECTRONICS":
return KnxManufacturer_M_LUMI_ELECTRONICS, true
+ case "M_OJEAELECTRONICS":
+ return KnxManufacturer_M_OJEAELECTRONICS, true
+ case "M_SMART_NODE":
+ return KnxManufacturer_M_SMART_NODE, true
+ case "M_NEXHOME":
+ return KnxManufacturer_M_NEXHOME, true
+ case "M_HUOTENG_WULIAN_JIANGSU_CO___LTD":
+ return KnxManufacturer_M_HUOTENG_WULIAN_JIANGSU_CO___LTD, 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_WHD_WILHELM_HUBER_Plus_SOEHNE":
return KnxManufacturer_M_WHD_WILHELM_HUBER_Plus_SOEHNE, true
+ case "M_BUSCH_JAEGER_ELEKTRO___RESERVED":
+ return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
case "M_BISCHOFF_ELEKTRONIK":
return KnxManufacturer_M_BISCHOFF_ELEKTRONIK, true
case "M_JEPAZ":
@@ -9939,12 +9995,20 @@ func (e KnxManufacturer) PLC4XEnumName() string {
return "M_BSS_GMBH"
case KnxManufacturer_M_LUMI_ELECTRONICS:
return "M_LUMI_ELECTRONICS"
+ case KnxManufacturer_M_OJEAELECTRONICS:
+ return "M_OJEAELECTRONICS"
+ case KnxManufacturer_M_SMART_NODE:
+ return "M_SMART_NODE"
+ case KnxManufacturer_M_NEXHOME:
+ return "M_NEXHOME"
+ case KnxManufacturer_M_HUOTENG_WULIAN_JIANGSU_CO___LTD:
+ return "M_HUOTENG_WULIAN_JIANGSU_CO___LTD"
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_WHD_WILHELM_HUBER_Plus_SOEHNE:
return "M_WHD_WILHELM_HUBER_Plus_SOEHNE"
+ case KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED:
+ return "M_BUSCH_JAEGER_ELEKTRO___RESERVED"
case KnxManufacturer_M_BISCHOFF_ELEKTRONIK:
return "M_BISCHOFF_ELEKTRONIK"
case KnxManufacturer_M_JEPAZ:
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 9b103c629c..9866c06f0d 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
@@ -703,9 +703,15 @@ public enum KnxManufacturer {
M_INYX((int) 611, (int) 670, (String) "Inyx"),
M_SMART_BUILDING_SERVICES_GMBH((int) 612, (int) 671, (String) "Smart Building Services GmbH"),
M_BSS_GMBH((int) 613, (int) 672, (String) "BSS GmbH"),
- M_ABB___RESERVED((int) 614, (int) 43954, (String) "ABB - reserved"),
+ M_LUMI_ELECTRONICS((int) 614, (int) 673, (String) "Lumi Electronics"),
+ M_OJEAELECTRONICS((int) 615, (int) 674, (String) "OjeaElectronics"),
+ M_SMART_NODE((int) 616, (int) 675, (String) "Smart Node"),
+ M_NEXHOME((int) 617, (int) 676, (String) "NEXhome"),
+ M_HUOTENG_WULIAN_JIANGSU_CO___LTD(
+ (int) 618, (int) 677, (String) "Huoteng Wulian (Jiangsu) Co., Ltd"),
+ M_ABB___RESERVED((int) 619, (int) 43954, (String) "ABB - reserved"),
M_BUSCH_JAEGER_ELEKTRO___RESERVED(
- (int) 615, (int) 43959, (String) "Busch-Jaeger Elektro - reserved");
+ (int) 620, (int) 43959, (String) "Busch-Jaeger Elektro - reserved");
private static final Map<Integer, KnxManufacturer> map;
static {
[plc4x] 04/04: chore(plc4go/bacnet): update manufacturer
Posted by sr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit b8650774cce3a8d94dae8657158927c3c8b088a6
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Wed Mar 22 14:30:00 2023 +0100
chore(plc4go/bacnet): update manufacturer
---
.../org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java
index f7b08d59f9..9bc4d517f9 100644
--- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java
+++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java
@@ -287,7 +287,7 @@ public enum BACnetVendorId {
CONTROL_TECHNIQUES_LTD((int) 220, (int) 220, (String) "Control Techniques, Ltd."),
OPEN_GENERAL_PTY_LTD((int) 221, (int) 221, (String) "OpenGeneral Pty., Ltd."),
WAGO_KONTAKTTECHNIK_GMBH_COKG((int) 222, (int) 222, (String) "WAGO Kontakttechnik GmbH & Co. KG"),
- CERUS_INDUSTRIAL((int) 223, (int) 223, (String) "Cerus Industrial"),
+ FRANKLIN_ELECTRIC((int) 223, (int) 223, (String) "Franklin Electric"),
CHLORIDE_POWER_PROTECTION_COMPANY(
(int) 224, (int) 224, (String) "Chloride Power Protection Company"),
COMPUTROLS_INC((int) 225, (int) 225, (String) "Computrols, Inc."),
@@ -1620,6 +1620,8 @@ public enum BACnetVendorId {
LEFOO_INDUSTRIAL_HANGZHOU_CO_LTD(
(int) 1409, (int) 1409, (String) "LEFOO Industrial (Hangzhou) Co., Ltd."),
CALIBRATION_TECHNOLOGIES_INC((int) 1410, (int) 1410, (String) "Calibration Technologies, Inc."),
+ ALLORADO((int) 1411, (int) 1411, (String) "Allorado"),
+ VERKADA((int) 1412, (int) 1412, (String) "Verkada"),
UNKNOWN_VENDOR((int) 0xFFFF, (int) 0xFFFF, (String) "Unknown");
private static final Map<Integer, BACnetVendorId> map;
[plc4x] 01/04: fix(plc4go/bacnet): disable excessive logging on Task
Posted by sr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 75ea6f8b6e840cf3a55234924a90b5dc1b978def
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Wed Mar 22 14:28:50 2023 +0100
fix(plc4go/bacnet): disable excessive logging on Task
---
plc4go/internal/bacnetip/Task.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plc4go/internal/bacnetip/Task.go b/plc4go/internal/bacnetip/Task.go
index e69e779d23..fcd783d71d 100644
--- a/plc4go/internal/bacnetip/Task.go
+++ b/plc4go/internal/bacnetip/Task.go
@@ -285,7 +285,7 @@ func (m *TaskManager) resumeTask(task _TaskRequirements) {
}
func (m *TaskManager) getNextTask() (_TaskRequirements, time.Duration) {
- log.Trace().Msgf("getNextTask")
+ //log.Trace().Msgf("getNextTask")
m.Lock()
defer m.Unlock()