From feb09b14aed65a0c65564d7939994495d7d51d2b Mon Sep 17 00:00:00 2001
From: iioter <535915157@qq.com>
Date: Mon, 22 Aug 2022 12:45:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A5=BF=E9=97=A8=E5=AD=90=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E4=B8=A4=E7=A7=8D=E5=AD=97=E7=AC=A6=E4=B8=B2=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E5=92=8C=E4=B8=8B=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IoTGateway/iotgateway.db                     | Bin 311296 -> 311296 bytes
 Plugins/Drivers/DriverSiemensS7/SiemensS7.cs |  93 ++++++++++++++-----
 2 files changed, 71 insertions(+), 22 deletions(-)

diff --git a/IoTGateway/iotgateway.db b/IoTGateway/iotgateway.db
index 5727705d0c922262b772fbf6d0cf440055169a8f..c24e360fab02b6d1b003f5a040e5fddc8f90f5f4 100644
GIT binary patch
delta 886
zcma))Pe>F|9LIOwzWq1un~64a6=8E-$u(zr^JZpeX2aN-o!Pb61xc1JYb5MuhFH2Q
z(ZN)*Iz(Xv4%xwu5||g^(V>$BMG)1+qEkXQ&z?FoZb@Jl;dl65e&6qhAD{X8$h<p?
z%qD=@6Or(qhu`K}(H2@kQ)m#y!h6oiERbn23tonwE<J|M%q%R?LJ7Pvqb#%G@vZqn
z@H(^MeedlB5BUm5xmMb_1d@Ib_(BWI;A5b;5R0<qP_Eo2=0YAKDnzq&OUUVpD9AZE
zCun)g5NzExq`YBD7~2FBB4AA*<djG<GRcTaO41coRW#@G1V}hT4hYQE8`I;HWARK}
zB$BMeXAfOT8LXw!l8z;nEX3RX5U4IeJ}qn5#HOGbrs@)CX+cvgA}GXGY$<PQicSt?
z;S5QqRFx1Fr->~Zs;W!Qw+YbMBuSaK8@1sBnntbO_z$KTplevevhtv^3TS23yY`|l
z;@<)MT|UG;;yTb1bUeHqKHc)RWt9El-wAyPT@9v#&jX(V<LoV(%EC=QT7Y4;%ycKq
zDA^Ts+AqUI2WM2P)3tiNzgU~JOcCRhWts%{i@5o#=*8M-^&jBBjgA-KGsee`d8$F@
z>>xZt$$6+SMQ+h^jOmG$QCE8~pH}p15w{U_mr-kb&@hOGr5q9Rc{MG_x|kO<3u8gD
zP0_-NWgDW!9Y9!r3E(~f{eA%^eSQ0ep<NW??{nvPnOj0rd<#Fqz2?928{AHK4{dQ{
zu74|Nkfw&<yQXqIM`?}F*a-XyqAZGe&<bC1^^Lg#@A9wsZM4PTqn%gaFT@m_p=FSu
z1Cy|uDIG<{Xs@@-9K{%C{RX_mu+(=GMmV=;-%~np$L(=uN+7{Rov9M&rR#HWIQtvQ
CQQ`pr

delta 723
zcma))&r4KM6vusc?l^CL-1lHa977lzr~J{p>Aw4Z%~OmS=Z7X*(loSDXu#JnQKr*G
zL6k<4i%2ZPiv}8$;3AV?;L;*mNKgb(D}z=Bg$wHs2p7HCwCD%KIot2~o^w9msj0dt
zyQjGdfN{Sc1#84Dp&o6bB{YHhP>=@VKxO@L@WeNdo7?B-W+DAC0K%+y5WMIK@Z3g?
zbIs|7XSof>8%G<sEe;Eh&>m}=1MRiI-N<?uz&n?sNNOsrOQuc|lB$~6Ff`4KB{0E+
zNH``DxtWkoj5|pzsvCx>Xd2BQ2jR)frDEB-8oFqePg>{4tx~>xsbqyZLqrc<`<vLn
zsw~UohTh=Gxs$nut^}{BDGm1|m6ViDWzv#rD5jJkrYspoOv_|QQcfAlpR@F+YUnVg
z$b{yXfl3eG10MQq5%8_Qud5hX&KfeoxOwO0^4HnbFOQ$?R90t(R{$GcajZS;@VkmY
zyeYbcJHkG67x{e)zE<xmZ{D-*DY)Od&+t0`!1dl$bj-7899C-WSI@9wFI?oD!gS3j
zPrLfyAx4fujq_gdd2-x=U=HnXq~9~}V1245k}c;;<;Z|FCSx2SIHF+s;T#BiPFVTT
zY`Ih%E3i-fu-(~F1&nr4P`o7^5mjLhO^9A`M0hTK6gPy=Xj3TI@Rv}ZP+-v^`1%)f
z)-nROL4dEytH}u3+1M4Iid%M4>|#x);U3}^>Cl25jqWkn!VM~>kx8eMvLtKTzwigz
s969cP@X+-O@D#^0=QykrY@h0Ntoyp{L+>90VJ<)?20<HJpM=@?Pqr4q9RL6T

diff --git a/Plugins/Drivers/DriverSiemensS7/SiemensS7.cs b/Plugins/Drivers/DriverSiemensS7/SiemensS7.cs
index 20a5307..db60b66 100644
--- a/Plugins/Drivers/DriverSiemensS7/SiemensS7.cs
+++ b/Plugins/Drivers/DriverSiemensS7/SiemensS7.cs
@@ -2,6 +2,8 @@
 using S7.Net;
 using System.Text;
 using Microsoft.Extensions.Logging;
+using System;
+using S7.Net.Types;
 
 namespace DriverSiemensS7
 {
@@ -102,7 +104,15 @@ namespace DriverSiemensS7
             {
                 try
                 {
-                    ret.Value = plc.Read(ioarg.Address);
+                    if (ioarg.ValueType == DataTypeEnum.AsciiString)
+                    {
+                        var dataItem = S7.Net.Types.DataItem.FromAddress(ioarg.Address);
+                        var head = plc.ReadBytes(dataItem.DataType, dataItem.DB, dataItem.StartByteAdr, 2);
+                        var strBytes = plc.ReadBytes(dataItem.DataType, dataItem.DB, dataItem.StartByteAdr + 2, head[1]);
+                        ret.Value = Encoding.ASCII.GetString(strBytes).TrimEnd(new char[] { '\0' }); ;
+                    }
+                    else
+                        ret.Value = plc.Read(ioarg.Address);
                     if (ioarg.ValueType == DataTypeEnum.Float)
                     {
                         var buffer = new byte[4];
@@ -129,22 +139,25 @@ namespace DriverSiemensS7
             return ret;
         }
 
-        [Method("读字符串", description: "读字符串")]
-        public DriverReturnValueModel ReadString(DriverAddressIoArgModel ioarg)
+        [Method("读西门子字节字符串", description: "DB10.DBW6,10  即开始地址，字节长度")]
+        public DriverReturnValueModel ReadByteString(DriverAddressIoArgModel ioarg)
         {
             var ret = new DriverReturnValueModel { StatusType = VaribaleStatusTypeEnum.Good };
 
             if (plc != null && plc.IsConnected)
             {
+                var str = string.Empty;
                 try
                 {
-                    int db = int.Parse(ioarg.Address.Trim().Split(',')[0]);
-                    int startAdr = int.Parse(ioarg.Address.Trim().Split(',')[1]);
-                    int count = int.Parse(ioarg.Address.Trim().Split(',')[2]);
-                    var buffers = plc.ReadBytes(DataType.DataBlock, db, startAdr, count);
-                    var str = Encoding.ASCII.GetString(buffers);
-                    if (str.Contains('\0'))
-                        str = str.Split('\0')[0];
+                    var arrParams = ioarg.Address.Trim().Split(',');
+                    if (arrParams.Length ==2)
+                    {
+                        var dataItemitem = S7.Net.Types.DataItem.FromAddress(arrParams[0]);
+                        int.TryParse(arrParams[1], out var length);
+
+                        var data = plc.ReadBytes(dataItemitem.DataType, dataItemitem.DB, dataItemitem.StartByteAdr, length);
+                        str = Encoding.ASCII.GetString(data).TrimEnd(new char[] { '\0' });
+                    }
                     ret.Value = str;
                 }
                 catch (Exception ex)
@@ -260,7 +273,7 @@ namespace DriverSiemensS7
                             toWrite = float.Parse(ioarg.Value.ToString());
                             break;
                         case DataTypeEnum.AsciiString:
-                            toWrite = Encoding.ASCII.GetBytes(ioarg.Value.ToString());
+                            toWrite = GetStringBytes(ioarg);
                             break;
                         default:
                             rpcResponse.Description = $"类型{DataTypeEnum.Float}不支持写入";
@@ -268,7 +281,10 @@ namespace DriverSiemensS7
                     }
 
                     if (toWrite == null)
+                    {
+                        rpcResponse.Description = "解析错误";
                         return rpcResponse;
+                    }
 
                     //通用方法
                     if (method == nameof(Read))
@@ -279,18 +295,16 @@ namespace DriverSiemensS7
                         return rpcResponse;
                     }
                     //字符串
-                    else if (method == nameof(ReadString))
+                    else if (method == nameof(ReadByteString))
                     {
-                        int db = int.Parse(ioarg.Address.Trim().Split(',')[0]);
-                        int startAdr = int.Parse(ioarg.Address.Trim().Split(',')[1]);
-                        int count = int.Parse(ioarg.Address.Trim().Split(',')[2]);
-                        //防止写入到其他地址 进行截断
-                        if (((byte[])toWrite).Length > count)
-                            toWrite = ((byte[])toWrite).Take(count);
-                        plc?.Write(DataType.DataBlock, db, startAdr, toWrite);
-
-                        rpcResponse.IsSuccess = true;
-                        return rpcResponse;
+                        var arrParams = ioarg.Address.Trim().Split(',');
+                        if (arrParams.Length == 2)
+                        {
+                            var dataItem = DataItem.FromAddress(arrParams[0]);
+                            plc?.Write(dataItem.DataType, dataItem.DB, dataItem.StartByteAdr, toWrite);
+                            rpcResponse.IsSuccess = true;
+                            return rpcResponse;
+                        }
                     }
                     else
                         rpcResponse.Description = $"不支持写入:{method}";
@@ -303,5 +317,40 @@ namespace DriverSiemensS7
 
             return rpcResponse;
         }
+
+        private byte[]? GetStringBytes(DriverAddressIoArgModel ioarg)
+        {
+            var toWriteString = ioarg.Value.ToString();
+            try
+            {
+                var arrParams = ioarg.Address.Trim().Split(',');
+                int length = 0;//最大长度，因为字符串后面得补满'\0'
+                //直接读取byte[]的方式
+                if (arrParams.Length == 2)
+                {
+                    //如DB100.DBW23,10
+                    int.TryParse(arrParams[1], out length);
+                }
+                //使用西门子String读取
+                else
+                {
+                    //如DB100.DBW23
+                    var dataItem = DataItem.FromAddress(ioarg.Address);
+                    var head = plc.ReadBytes(dataItem.DataType, dataItem.DB, dataItem.StartByteAdr, 2);
+                    length = head[0];
+                }
+
+                if (toWriteString.Length > length)
+                    toWriteString = toWriteString.Take(length).ToString();
+                if (toWriteString.Length < length)
+                    toWriteString = toWriteString.PadRight(length, '\0');
+            }
+            catch (Exception e)
+            {
+                throw new Exception("字符串解析异常");
+            }
+
+            return Encoding.ASCII.GetBytes(toWriteString);
+        }
     }
 }
\ No newline at end of file