luosheng/Modbus.Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
luosheng
2023-09-08 09:45:16 +08:00
parent fac39b0bf1
commit 511434d18a
4 changed files with 101 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
Modbus.Net/Modbus.Net.Modbus/ModbusController.cs
View File

@@ -23,9 +23,9 @@ namespace Modbus.Net.Modbus
}; };
/// <summary> /// <summary>
/// Modbus Rtu协议长度计算 /// Modbus Rtu接收协议长度计算
/// </summary> /// </summary>
public static Func<byte[], int> ModbusRtuLengthCalc => content => public static Func<byte[], int> ModbusRtuResponseLengthCalc => (content) =>
{ {
if (content[1] > 128) return 5; if (content[1] > 128) return 5;
else if (content[1] == 5 || content[1] == 6 || content[1] == 8 || content[1] == 11 || content[1] == 15 || content[1] == 16) return 8; else if (content[1] == 5 || content[1] == 6 || content[1] == 8 || content[1] == 11 || content[1] == 15 || content[1] == 16) return 8;
@@ -33,6 +33,20 @@ namespace Modbus.Net.Modbus
else if (content[1] == 22) return 10; else if (content[1] == 22) return 10;
else return DuplicateWithCount.GetDuplcateFunc(new List<int> { 2 }, 5).Invoke(content); else return DuplicateWithCount.GetDuplcateFunc(new List<int> { 2 }, 5).Invoke(content);
}; };
/// <summary>
/// Modbus Rtu发送协议长度计算
/// </summary>
public static Func<byte[], int> ModbusRtuRequestLengthCalc => (content) =>
{
if (content[1] == 1 || content[1] == 2 || content[1] == 3 || content[1] == 4 || content[1] == 5 || content[1] == 6 || content[1] == 8) return 8;
else if (content[1] == 7 || content[1] == 11 || content[1] == 12 || content[1] == 17) return 4;
else if (content[1] == 15 || content[1] == 16) { return DuplicateWithCount.GetDuplcateFunc(new List<int> { 6 }, 9).Invoke(content); }
else if (content[1] == 22) return 10;
else if (content[1] == 23) return 19;
else if (content[1] == 24) return 6;
else return DuplicateWithCount.GetDuplcateFunc(new List<int> { 2 }, 5).Invoke(content);
};
} }
/// <summary> /// <summary>
@@ -97,7 +111,7 @@ namespace Modbus.Net.Modbus
} }
/// <summary> /// <summary>
/// Modbus Rtu协议控制器 /// Modbus Rtu发送协议控制器
/// </summary> /// </summary>
public class ModbusRtuController : FifoController public class ModbusRtuController : FifoController
{ {
@@ -108,7 +122,7 @@ namespace Modbus.Net.Modbus
/// <param name="slaveAddress">从站号</param> /// <param name="slaveAddress">从站号</param>
public ModbusRtuController(string com, int slaveAddress) : base( public ModbusRtuController(string com, int slaveAddress) : base(
int.Parse(ConfigurationReader.GetValue("COM:" + com + ":" + slaveAddress, "FetchSleepTime")), int.Parse(ConfigurationReader.GetValue("COM:" + com + ":" + slaveAddress, "FetchSleepTime")),
lengthCalc: ModbusLengthCalc.ModbusRtuLengthCalc, lengthCalc: ModbusLengthCalc.ModbusRtuResponseLengthCalc,
checkRightFunc: ContentCheck.Crc16CheckRight, checkRightFunc: ContentCheck.Crc16CheckRight,
waitingListMaxCount: ConfigurationReader.GetValue("COM:" + com + ":" + slaveAddress, "WaitingListCount") != null ? waitingListMaxCount: ConfigurationReader.GetValue("COM:" + com + ":" + slaveAddress, "WaitingListCount") != null ?
int.Parse(ConfigurationReader.GetValue("COM:" + com + ":" + slaveAddress, "WaitingListCount")) : int.Parse(ConfigurationReader.GetValue("COM:" + com + ":" + slaveAddress, "WaitingListCount")) :
@@ -118,7 +132,28 @@ namespace Modbus.Net.Modbus
} }
/// <summary> /// <summary>
/// Modbus Rtu in Tcp协议控制器 /// Modbus Rtu接收协议控制器
/// </summary>
public class ModbusRtuResponseController : FifoController
{
/// <summary>
/// 构造函数
/// </summary>
/// <param name="com">串口</param>
/// <param name="slaveAddress">从站号</param>
public ModbusRtuResponseController(string com, int slaveAddress) : base(
int.Parse(ConfigurationReader.GetValue("COM:" + com + ":" + slaveAddress, "FetchSleepTime")),
lengthCalc: ModbusLengthCalc.ModbusRtuRequestLengthCalc,
checkRightFunc: ContentCheck.Crc16CheckRight,
waitingListMaxCount: ConfigurationReader.GetValue("COM:" + com + ":" + slaveAddress, "WaitingListCount") != null ?
int.Parse(ConfigurationReader.GetValue("COM:" + com + ":" + slaveAddress, "WaitingListCount")) :
null
)
{ }
}
/// <summary>
/// Modbus Rtu in Tcp发送协议控制器
/// </summary> /// </summary>
public class ModbusRtuInTcpController : FifoController public class ModbusRtuInTcpController : FifoController
{ {
@@ -129,7 +164,7 @@ namespace Modbus.Net.Modbus
/// <param name="port">端口号</param> /// <param name="port">端口号</param>
public ModbusRtuInTcpController(string ip, int port) : base( public ModbusRtuInTcpController(string ip, int port) : base(
int.Parse(ConfigurationReader.GetValue("TCP:" + ip + ":" + port, "FetchSleepTime")), int.Parse(ConfigurationReader.GetValue("TCP:" + ip + ":" + port, "FetchSleepTime")),
lengthCalc: ModbusLengthCalc.ModbusRtuLengthCalc, lengthCalc: ModbusLengthCalc.ModbusRtuResponseLengthCalc,
checkRightFunc: ContentCheck.Crc16CheckRight, checkRightFunc: ContentCheck.Crc16CheckRight,
waitingListMaxCount: ConfigurationReader.GetValue("TCP:" + ip + ":" + port, "WaitingListCount") != null ? waitingListMaxCount: ConfigurationReader.GetValue("TCP:" + ip + ":" + port, "WaitingListCount") != null ?
int.Parse(ConfigurationReader.GetValue("TCP:" + ip + ":" + port, "WaitingListCount")) : int.Parse(ConfigurationReader.GetValue("TCP:" + ip + ":" + port, "WaitingListCount")) :
@@ -139,7 +174,28 @@ namespace Modbus.Net.Modbus
} }
/// <summary> /// <summary>
/// Modbus Rtu in Udp协议控制器 /// Modbus Rtu in Tcp接收协议控制器
/// </summary>
public class ModbusRtuInTcpResponseController : FifoController
{
/// <summary>
/// 构造函数
/// </summary>
/// <param name="ip">ip地址</param>
/// <param name="port">端口号</param>
public ModbusRtuInTcpResponseController(string ip, int port) : base(
int.Parse(ConfigurationReader.GetValue("TCP:" + ip + ":" + port, "FetchSleepTime")),
lengthCalc: ModbusLengthCalc.ModbusRtuRequestLengthCalc,
checkRightFunc: ContentCheck.Crc16CheckRight,
waitingListMaxCount: ConfigurationReader.GetValue("TCP:" + ip + ":" + port, "WaitingListCount") != null ?
int.Parse(ConfigurationReader.GetValue("TCP:" + ip + ":" + port, "WaitingListCount")) :
null
)
{ }
}
/// <summary>
/// Modbus Rtu in Udp发送协议控制器
/// </summary> /// </summary>
public class ModbusRtuInUdpController : FifoController public class ModbusRtuInUdpController : FifoController
{ {
@@ -150,7 +206,28 @@ namespace Modbus.Net.Modbus
/// <param name="port">端口号</param> /// <param name="port">端口号</param>
public ModbusRtuInUdpController(string ip, int port) : base( public ModbusRtuInUdpController(string ip, int port) : base(
int.Parse(ConfigurationReader.GetValue("UDP:" + ip + ":" + port, "FetchSleepTime")), int.Parse(ConfigurationReader.GetValue("UDP:" + ip + ":" + port, "FetchSleepTime")),
lengthCalc: ModbusLengthCalc.ModbusRtuLengthCalc, lengthCalc: ModbusLengthCalc.ModbusRtuResponseLengthCalc,
checkRightFunc: ContentCheck.Crc16CheckRight,
waitingListMaxCount: ConfigurationReader.GetValue("UDP:" + ip + ":" + port, "WaitingListCount") != null ?
int.Parse(ConfigurationReader.GetValue("UDP:" + ip + ":" + port, "WaitingListCount")) :
null
)
{ }
}
/// <summary>
/// Modbus Rtu in Udp接收协议控制器
/// </summary>
public class ModbusRtuInUdpResponseController : FifoController
{
/// <summary>
/// 构造函数
/// </summary>
/// <param name="ip">ip地址</param>
/// <param name="port">端口号</param>
public ModbusRtuInUdpResponseController(string ip, int port) : base(
int.Parse(ConfigurationReader.GetValue("UDP:" + ip + ":" + port, "FetchSleepTime")),
lengthCalc: ModbusLengthCalc.ModbusRtuRequestLengthCalc,
checkRightFunc: ContentCheck.Crc16CheckRight, checkRightFunc: ContentCheck.Crc16CheckRight,
waitingListMaxCount: ConfigurationReader.GetValue("UDP:" + ip + ":" + port, "WaitingListCount") != null ? waitingListMaxCount: ConfigurationReader.GetValue("UDP:" + ip + ":" + port, "WaitingListCount") != null ?
int.Parse(ConfigurationReader.GetValue("UDP:" + ip + ":" + port, "WaitingListCount")) : int.Parse(ConfigurationReader.GetValue("UDP:" + ip + ":" + port, "WaitingListCount")) :

12
Modbus.Net/Modbus.Net.Opc/OpcConnector.cs
View File

@@ -118,7 +118,7 @@ namespace Modbus.Net.Opc
Value = Encoding.ASCII.GetBytes("NoData") Value = Encoding.ASCII.GetBytes("NoData")
}; };
} }
logger.LogInformation($"Opc Machine {ConnectionToken} Read Opc tag {tag} for value {result.Value} {result.Value.GetType().FullName}"); logger.LogDebug($"Opc Machine {ConnectionToken} Read Opc tag {tag} for value {result.Value} {result.Value.GetType().FullName} {result.Quality}");
return new OpcParamOut return new OpcParamOut
{ {
Success = true, Success = true,
@@ -142,11 +142,11 @@ namespace Modbus.Net.Opc
try try
{ {
await Client.WriteAsync(tag, value); await Client.WriteAsync(tag, value);
logger.LogInformation($"Opc Machine {ConnectionToken} Write Opc tag {tag} for value {value}"); logger.LogDebug($"Opc Machine {ConnectionToken} Write Opc tag {tag} for value {value}");
} }
catch (Exception e) catch (Exception e)
{ {
logger.LogError(e, "Opc client {ConnectionToken} write exception", ConnectionToken); logger.LogError(e, $"Opc client {ConnectionToken} write exception");
return new OpcParamOut return new OpcParamOut
{ {
Success = false Success = false
@@ -165,7 +165,7 @@ namespace Modbus.Net.Opc
} }
catch (Exception e) catch (Exception e)
{ {
logger.LogError(e, "Opc client {ConnectionToken} read exception", ConnectionToken); logger.LogError(e, $"Opc client {ConnectionToken} read exception");
Disconnect(); Disconnect();
return new OpcParamOut return new OpcParamOut
{ {
@@ -181,12 +181,12 @@ namespace Modbus.Net.Opc
{ {
Client.Connect(); Client.Connect();
_connect = true; _connect = true;
logger.LogInformation("Opc client {ConnectionToken} connect success", ConnectionToken); logger.LogInformation($"Opc client {ConnectionToken} connect success");
return true; return true;
} }
catch (Exception ex) catch (Exception ex)
{ {
logger.LogError(ex, "Opc client {ConnectionToken} connected failed", ConnectionToken); logger.LogError(ex, $"Opc client {ConnectionToken} connected failed");
_connect = false; _connect = false;
return false; return false;
} }

5
Modbus.Net/Modbus.Net/Configuration/MachineReader.cs
View File

@@ -22,11 +22,12 @@ namespace Modbus.Net
/// <summary> /// <summary>
/// 读取设备列表 /// 读取设备列表
/// </summary> /// </summary>
/// <param name="machineSection">读取设备的块名</param>
/// <returns>设备的列表</returns> /// <returns>设备的列表</returns>
public static List<IMachine<string>> ReadMachines() public static List<IMachine<string>> ReadMachines(string machineSection = "Machine")
{ {
var ans = new List<IMachine<string>>(); var ans = new List<IMachine<string>>();
var root = configuration.GetSection("Modbus.Net").GetSection("Machine").GetChildren(); var root = configuration.GetSection("Modbus.Net").GetSection(machineSection).GetChildren();
foreach (var machine in root) foreach (var machine in root)
{ {
List<KeyValuePair<string, string>> kv = new List<KeyValuePair<string, string>>(); List<KeyValuePair<string, string>> kv = new List<KeyValuePair<string, string>>();

9
Samples/MachineJob/Worker.cs
View File

@@ -97,7 +97,7 @@ namespace MachineJob.Service
{ {
foreach (var value in values) foreach (var value in values)
{ {
_logger.LogInformation(dataReturnDef.MachineId + " " + value.Key + " " + value.Value.DeviceValue); _logger.LogDebug(dataReturnDef.MachineId + " " + value.Key + " " + value.Value.DeviceValue);
} }
/* /*
@@ -148,7 +148,12 @@ namespace MachineJob.Service
return ans; return ans;
} }
return null; else
{
_logger.LogError(dataReturnDef.MachineId + " Return Error.");
return null;
}
} }
} }
} }