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

Add ReturnStruct to return error message

Browse Source
This commit is contained in:
luosheng
2023-03-18 11:01:33 +08:00
parent edb26d9d9a
commit bde800984c
24 changed files with 498 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/Modbus.Net.Tests/EndianTest.cs
View File

@@ -48,8 +48,8 @@ namespace Modbus.Net.Tests
await _modbusTcpMachine.SetDatasAsync(MachineDataType.Address, dic1);
var ans = await _modbusTcpMachine.GetDatasAsync(MachineDataType.Address);
var ans2 = await _modbusTcpMachine2.GetDatasAsync(MachineDataType.Address);
Assert.AreEqual(ans["4X 1.0"].DeviceValue, dic1["4X 1"]);
Assert.AreEqual(ans2["4X 1.0"].DeviceValue, (ushort)dic1["4X 1"] % 256 * 256 + (ushort)dic1["4X 1"] / 256);
Assert.AreEqual(ans.Datas["4X 1.0"].DeviceValue, dic1["4X 1"]);
Assert.AreEqual(ans2.Datas["4X 1.0"].DeviceValue, (ushort)dic1["4X 1"] % 256 * 256 + (ushort)dic1["4X 1"] / 256);
}
}
}

4
Tests/Modbus.Net.Tests/MachineMethodTest.cs
View File

@@ -25,7 +25,7 @@ namespace Modbus.Net.Tests
var success = await baseMachine.BaseUtility.GetUtilityMethods<IUtilityMethodTime>().SetTimeAsync(DateTime.Now);
Assert.AreEqual(success, true);
var time = await baseMachine.BaseUtility.GetUtilityMethods<IUtilityMethodTime>().GetTimeAsync();
Assert.AreEqual((time.ToUniversalTime() - DateTime.Now.ToUniversalTime()).Seconds < 10, true);
Assert.AreEqual((time.Datas.ToUniversalTime() - DateTime.Now.ToUniversalTime()).Seconds < 10, true);
baseMachine.Disconnect();
}
@@ -54,7 +54,7 @@ namespace Modbus.Net.Tests
});
Assert.AreEqual(success, true);
var datas = await baseMachine.GetMachineMethods<IMachineMethodData>().GetDatasAsync(MachineDataType.Address);
Assert.AreEqual(datas["0X 1.0"].DeviceValue, 1);
Assert.AreEqual(datas.Datas["0X 1.0"].DeviceValue, 1);
success = await baseMachine.GetMachineMethods<IMachineMethodData>().SetDatasAsync(
MachineDataType.Address,
new Dictionary<string, double>

24
Tests/Modbus.Net.Tests/ModbusMultiStationTest.cs
View File

@@ -135,18 +135,18 @@ namespace Modbus.Net.Tests
_modbusRtuMachine1.Disconnect();
_modbusRtuMachine2.Disconnect();
Assert.AreEqual(ans["A1"].DeviceValue, dic1["A1"]);
Assert.AreEqual(ans2["A1"].DeviceValue, dic2["A1"]);
Assert.AreEqual(ans["A2"].DeviceValue, dic1["A2"]);
Assert.AreEqual(ans2["A2"].DeviceValue, dic2["A2"]);
Assert.AreEqual(ans["A3"].DeviceValue, dic1["A3"]);
Assert.AreEqual(ans2["A3"].DeviceValue, dic2["A3"]);
Assert.AreEqual(ans["A4"].DeviceValue, dic1["A4"]);
Assert.AreEqual(ans2["A4"].DeviceValue, dic2["A4"]);
Assert.AreEqual(ans["A5"].DeviceValue, dic1["A5"]);
Assert.AreEqual(ans2["A5"].DeviceValue, dic2["A5"]);
Assert.AreEqual(ans["A6"].DeviceValue, dic1["A6"]);
Assert.AreEqual(ans2["A6"].DeviceValue, dic2["A6"]);
Assert.AreEqual(ans.Datas["A1"].DeviceValue, dic1["A1"]);
Assert.AreEqual(ans2.Datas["A1"].DeviceValue, dic2["A1"]);
Assert.AreEqual(ans.Datas["A2"].DeviceValue, dic1["A2"]);
Assert.AreEqual(ans2.Datas["A2"].DeviceValue, dic2["A2"]);
Assert.AreEqual(ans.Datas["A3"].DeviceValue, dic1["A3"]);
Assert.AreEqual(ans2.Datas["A3"].DeviceValue, dic2["A3"]);
Assert.AreEqual(ans.Datas["A4"].DeviceValue, dic1["A4"]);
Assert.AreEqual(ans2.Datas["A4"].DeviceValue, dic2["A4"]);
Assert.AreEqual(ans.Datas["A5"].DeviceValue, dic1["A5"]);
Assert.AreEqual(ans2.Datas["A5"].DeviceValue, dic2["A5"]);
Assert.AreEqual(ans.Datas["A6"].DeviceValue, dic1["A6"]);
Assert.AreEqual(ans2.Datas["A6"].DeviceValue, dic2["A6"]);
}
}
}

