From a7162ebf7075e0fb78683d583e8a2278967ba74b Mon Sep 17 00:00:00 2001
From: "parallelbgls@outlook.com" <parallelbgls@outlook.com>
Date: Sat, 30 Jan 2016 12:02:46 +0800
Subject: [PATCH] 2016-01-30 update 1

---
 .../ModBus.Net/Properties/AssemblyInfo.cs     |  4 +-
 .../Modbus.Net.Siemens/SiemensUtility.cs      | 57 +++++++++++--------
 2 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/Modbus.Net/ModBus.Net/Properties/AssemblyInfo.cs b/Modbus.Net/ModBus.Net/Properties/AssemblyInfo.cs
index aab8aee..1c4f942 100644
--- a/Modbus.Net/ModBus.Net/Properties/AssemblyInfo.cs
+++ b/Modbus.Net/ModBus.Net/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@ using System.Runtime.InteropServices;
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("0.4.5.0128")]
-[assembly: AssemblyFileVersion("0.4.5.0128")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.0.0.1")]
+[assembly: AssemblyFileVersion("1.0.0.1")]
\ No newline at end of file
diff --git a/Modbus.Net/Modbus.Net.Siemens/SiemensUtility.cs b/Modbus.Net/Modbus.Net.Siemens/SiemensUtility.cs
index 1ae9f4e..6bfa118 100644
--- a/Modbus.Net/Modbus.Net.Siemens/SiemensUtility.cs
+++ b/Modbus.Net/Modbus.Net.Siemens/SiemensUtility.cs
@@ -66,38 +66,47 @@ namespace ModBus.Net.Siemens
             switch (model)
             {
                 case SiemensMachineModel.S7_200:
-                    {
-                        _tdpuSize = 0x09;
-                        _taspSrc = 0x1001;
-                        _tsapDst = 0x1000;
-                        _maxCalling = 0x0001;
-                        _maxCalled = 0x0001;
-                        _maxPdu = 0x03c0;
-                        break;
-                    }
-                case SiemensMachineModel.S7_300:
-                case SiemensMachineModel.S7_400:
-                    {
-                        _tdpuSize = 0x1a;
-                        _taspSrc = 0x4b54;
-                        _tsapDst = 0x0302;
-                        _maxCalling = 0x0001;
-                        _maxCalled = 0x0001;
-                        _maxPdu = 0x00f0;
-                        break;
-                    }
-                case SiemensMachineModel.S7_1200:
-                case SiemensMachineModel.S7_1500:
-                case SiemensMachineModel.S7_200_Smart:
                 {
                     _tdpuSize = 0x09;
+                    _taspSrc = 0x1001;
+                    _tsapDst = 0x1000;
+                    _maxCalling = 0x0001;
+                    _maxCalled = 0x0001;
+                    _maxPdu = 0x03c0;
+                    break;
+                }
+                case SiemensMachineModel.S7_300:
+                case SiemensMachineModel.S7_400:
+                {
+                    _tdpuSize = 0x1a;
                     _taspSrc = 0x4b54;
-                    _tsapDst = 0x0300;
+                    _tsapDst = 0x0302;
                     _maxCalling = 0x0001;
                     _maxCalled = 0x0001;
                     _maxPdu = 0x00f0;
                     break;
                 }
+                case SiemensMachineModel.S7_1200:
+                case SiemensMachineModel.S7_1500:
+                {
+                    _tdpuSize = 0x0a;
+                    _taspSrc = 0x1011;
+                    _tsapDst = 0x0301;
+                    _maxCalling = 0x0003;
+                    _maxCalled = 0x0003;
+                    _maxPdu = 0x0100;
+                    break;
+                }
+                case SiemensMachineModel.S7_200_Smart:
+                {
+                    _tdpuSize = 0x0a;
+                    _taspSrc = 0x0101;
+                    _tsapDst = 0x0101;
+                    _maxCalling = 0x0001;
+                    _maxCalled = 0x0001;
+                    _maxPdu = 0x03c0;
+                    break;
+                }
                 default:
                 {
                     throw new NotImplementedException("没有相应的西门子类型");