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 2020/05/01 14:55:25 UTC
[plc4x] branch develop updated (e35b725 -> a4e9643)
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 e35b725 Update bacnetip.adoc
new 83497c5 - Added a missing dependency
new a4e9643 - Made the constants actually 16 bit values (cosmetics)
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/protocol/KnxNetIpProtocolLogic.java | 2 +-
plc4j/examples/hello-connectivity-mqtt/pom.xml | 5 +++++
.../src/main/resources/protocols/amsads/amsads.mspec | 20 ++++++++++----------
3 files changed, 16 insertions(+), 11 deletions(-)
[plc4x] 01/02: - Added a missing dependency
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 83497c5b13b972ea2d7e755865ead8f6e98d6c3d
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri May 1 16:54:41 2020 +0200
- Added a missing dependency
---
.../apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java | 2 +-
plc4j/examples/hello-connectivity-mqtt/pom.xml | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java b/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java
index e10f706..4a37545 100644
--- a/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java
+++ b/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java
@@ -370,7 +370,7 @@ public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KNXNetIPMessage> im
// Create a subscription event from the input.
// TODO: Check this ... this is sort of not really right ...
final PlcSubscriptionEvent event = new DefaultPlcSubscriptionEvent(Instant.now(),
- Collections.singletonMap("knxData", new ResponseItem(PlcResponseCode.OK, plcValue)));
+ Collections.singletonMap("knxData", new ResponseItem<>(PlcResponseCode.OK, plcValue)));
// Try sending the subscription event to all listeners.
for (Map.Entry<DefaultPlcConsumerRegistration, Consumer<PlcSubscriptionEvent>> entry : consumers.entrySet()) {
diff --git a/plc4j/examples/hello-connectivity-mqtt/pom.xml b/plc4j/examples/hello-connectivity-mqtt/pom.xml
index fbc2527..327c4bd 100644
--- a/plc4j/examples/hello-connectivity-mqtt/pom.xml
+++ b/plc4j/examples/hello-connectivity-mqtt/pom.xml
@@ -79,6 +79,11 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<repositories>
[plc4x] 02/02: - Made the constants actually 16 bit values
(cosmetics)
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 a4e964320a443d18b0dbfec01fa634ff3b3208e8
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri May 1 16:55:14 2020 +0200
- Made the constants actually 16 bit values (cosmetics)
---
.../src/main/resources/protocols/amsads/amsads.mspec | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/protocols/amsads/src/main/resources/protocols/amsads/amsads.mspec b/protocols/amsads/src/main/resources/protocols/amsads/amsads.mspec
index 7db8ca7..0319554 100644
--- a/protocols/amsads/src/main/resources/protocols/amsads/amsads.mspec
+++ b/protocols/amsads/src/main/resources/protocols/amsads/amsads.mspec
@@ -145,16 +145,16 @@
]
[enum uint 16 'CommandId'
- ['0x00' INVALID]
- ['0x01' ADS_READ_DEVICE_INFO]
- ['0x02' ADS_READ]
- ['0x03' ADS_WRITE]
- ['0x04' ADS_READ_STATE]
- ['0x05' ADS_WRITE_CONTROL]
- ['0x06' ADS_ADD_DEVICE_NOTIFICATION]
- ['0x07' ADS_DELETE_DEVICE_NOTIFICATION]
- ['0x08' ADS_DEVICE_NOTIFICATION]
- ['0x09' ADS_READ_WRITE]
+ ['0x0000' INVALID]
+ ['0x0001' ADS_READ_DEVICE_INFO]
+ ['0x0002' ADS_READ]
+ ['0x0003' ADS_WRITE]
+ ['0x0004' ADS_READ_STATE]
+ ['0x0005' ADS_WRITE_CONTROL]
+ ['0x0006' ADS_ADD_DEVICE_NOTIFICATION]
+ ['0x0007' ADS_DELETE_DEVICE_NOTIFICATION]
+ ['0x0008' ADS_DEVICE_NOTIFICATION]
+ ['0x0009' ADS_READ_WRITE]
]
[type 'State'