72
Tests/Modbus.Net.Tests/ModbusTest.cs
View File

@@ -56,9 +56,9 @@ namespace Modbus.Net.Tests
var ans = await _modbusTcpMachine.GetDatasAsync(MachineDataType.Address);
var ans2 = await _modbusRtuMachine.GetDatasAsync(MachineDataType.Address);
var ans3 = await _modbusAsciiMachine.GetDatasAsync(MachineDataType.Address);
Assert.AreEqual(ans["0X 1.0"].DeviceValue, dic1["0X 1.0"]);
Assert.AreEqual(ans2["0X 1.0"].DeviceValue, dic1["0X 1.0"]);
Assert.AreEqual(ans3["0X 1.0"].DeviceValue, dic1["0X 1.0"]);
Assert.AreEqual(ans.Datas["0X 1.0"].DeviceValue, dic1["0X 1.0"]);
Assert.AreEqual(ans2.Datas["0X 1.0"].DeviceValue, dic1["0X 1.0"]);
Assert.AreEqual(ans3.Datas["0X 1.0"].DeviceValue, dic1["0X 1.0"]);
}
[TestMethod]
@@ -83,9 +83,9 @@ namespace Modbus.Net.Tests
var ans = await _modbusTcpMachine.GetDatasAsync(MachineDataType.Address);
var ans2 = await _modbusRtuMachine.GetDatasAsync(MachineDataType.Address);
var ans3 = await _modbusAsciiMachine.GetDatasAsync(MachineDataType.Address);
Assert.AreEqual(ans["1X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans2["1X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans3["1X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans.Datas["1X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans2.Datas["1X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans3.Datas["1X 1.0"].DeviceValue, 0);
}
[TestMethod]
@@ -110,9 +110,9 @@ namespace Modbus.Net.Tests
var ans = await _modbusTcpMachine.GetDatasAsync(MachineDataType.Address);
var ans2 = await _modbusRtuMachine.GetDatasAsync(MachineDataType.Address);
var ans3 = await _modbusAsciiMachine.GetDatasAsync(MachineDataType.Address);
Assert.AreEqual(ans["3X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans2["3X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans3["3X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans.Datas["3X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans2.Datas["3X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans3.Datas["3X 1.0"].DeviceValue, 0);
}
[TestMethod]
@@ -149,9 +149,9 @@ namespace Modbus.Net.Tests
var ans = await _modbusTcpMachine.GetDatasAsync(MachineDataType.Address);
var ans2 = await _modbusRtuMachine.GetDatasAsync(MachineDataType.Address);
var ans3 = await _modbusAsciiMachine.GetDatasAsync(MachineDataType.Address);
Assert.AreEqual(ans["4X 1.0"].DeviceValue, dic1["4X 1"]);
Assert.AreEqual(ans2["4X 1.0"].DeviceValue, dic1["4X 1"]);
Assert.AreEqual(ans3["4X 1.0"].DeviceValue, dic1["4X 1"]);
Assert.AreEqual(ans.Datas["4X 1.0"].DeviceValue, dic1["4X 1"]);
Assert.AreEqual(ans2.Datas["4X 1.0"].DeviceValue, dic1["4X 1"]);
Assert.AreEqual(ans3.Datas["4X 1.0"].DeviceValue, dic1["4X 1"]);
}
[TestMethod]
@@ -250,24 +250,24 @@ namespace Modbus.Net.Tests
var ans2 = await _modbusRtuMachine.GetDatasAsync(MachineDataType.CommunicationTag);
var ans3 = await _modbusAsciiMachine.GetDatasAsync(MachineDataType.CommunicationTag);
Assert.AreEqual(ans["A1"].DeviceValue, dic1["A1"]);
Assert.AreEqual(ans["A2"].DeviceValue, dic1["A2"]);
Assert.AreEqual(ans["A3"].DeviceValue, dic1["A3"]);
Assert.AreEqual(ans["A4"].DeviceValue, dic1["A4"]);
Assert.AreEqual(ans["A5"].DeviceValue, dic1["A5"]);
Assert.AreEqual(ans["A6"].DeviceValue, dic1["A6"]);
Assert.AreEqual(ans2["A1"].DeviceValue, dic1["A1"]);
Assert.AreEqual(ans2["A2"].DeviceValue, dic1["A2"]);
Assert.AreEqual(ans2["A3"].DeviceValue, dic1["A3"]);
Assert.AreEqual(ans2["A4"].DeviceValue, dic1["A4"]);
Assert.AreEqual(ans2["A5"].DeviceValue, dic1["A5"]);
Assert.AreEqual(ans2["A6"].DeviceValue, dic1["A6"]);
Assert.AreEqual(ans3["A1"].DeviceValue, dic1["A1"]);
Assert.AreEqual(ans3["A2"].DeviceValue, dic1["A2"]);
Assert.AreEqual(ans3["A3"].DeviceValue, dic1["A3"]);
Assert.AreEqual(ans3["A4"].DeviceValue, dic1["A4"]);
Assert.AreEqual(ans3["A5"].DeviceValue, dic1["A5"]);
Assert.AreEqual(ans3["A6"].DeviceValue, dic1["A6"]);
Assert.AreEqual(ans.Datas["A1"].DeviceValue, dic1["A1"]);
Assert.AreEqual(ans.Datas["A2"].DeviceValue, dic1["A2"]);
Assert.AreEqual(ans.Datas["A3"].DeviceValue, dic1["A3"]);
Assert.AreEqual(ans.Datas["A4"].DeviceValue, dic1["A4"]);
Assert.AreEqual(ans.Datas["A5"].DeviceValue, dic1["A5"]);
Assert.AreEqual(ans.Datas["A6"].DeviceValue, dic1["A6"]);
Assert.AreEqual(ans2.Datas["A1"].DeviceValue, dic1["A1"]);
Assert.AreEqual(ans2.Datas["A2"].DeviceValue, dic1["A2"]);
Assert.AreEqual(ans2.Datas["A3"].DeviceValue, dic1["A3"]);
Assert.AreEqual(ans2.Datas["A4"].DeviceValue, dic1["A4"]);
Assert.AreEqual(ans2.Datas["A5"].DeviceValue, dic1["A5"]);
Assert.AreEqual(ans2.Datas["A6"].DeviceValue, dic1["A6"]);
Assert.AreEqual(ans3.Datas["A1"].DeviceValue, dic1["A1"]);
Assert.AreEqual(ans3.Datas["A2"].DeviceValue, dic1["A2"]);
Assert.AreEqual(ans3.Datas["A3"].DeviceValue, dic1["A3"]);
Assert.AreEqual(ans3.Datas["A4"].DeviceValue, dic1["A4"]);
Assert.AreEqual(ans3.Datas["A5"].DeviceValue, dic1["A5"]);
Assert.AreEqual(ans3.Datas["A6"].DeviceValue, dic1["A6"]);
}
[TestMethod]
@@ -295,18 +295,18 @@ namespace Modbus.Net.Tests
var ans = await _modbusTcpMachine.BaseUtility.GetUtilityMethods<IUtilityMethodData>().GetDatasAsync<ushort>("4X 1", 1);
var ans2 = await _modbusRtuMachine.BaseUtility.GetUtilityMethods<IUtilityMethodData>().GetDatasAsync<ushort>("4X 1", 1);
var ans3 = await _modbusAsciiMachine.BaseUtility.GetUtilityMethods<IUtilityMethodData>().GetDatasAsync<ushort>("4X 1", 1);
Assert.AreEqual(ans[0], dic1["4X 1"]);
Assert.AreEqual(ans2[0], dic1["4X 1"]);
Assert.AreEqual(ans3[0], dic1["4X 1"]);
Assert.AreEqual(ans.Datas[0], dic1["4X 1"]);
Assert.AreEqual(ans2.Datas[0], dic1["4X 1"]);
Assert.AreEqual(ans3.Datas[0], dic1["4X 1"]);
await _modbusTcpMachine.BaseUtility.GetUtilityMethods<IUtilityMethodWriteSingle>().SetSingleDataAsync("0X 1", dic2["0X 1"] >= 1);
await _modbusAsciiMachine.BaseUtility.GetUtilityMethods<IUtilityMethodWriteSingle>().SetSingleDataAsync("0X 1", dic2["0X 1"] >= 1);
await _modbusRtuMachine.BaseUtility.GetUtilityMethods<IUtilityMethodWriteSingle>().SetSingleDataAsync("0X 1", dic2["0X 1"] >= 1);
var ans21 = await _modbusTcpMachine.BaseUtility.GetUtilityMethods<IUtilityMethodData>().GetDatasAsync<bool>("0X 1", 1);
var ans22 = await _modbusRtuMachine.BaseUtility.GetUtilityMethods<IUtilityMethodData>().GetDatasAsync<bool>("0X 1", 1);
var ans23 = await _modbusAsciiMachine.BaseUtility.GetUtilityMethods<IUtilityMethodData>().GetDatasAsync<bool>("0X 1", 1);
Assert.AreEqual(ans21[0] ? 1 : 0, dic2["0X 1"]);
Assert.AreEqual(ans22[0] ? 1 : 0, dic2["0X 1"]);
Assert.AreEqual(ans23[0] ? 1 : 0, dic2["0X 1"]);
Assert.AreEqual(ans21.Datas[0] ? 1 : 0, dic2["0X 1"]);
Assert.AreEqual(ans22.Datas[0] ? 1 : 0, dic2["0X 1"]);
Assert.AreEqual(ans23.Datas[0] ? 1 : 0, dic2["0X 1"]);
}

22
Tests/Modbus.Net.Tests/SiemensTest.cs
View File

@@ -43,7 +43,7 @@ namespace Modbus.Net.Tests
await _siemensTcpMachine.SetDatasAsync(MachineDataType.Address, dic1);
var ans = await _siemensTcpMachine.GetDatasAsync(MachineDataType.Address);
Assert.AreEqual(ans["Q 0.0"].DeviceValue, dic1["Q 0.0"]);
Assert.AreEqual(ans.Datas["Q 0.0"].DeviceValue, dic1["Q 0.0"]);
}
[TestMethod]
@@ -64,7 +64,7 @@ namespace Modbus.Net.Tests
_siemensTcpMachine!.GetAddresses = addresses;
var ans = await _siemensTcpMachine.GetDatasAsync(MachineDataType.Address);
Assert.AreEqual(ans["I 0.0"].DeviceValue, 0);
Assert.AreEqual(ans.Datas["I 0.0"].DeviceValue, 0);
}
[TestMethod]
@@ -96,7 +96,7 @@ namespace Modbus.Net.Tests
await _siemensTcpMachine.SetDatasAsync(MachineDataType.Address, dic1);
var ans = await _siemensTcpMachine.GetDatasAsync(MachineDataType.Address);
Assert.AreEqual(ans["M 0.0"].DeviceValue, dic1["M 0"]);
Assert.AreEqual(ans.Datas["M 0.0"].DeviceValue, dic1["M 0"]);
}
[TestMethod]
@@ -129,7 +129,7 @@ namespace Modbus.Net.Tests
await _siemensTcpMachine.SetDatasAsync(MachineDataType.Address, dic1);
var ans = await _siemensTcpMachine.GetDatasAsync(MachineDataType.Address);
Assert.AreEqual(ans["M 0.0"].DeviceValue, dic1["M 0.0"]);
Assert.AreEqual(ans.Datas["M 0.0"].DeviceValue, dic1["M 0.0"]);
}
[TestMethod]
@@ -161,7 +161,7 @@ namespace Modbus.Net.Tests
await _siemensTcpMachine.SetDatasAsync(MachineDataType.Address, dic1);
var ans = await _siemensTcpMachine.GetDatasAsync(MachineDataType.Address);
Assert.AreEqual(ans["DB2 0.0"].DeviceValue, dic1["DB2 0.0"]);
Assert.AreEqual(ans.Datas["DB2 0.0"].DeviceValue, dic1["DB2 0.0"]);
}
[TestMethod]
@@ -252,12 +252,12 @@ namespace Modbus.Net.Tests
_siemensTcpMachine!.GetAddresses = addresses;
await _siemensTcpMachine.SetDatasAsync(MachineDataType.CommunicationTag, dic1);
var ans = await _siemensTcpMachine.GetDatasAsync(MachineDataType.CommunicationTag);
Assert.AreEqual(ans["A1"].DeviceValue, dic1["A1"]);
Assert.AreEqual(ans["A2"].DeviceValue, dic1["A2"]);
Assert.AreEqual(ans["A3"].DeviceValue, dic1["A3"]);
Assert.AreEqual(ans["A4"].DeviceValue, dic1["A4"]);
Assert.AreEqual(ans["A5"].DeviceValue, dic1["A5"]);
Assert.AreEqual(ans["A6"].DeviceValue, dic1["A6"]);
Assert.AreEqual(ans.Datas["A1"].DeviceValue, dic1["A1"]);
Assert.AreEqual(ans.Datas["A2"].DeviceValue, dic1["A2"]);
Assert.AreEqual(ans.Datas["A3"].DeviceValue, dic1["A3"]);
Assert.AreEqual(ans.Datas["A4"].DeviceValue, dic1["A4"]);
Assert.AreEqual(ans.Datas["A5"].DeviceValue, dic1["A5"]);
Assert.AreEqual(ans.Datas["A6"].DeviceValue, dic1["A6"]);
}
[TestCleanup]