You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2021/04/13 12:24:13 UTC
[plc4x] branch develop updated: plc4go: added manual s7 driver test
for go
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 033cc19 plc4go: added manual s7 driver test for go
033cc19 is described below
commit 033cc1993c68921df7050d9ab0d89da5188bd71f
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Tue Apr 13 14:22:40 2021 +0200
plc4go: added manual s7 driver test for go
+ refined logging in test.Transport
+ fixed packetSize calculation for s7
---
.../main/drivers/tests/manual_s7_driver_test.go | 112 +++++++++++++++++++++
plc4go/internal/plc4go/s7/MessageCodec.go | 7 +-
.../plc4go/spi/transports/test/Transport.go | 5 +-
3 files changed, 118 insertions(+), 6 deletions(-)
diff --git a/plc4go/cmd/main/drivers/tests/manual_s7_driver_test.go b/plc4go/cmd/main/drivers/tests/manual_s7_driver_test.go
new file mode 100644
index 0000000..34e8454
--- /dev/null
+++ b/plc4go/cmd/main/drivers/tests/manual_s7_driver_test.go
@@ -0,0 +1,112 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package tests
+
+import (
+ _ "github.com/apache/plc4x/plc4go/cmd/main/initializetest"
+ "github.com/apache/plc4x/plc4go/internal/plc4go/s7"
+ "github.com/apache/plc4x/plc4go/internal/plc4go/spi/testutils"
+ "github.com/apache/plc4x/plc4go/internal/plc4go/spi/transports/tcp"
+ "github.com/apache/plc4x/plc4go/pkg/plc4go"
+ "testing"
+)
+
+func TestManualS7(t *testing.T) {
+ t.Skip()
+
+ /*
+ Test program code on the PLC with the test-data.
+ Located in "main"
+
+ hurz_BOOL := TRUE;
+ hurz_BYTE := 42;
+ hurz_WORD := 42424;
+ hurz_DWORD := 4242442424;
+ hurz_LWORD := 4242442424242424242;
+ hurz_SINT := -42;
+ hurz_USINT := 42;
+ hurz_INT := -2424;
+ hurz_UINT := 42424;
+ hurz_DINT := -242442424;
+ hurz_UDINT := 4242442424;
+ hurz_LINT := -4242442424242424242;
+ hurz_ULINT := 4242442424242424242;
+ hurz_REAL := 3.14159265359;
+ hurz_LREAL := 2.71828182846;
+ hurz_TIME := T#1S234MS;
+ hurz_LTIME := LTIME#1000D15H23M12S34MS2US44NS;
+ hurz_DATE := D#1998-03-28;
+ //hurz_LDATE:LDATE;
+ hurz_TIME_OF_DAY := TIME_OF_DAY#15:36:30.123;
+ hurz_TOD := TOD#16:17:18.123;
+ //hurz_LTIME_OF_DAY:LTIME_OF_DAY;
+ //hurz_LTOD:LTOD;
+ hurz_DATE_AND_TIME := DATE_AND_TIME#1996-05-06-15:36:30;
+ hurz_DT := DT#1972-03-29-00:00:00;
+ //hurz_LDATE_AND_TIME:LDATE_AND_TIME;
+ //hurz_LDT:LDT;
+ hurz_STRING := 'hurz';
+ hurz_WSTRING := "wolf";
+ */
+
+ connectionString := "s7://192.168.23.30"
+ driverManager := plc4go.NewPlcDriverManager()
+ driverManager.RegisterDriver(s7.NewDriver())
+ driverManager.RegisterTransport(tcp.NewTransport())
+ test := testutils.NewManualTestSuite(connectionString, driverManager, t)
+
+ test.AddTestCase("%DB4:0.0:BOOL", true)
+ test.AddTestCase("%DB4:1:BYTE", []bool{false, false, true, false, true, false, true, false})
+ test.AddTestCase("%DB4:2:WORD", []bool{true, false, true, false, false, true, false, true, true, false, true, true, true, false, false, false})
+ test.AddTestCase("%DB4:4:DWORD", []bool{true, true, true, true, true, true, false, false, true, true, false, true, true, true, true, false, true, false, false, false, true, false, false, false, true, false, true, true, true, false, false, false})
+ test.AddTestCase("%DB4:16:SINT", -42)
+ test.AddTestCase("%DB4:17:USINT", 42)
+ test.AddTestCase("%DB4:18:INT", -2424)
+ test.AddTestCase("%DB4:20:UINT", 42424)
+ test.AddTestCase("%DB4:22:DINT", -242442424)
+ test.AddTestCase("%DB4:26:UDINT", 4242442424)
+ // Not supported in S7 1200
+ //test.AddTestCase("%DB4:30:LINT", -4242442424242424242L);
+ // Not supported in S7 1200
+ //test.AddTestCase("%DB4:38:ULINT", 4242442424242424242L);
+ test.AddTestCase("%DB4:46:REAL", 3.141593)
+ // Not supported in S7 1200
+ //test.AddTestCase("%DB4:50:LREAL", 2.71828182846D);
+ test.AddTestCase("%DB4:58:TIME", "PT1.234S")
+ // Not supported in S7 1200
+ //test.AddTestCase("%DB4:62:LTIME", "PT24015H23M12.034002044S");
+ test.AddTestCase("%DB4:70:DATE", "1998-03-28")
+ test.AddTestCase("%DB4:72:TIME_OF_DAY", "15:36:30.123")
+ test.AddTestCase("%DB4:76:TOD", "16:17:18.123")
+ // Not supported in S7 1200
+ //test.AddTestCase("%DB4:96:DATE_AND_TIME", "1996-05-06T15:36:30");
+ // Not supported in S7 1200
+ //test.AddTestCase("%DB4:104:DT", "1992-03-29T00:00");
+ // Not supported in S7 1200
+ //test.AddTestCase("%DB4:112:LDATE_AND_TIME", "1978-03-28T15:36:30");
+ // Not supported in S7 1200
+ //test.AddTestCase("%DB4:124:LDT", "1978-03-28T15:36:30");
+ test.AddTestCase("%DB4:136:CHAR", "H")
+ test.AddTestCase("%DB4:138:WCHAR", "w")
+ test.AddTestCase("%DB4:140:STRING(10)", "hurz")
+ test.AddTestCase("%DB4:396:WSTRING(10)", "wolf")
+
+ test.Run()
+}
diff --git a/plc4go/internal/plc4go/s7/MessageCodec.go b/plc4go/internal/plc4go/s7/MessageCodec.go
index 4c3bdf9..c0abfd8 100644
--- a/plc4go/internal/plc4go/s7/MessageCodec.go
+++ b/plc4go/internal/plc4go/s7/MessageCodec.go
@@ -63,17 +63,16 @@ func (m *MessageCodec) Send(message interface{}) error {
func (m *MessageCodec) Receive() (interface{}, error) {
log.Trace().Msg("receiving")
// We need at least 6 bytes in order to know how big the packet is in total
- if num, err := m.TransportInstance.GetNumReadableBytes(); (err == nil) && (num >= 6) {
+ if num, err := m.TransportInstance.GetNumReadableBytes(); (err == nil) && (num >= 4) {
log.Debug().Msgf("we got %d readable bytes", num)
- data, err := m.TransportInstance.PeekReadableBytes(6)
+ data, err := m.TransportInstance.PeekReadableBytes(4)
if err != nil {
log.Warn().Err(err).Msg("error peeking")
// TODO: Possibly clean up ...
return nil, nil
}
// Get the size of the entire packet
- // TODO: wrong size for s7
- packetSize := (uint32(data[4]) << 8) + uint32(data[5]) + 6
+ packetSize := (uint32(data[2]) << 8) + uint32(data[3]) + 4
if num < packetSize {
log.Debug().Msgf("Not enough bytes. Got: %d Need: %d\n", num, packetSize)
return nil, nil
diff --git a/plc4go/internal/plc4go/spi/transports/test/Transport.go b/plc4go/internal/plc4go/spi/transports/test/Transport.go
index 7ca1124..07ba13e 100644
--- a/plc4go/internal/plc4go/spi/transports/test/Transport.go
+++ b/plc4go/internal/plc4go/spi/transports/test/Transport.go
@@ -79,8 +79,9 @@ func (m *TransportInstance) Close() error {
}
func (m *TransportInstance) GetNumReadableBytes() (uint32, error) {
- log.Trace().Msg("get number of readable bytes")
- return uint32(len(m.readBuffer)), nil
+ readableBytes := len(m.readBuffer)
+ log.Trace().Msgf("return number of readable bytes %d", readableBytes)
+ return uint32(readableBytes), nil
}
func (m *TransportInstance) PeekReadableBytes(numBytes uint32) ([]uint8, error) {