g82tt/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-10-29 14:43:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

调整解析寄存器地址规则

Browse Source
This commit is contained in:
Kimdiego2098
2024-01-21 21:17:07 +08:00
parent 16ff538804
commit eccec85ea6
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/foundation/ThingsGateway.Foundation.Dlt645/src/DLT645/Dlt645_2007Master.cs
View File

@@ -482,7 +482,7 @@ internal class DtuPlugin : PluginBase, ITcpReceivingPlugin
if (!socket.Id.StartsWith("ID="))
{
ByteBlock byteBlock = e.ByteBlock;
var id = $"ID={Encoding.UTF8.GetString(byteBlock.ToArray()).ToLower()}";
var id = $"ID={Encoding.UTF8.GetString(byteBlock.ToArray())}";
client.Logger.Info(string.Format(DltConst.DtuConnected, id));
socket.ResetId(id);
}

2
src/foundation/ThingsGateway.Foundation.Modbus/src/Master/ModbusMaster.cs
View File

@@ -351,7 +351,7 @@ internal class DtuPlugin : PluginBase, ITcpReceivingPlugin
if (!socket.Id.StartsWith("ID="))
{
ByteBlock byteBlock = e.ByteBlock;
var id = $"ID={Encoding.UTF8.GetString(byteBlock.ToArray()).ToLower()}";
var id = $"ID={Encoding.UTF8.GetString(byteBlock.ToArray())}";
client.Logger.Info(string.Format(ModbusConst.DtuConnected, id));
socket.ResetId(id);
}

12
src/foundation/ThingsGateway.Foundation/src/Utils/ByteTransUtil.cs
View File

@@ -65,7 +65,7 @@ public class ByteTransUtil
return cachedConverter!.CopyNew();
}
registerAddress = registerAddress.Trim().ToLower();
registerAddress = registerAddress.Trim();
var strs = registerAddress.SplitStringBySemicolon();
@@ -77,27 +77,27 @@ public class ByteTransUtil
StringBuilder sb = new();
foreach (var str in strs)
{
if (str.StartsWith("data="))
if (str.ToLower().StartsWith("data="))
{
var dataFormatName = str.Substring(5);
try { if (Enum.TryParse<DataFormatEnum>(dataFormatName, true, out var dataFormat1)) dataFormat = dataFormat1; } catch { }
}
else if (str.StartsWith("encoding="))
else if (str.ToLower().StartsWith("encoding="))
{
var encodingName = str.Substring(9);
try { encoding = Encoding.GetEncoding(encodingName); } catch { }
}
else if (str.StartsWith("len="))
else if (str.ToLower().StartsWith("len="))
{
var lenStr = str.Substring(4);
stringlength = lenStr.IsNullOrEmpty() ? null : Convert.ToUInt16(lenStr);
}
else if (str.StartsWith("arraylen="))
else if (str.ToLower().StartsWith("arraylen="))
{
var lenStr = str.Substring(9);
length = lenStr.IsNullOrEmpty() ? null : Convert.ToUInt16(lenStr);
}
else if (str.StartsWith("bcd="))
else if (str.ToLower().StartsWith("bcd="))
{
var bcdName = str.Substring(4);
try { if (Enum.TryParse<BcdFormatEnum>(bcdName, true, out var bcdFormat1)) bcdFormat = bcdFormat1; } catch { }