From 514dde365e8ce3e0d3cb423eeb4a67abf56ac4d9 Mon Sep 17 00:00:00 2001 From: Michael Croes Date: Tue, 26 Jun 2018 20:10:28 +0200 Subject: [PATCH] Cleanup TSAP parameters - Remove duplicate parameter code / length (already in initial array) - Remove separate branch for S7-400 (same as S7-300/1200) - Change all values to 2-character hex --- S7.Net/Protocol/ConnectionRequest.cs | 49 ++++++++-------------------- 1 file changed, 13 insertions(+), 36 deletions(-) diff --git a/S7.Net/Protocol/ConnectionRequest.cs b/S7.Net/Protocol/ConnectionRequest.cs index 1d20a20..f2403b2 100644 --- a/S7.Net/Protocol/ConnectionRequest.cs +++ b/S7.Net/Protocol/ConnectionRequest.cs @@ -28,52 +28,29 @@ namespace S7.Net.Protocol { case CpuType.S7200: //S7200: Chr(193) & Chr(2) & Chr(16) & Chr(0) 'Eigener Tsap - bSend1[11] = 193; - bSend1[12] = 2; - bSend1[13] = 16; - bSend1[14] = 0; + bSend1[13] = 0x10; + bSend1[14] = 0x00; //S7200: Chr(194) & Chr(2) & Chr(16) & Chr(0) 'Fremder Tsap - bSend1[15] = 194; - bSend1[16] = 2; - bSend1[17] = 16; - bSend1[18] = 0; + bSend1[17] = 0x10; + bSend1[18] = 0x00; break; case CpuType.S71200: case CpuType.S7300: - //S7300: Chr(193) & Chr(2) & Chr(1) & Chr(0) 'Eigener Tsap - bSend1[11] = 193; - bSend1[12] = 2; - bSend1[13] = 1; - bSend1[14] = 0; - //S7300: Chr(194) & Chr(2) & Chr(3) & Chr(2) 'Fremder Tsap - bSend1[15] = 194; - bSend1[16] = 2; - bSend1[17] = 3; - bSend1[18] = (byte)(rack * 2 * 16 + slot); - break; case CpuType.S7400: - //S7400: Chr(193) & Chr(2) & Chr(1) & Chr(0) 'Eigener Tsap - bSend1[11] = 193; - bSend1[12] = 2; - bSend1[13] = 1; - bSend1[14] = 0; - //S7400: Chr(194) & Chr(2) & Chr(3) & Chr(3) 'Fremder Tsap - bSend1[15] = 194; - bSend1[16] = 2; - bSend1[17] = 3; - bSend1[18] = (byte)(rack * 2 * 16 + slot); + //S7300: Chr(193) & Chr(2) & Chr(1) & Chr(0) 'Eigener Tsap + bSend1[13] = 0x01; + bSend1[14] = 0x00; + //S7300: Chr(194) & Chr(2) & Chr(3) & Chr(2) 'Fremder Tsap + bSend1[17] = 0x03; + bSend1[18] = (byte) ((rack << 5) | (int) slot); break; case CpuType.S71500: // Eigener Tsap - bSend1[11] = 193; - bSend1[12] = 2; bSend1[13] = 0x10; - bSend1[14] = 0x2; + bSend1[14] = 0x02; // Fredmer Tsap - bSend1[15] = 194; - bSend1[16] = 2; - bSend1[17] = 0x3; - bSend1[18] = (byte)(rack * 2 * 16 + slot); + bSend1[17] = 0x03; + bSend1[18] = (byte) ((rack << 5) | (int) slot); break; default: throw new Exception("Wrong CPU Type Secified");