You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by ld...@apache.org on 2020/06/24 08:25:21 UTC
[plc4x] 02/03: Revert changes in mspec.
This is an automated email from the ASF dual-hosted git repository.
ldywicki pushed a commit to branch feature/bacnet-active
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit f1da80e1ba76367124afc332f8b7097ccf89a0b6
Author: Łukasz Dywicki <lu...@code-house.org>
AuthorDate: Wed Jun 24 09:49:24 2020 +0200
Revert changes in mspec.
---
.../main/resources/protocols/bacnetip/bacnetip.mspec | 17 ++++++-----------
.../java/bacnetip/protocol/BacNetIpProtocolLogic.java | 2 +-
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
index 150cb1d..eb001e9 100644
--- a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
+++ b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
@@ -316,20 +316,20 @@
['0x07' BACnetUnconfirmedServiceRequestWhoHas
[const uint 8 'deviceInstanceLowLimitHeader' '0x0B']
[simple uint 24 'deviceInstanceLowLimit']
-
[const uint 8 'deviceInstanceHighLimitHeader' '0x1B']
[simple uint 24 'deviceInstanceHighLimit']
-
[const uint 8 'objectNameHeader' '0x3D']
[implicit uint 8 'objectNameLength' 'COUNT(objectName) + 1']
-
[simple uint 8 'objectNameCharacterSet']
[array int 8 'objectName' length 'objectNameLength - 1']
]
['0x08' BACnetUnconfirmedServiceRequestWhoIs
- [optional uint 5 'header' 'len > 12']
- [optional BACnetDeviceInstanceRange 'low' 'header != null && == 0x01']
- [optional BACnetDeviceInstanceRange 'high' 'header != null && == 0x03']
+ [const uint 5 'deviceInstanceRangeLowLimitHeader' '0x01']
+ [simple uint 3 'deviceInstanceRangeLowLimitLength']
+ [array int 8 'deviceInstanceRangeLowLimit' count 'deviceInstanceRangeLowLimitLength']
+ [const uint 5 'deviceInstanceRangeHighLimitHeader' '0x03']
+ [simple uint 3 'deviceInstanceRangeHighLimitLength']
+ [array int 8 'deviceInstanceRangeHighLimit' count 'deviceInstanceRangeHighLimitLength']
]
['0x09' BACnetUnconfirmedServiceRequestUTCTimeSynchronization
]
@@ -340,11 +340,6 @@
]
]
-[type 'BACnetDeviceInstanceRange'
- [simple uint 3 'deviceInstanceRangeLowLimitLength']
- [array int 8 'deviceInstanceRangeLowLimit' count 'deviceInstanceRangeLowLimitLength']
-]
-
[discriminatedType 'BACnetServiceAck'
[discriminator uint 8 'serviceChoice']
[typeSwitch 'serviceChoice'
diff --git a/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/protocol/BacNetIpProtocolLogic.java b/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/protocol/BacNetIpProtocolLogic.java
index 1a67496..66d01a4 100644
--- a/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/protocol/BacNetIpProtocolLogic.java
+++ b/sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/protocol/BacNetIpProtocolLogic.java
@@ -98,7 +98,7 @@ public class BacNetIpProtocolLogic extends Plc4xProtocolBase<BVLC> implements Ha
context.fireConnected();
APDUUnconfirmedRequest apdu = new APDUUnconfirmedRequest(
- new BACnetUnconfirmedServiceRequestWhoIs((short) 0x08, null, null)
+ new BACnetUnconfirmedServiceRequestWhoIs((byte) 0x00, new byte[0], (byte) 0x00, new byte[0])
);
BVLCOriginalBroadcastNPDU broadcastNPDU = new BVLCOriginalBroadcastNPDU(