You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by jf...@apache.org on 2020/02/07 13:26:00 UTC
[plc4x] branch rel/0.6 updated: [S7] Fixed issue with S7 Short
String Syntax.
This is an automated email from the ASF dual-hosted git repository.
jfeinauer pushed a commit to branch rel/0.6
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/rel/0.6 by this push:
new 38b6cd0 [S7] Fixed issue with S7 Short String Syntax.
38b6cd0 is described below
commit 38b6cd04929d47ddb3cb0ce55305f3851f7db7ea
Author: julian <j....@pragmaticminds.de>
AuthorDate: Fri Feb 7 14:20:27 2020 +0100
[S7] Fixed issue with S7 Short String Syntax.
---
.../s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java | 3 ++-
.../s7/src/test/java/org/apache/plc4x/java/s7/model/S7FieldTests.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
index 8733ffa..c256d79 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java
@@ -189,7 +189,8 @@ public class S7Field implements PlcField {
} else if (DATA_BLOCK_SHORT_PATTERN.matcher(fieldString).matches()) {
matcher = DATA_BLOCK_SHORT_PATTERN.matcher(fieldString);
- assert matcher.matches();
+ boolean matches = matcher.matches();
+ assert matches;
TransportSize dataType = TransportSize.valueOf(matcher.group(DATA_TYPE));
MemoryArea memoryArea = MemoryArea.DATA_BLOCKS;
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/model/S7FieldTests.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/model/S7FieldTests.java
index eaed224..3d4cb35 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/model/S7FieldTests.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/model/S7FieldTests.java
@@ -47,7 +47,8 @@ class S7FieldTests {
Arguments.of("%DB1.DBX38.1:BOOL", TransportSize.BOOL, MemoryArea.DATA_BLOCKS, 1, 38, 1),
Arguments.of("%DB1:38.1:BOOL", TransportSize.BOOL, MemoryArea.DATA_BLOCKS, 1, 38, 1),
Arguments.of("%DB1:8.0:REAL", TransportSize.REAL, MemoryArea.DATA_BLOCKS, 1, 8, 0),
- Arguments.of("%DB400:8.0:REAL", TransportSize.REAL, MemoryArea.DATA_BLOCKS, 400, 8, 0)/*,
+ Arguments.of("%DB400:8.0:REAL", TransportSize.REAL, MemoryArea.DATA_BLOCKS, 400, 8, 0),
+ Arguments.of("%DB444:14.0:BOOL", TransportSize.BOOL, MemoryArea.DATA_BLOCKS, 444, 14, 0)/*,
// Not quite sure about how Data Block addresses look like, in my TIA portal they all have the prefix "DB".
Arguments.of("%DB3.DX4.1:BOOL", S7DataType.BOOL, MemoryArea.DATA_BLOCKS, 3, 4, 1),
Arguments.of("%DB3.DB4:INT", S7DataType.INT, MemoryArea.DATA_BLOCKS, 3, 4, 0),