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/01/15 10:27:11 UTC
[plc4x] branch next-gen-core-2 updated: - Renamed the s7ng back to
s7
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch next-gen-core-2
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/next-gen-core-2 by this push:
new 7e01b5d - Renamed the s7ng back to s7
7e01b5d is described below
commit 7e01b5dd1a9fca967fde80228eabe529f98f3f46
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Jan 15 11:27:04 2020 +0100
- Renamed the s7ng back to s7
---
.../src/main/java/org/apache/plc4x/java/s7/readwrite/S7Driver.java | 2 +-
.../java/org/apache/plc4x/java/s7/readwrite/ManualS7DriverTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sandbox/test-java-s7-driver/src/main/java/org/apache/plc4x/java/s7/readwrite/S7Driver.java b/sandbox/test-java-s7-driver/src/main/java/org/apache/plc4x/java/s7/readwrite/S7Driver.java
index bdcc83a..6933c5e 100644
--- a/sandbox/test-java-s7-driver/src/main/java/org/apache/plc4x/java/s7/readwrite/S7Driver.java
+++ b/sandbox/test-java-s7-driver/src/main/java/org/apache/plc4x/java/s7/readwrite/S7Driver.java
@@ -39,7 +39,7 @@ public class S7Driver extends GeneratedDriverBase<TPKTPacket> {
@Override
public String getProtocolCode() {
- return "s7ng";
+ return "s7";
}
@Override
diff --git a/sandbox/test-java-s7-driver/src/test/java/org/apache/plc4x/java/s7/readwrite/ManualS7DriverTest.java b/sandbox/test-java-s7-driver/src/test/java/org/apache/plc4x/java/s7/readwrite/ManualS7DriverTest.java
index fc3415d..f15181b 100644
--- a/sandbox/test-java-s7-driver/src/test/java/org/apache/plc4x/java/s7/readwrite/ManualS7DriverTest.java
+++ b/sandbox/test-java-s7-driver/src/test/java/org/apache/plc4x/java/s7/readwrite/ManualS7DriverTest.java
@@ -24,8 +24,8 @@ public class ManualS7DriverTest {
public static void main(String[] args) throws Exception {
final S7Driver driver = new S7Driver();
- //final PlcConnection connection = driver.getConnection("s7ng:pcap:///Users/christofer.dutz/Projects/Apache/PLC4X/plc4x/sandbox/test-java-s7-driver/src/test/resources/pcaps/s7-1200-reads-writes.pcapng");
- final PlcConnection connection = driver.getConnection("s7ng://10.10.64.20");
+ //final PlcConnection connection = driver.getConnection("s7:pcap:///Users/christofer.dutz/Projects/Apache/PLC4X/plc4x/sandbox/test-java-s7-driver/src/test/resources/pcaps/s7-1200-reads-writes.pcapng");
+ final PlcConnection connection = driver.getConnection("s7://10.10.64.20");
connection.connect();
System.out.println(connection.readRequestBuilder().addItem("inputs", "%I0:BYTE").build().execute().get().getObject("inputs"));
}