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 2019/01/22 20:52:22 UTC
[incubator-plc4x] branch develop updated: - Finished the last
missing part in the COTP protocol.
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/incubator-plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 6ef0491 - Finished the last missing part in the COTP protocol.
6ef0491 is described below
commit 6ef049118da0a56e0c2479e4d9e2887be80246d9
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Tue Jan 22 21:52:17 2019 +0100
- Finished the last missing part in the COTP protocol.
---
.../src/main/dfdl/org/apache/plc4x/protocols/cotp-protocol.dfdl.xsd | 5 ++---
.../src/test/resources/org/apache/plc4x/protocols/cotp-protocol.tdml | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/protocols/src/main/dfdl/org/apache/plc4x/protocols/cotp-protocol.dfdl.xsd b/protocols/src/main/dfdl/org/apache/plc4x/protocols/cotp-protocol.dfdl.xsd
index afe7a5e..14cbfb3 100644
--- a/protocols/src/main/dfdl/org/apache/plc4x/protocols/cotp-protocol.dfdl.xsd
+++ b/protocols/src/main/dfdl/org/apache/plc4x/protocols/cotp-protocol.dfdl.xsd
@@ -143,10 +143,9 @@
<xs:element dfdl:choiceBranchKey="112" ref="cotp:CotpTpduError"/>
<xs:element dfdl:choiceBranchKey="240" ref="cotp:CotpTpduData"/>
</xs:choice>
- <!-- TODO: add the entire rest of the input to the user-data -->
<xs:element name="userData" type="xs:hexBinary"
- dfdl:byteOrder="bigEndian" dfdl:lengthUnits="bytes" dfdl:lengthKind="explicit"
- dfdl:length="0"/>
+ dfdl:byteOrder="bigEndian" dfdl:lengthKind="delimited"
+ dfdl:encoding="ISO-8859-1" dfdl:textTrimKind="none" />
</xs:sequence>
</xs:complexType>
diff --git a/protocols/src/test/resources/org/apache/plc4x/protocols/cotp-protocol.tdml b/protocols/src/test/resources/org/apache/plc4x/protocols/cotp-protocol.tdml
index 9da61c8..a85cfdc 100644
--- a/protocols/src/test/resources/org/apache/plc4x/protocols/cotp-protocol.tdml
+++ b/protocols/src/test/resources/org/apache/plc4x/protocols/cotp-protocol.tdml
@@ -514,8 +514,7 @@
description="Typical Data TPDU used for transferring S7 packets.">
<!-- Define the input -->
<tdml:document>
- <!-- TODO: Comment in the S7 payload as soon as the schema is fixed -->
- <tdml:documentPart type="byte">02F080<!--320700000300000800080001120411440100ff09000401320004--></tdml:documentPart>
+ <tdml:documentPart type="byte">02F080320700000300000800080001120411440100ff09000401320004</tdml:documentPart>
</tdml:document>
<!-- Define the expected output -->
@@ -528,7 +527,7 @@
<endOfTransmission>1</endOfTransmission>
<tpduRef>0</tpduRef>
</CotpTpduData>
- <userData/>
+ <userData>320700000300000800080001120411440100FF09000401320004</userData>
</test:cotpMessage>
</tdml:dfdlInfoset>
</tdml:infoset>