支持读取String类型的地址数据:DB1015.STRING0.60

Author: zwllh123

NewLife.Siemens/Drivers/SiemensS7Driver.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using System.Text;
 using NewLife.IoT;
 using NewLife.IoT.Drivers;
 using NewLife.IoT.ThingModels;
@@ -148,10 +149,20 @@ public override void Close(INode node)
             // 借助物模型转换数据类型
             if (point.GetNetType() != null)
             {
-                if (spec != null)
-                    dic[name] = spec.DecodeByThingModel(data, point);
+                //类型string的时候直接返回ToHex
+                if (point.GetNetType() == typeof(string))
+                {
+                    //默认去除返回的3C1E开始的通讯分隔符
+                    dic[name] = data.ToStr(Encoding.UTF8, 2);
+                }
                 else
-                    dic[name] = point.Convert(data.Swap(true, true));
+                {
+                    if (spec != null)
+                        dic[name] = spec.DecodeByThingModel(data, point);
+                    else
+                        dic[name] = point.Convert(data.Swap(true, true));
+
+                }
             }
             else
                 dic[name] = data;

NewLife.Siemens/NewLife.Siemens.csproj

@@ -58,8 +58,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.10.2024.902" />
-    <PackageReference Include="NewLife.IoT" Version="2.2.2024.706" />
+    <PackageReference Include="NewLife.Core" Version="11.4.2025.201" />
+    <PackageReference Include="NewLife.IoT" Version="2.4.2025.203" />
   </ItemGroup>
 
   <ItemGroup>

NewLife.Siemens/Protocols/PLCAddress.cs

@@ -51,32 +51,43 @@ public static void Parse(String input, out DataType dataType, out Int32 dbNumber
                 var strings = input.Split(['.']);
                 if (strings.Length < 2)
                     throw new InvalidDataException("To few periods for DB address");
+                //数据块字节
+                if (strings.Length == 2)
+                {
+                    dataType = DataType.DataBlock;
+                    dbNumber = Int32.Parse(strings[0][2..]);
+                    address = Int32.Parse(strings[1][3..]);
 
-                dataType = DataType.DataBlock;
-                dbNumber = Int32.Parse(strings[0][2..]);
-                address = Int32.Parse(strings[1][3..]);
-
-                var dbType = strings[1][..3];
-                switch (dbType)
+                    var dbType = strings[1][..3];
+                    switch (dbType)
+                    {
+                        case "DBB":
+                            varType = VarType.Byte;
+                            return;
+                        case "DBW":
+                            varType = VarType.Word;
+                            return;
+                        case "DBD":
+                            varType = VarType.DWord;
+                            return;
+                        case "DBX":
+                            bitNumber = Int32.Parse(strings[2]);
+                            if (bitNumber > 7)
+                                throw new InvalidDataException("Bit can only be 0-7");
+                            varType = VarType.Bit;
+                            return;
+                        default:
+                            throw new InvalidDataException();
+                    }
+                }
+                else //字符串处理
                 {
-                    case "DBB":
-                        varType = VarType.Byte;
-                        return;
-                    case "DBW":
-                        varType = VarType.Word;
-                        return;
-                    case "DBD":
-                        varType = VarType.DWord;
-                        return;
-                    case "DBX":
-                        bitNumber = Int32.Parse(strings[2]);
-                        if (bitNumber > 7)
-                            throw new InvalidDataException("Bit can only be 0-7");
-                        varType = VarType.Bit;
-                        return;
-                    default:
-                        throw new InvalidDataException();
+                    dataType = DataType.DataBlock;
+                    dbNumber = Int32.Parse(strings[0][2..]);
+                    address = Int32.Parse(strings[1][6..]);
+                    varType = VarType.String;
                 }
+                break;
             case "IB":
             case "EB":
                 // Input byte

TestClient/FrmMain.cs

@@ -1,4 +1,5 @@
-using NewLife.IoT.ThingModels;
+using NewLife;
+using NewLife.IoT.ThingModels;
 using NewLife.Log;
 using NewLife.Serialization;
 using NewLife.Siemens.Drivers;