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

Remove all unnesessary classes and interfaces and complete job implementation

Browse Source
This commit is contained in:
luosheng
2023-03-29 12:25:14 +08:00
parent d2a8f1e22f
commit 7ba7904282
35 changed files with 170 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,16 +6,16 @@ namespace Modbus.Net.Tests
[TestClass]
public class EndianTest
{
private BaseMachine? _modbusTcpMachine;
private BaseMachine<string, string>? _modbusTcpMachine;
private BaseMachine? _modbusTcpMachine2;
private BaseMachine<string, string>? _modbusTcpMachine2;
[TestInitialize]
public void Init()
{
_modbusTcpMachine = new ModbusMachine("1", ModbusType.Tcp, "127.0.0.1", null, true, 1, 0);
_modbusTcpMachine = new ModbusMachine<string, string>("1", ModbusType.Tcp, "127.0.0.1", null, true, 1, 0);
_modbusTcpMachine2 = new ModbusMachine("2", ModbusType.Tcp, "127.0.0.1", null, true, 1, 0, Endian.LittleEndianLsb);
_modbusTcpMachine2 = new ModbusMachine<string, string>("2", ModbusType.Tcp, "127.0.0.1", null, true, 1, 0, Endian.LittleEndianLsb);
}
[TestMethod]

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

@@ -44,7 +44,7 @@ namespace Modbus.Net.Tests
DataType = typeof(bool)
}
}, true, 2, 0);
var success = await baseMachine.GetMachineMethods<IMachineMethodData>().SetDatasAsync(
var success = await baseMachine.GetMachineMethods<IMachineMethodDatas>().SetDatasAsync(
MachineDataType.Address,
new Dictionary<string, double>
{
@@ -53,9 +53,9 @@ namespace Modbus.Net.Tests
}
});
Assert.AreEqual(success, true);
var datas = await baseMachine.GetMachineMethods<IMachineMethodData>().GetDatasAsync(MachineDataType.Address);
var datas = await baseMachine.GetMachineMethods<IMachineMethodDatas>().GetDatasAsync(MachineDataType.Address);
Assert.AreEqual(datas.Datas["0X 1.0"].DeviceValue, 1);
success = await baseMachine.GetMachineMethods<IMachineMethodData>().SetDatasAsync(
success = await baseMachine.GetMachineMethods<IMachineMethodDatas>().SetDatasAsync(
MachineDataType.Address,
new Dictionary<string, double>
{

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

@@ -6,15 +6,15 @@ namespace Modbus.Net.Tests
[TestClass]
public class ModbusMultiStationTest
{
private BaseMachine? _modbusRtuMachine1;
private BaseMachine<string, string>? _modbusRtuMachine1;
private BaseMachine? _modbusRtuMachine2;
private BaseMachine<string, string>? _modbusRtuMachine2;
[TestInitialize]
public void Init()
{
_modbusRtuMachine1 = new ModbusMachine("1", ModbusType.Rtu, "COM1", null, true, 1, 0);
_modbusRtuMachine2 = new ModbusMachine("2", ModbusType.Rtu, "COM1", null, true, 2, 0);
_modbusRtuMachine1 = new ModbusMachine<string, string>("1", ModbusType.Rtu, "COM1", null, true, 1, 0);
_modbusRtuMachine2 = new ModbusMachine<string, string>("2", ModbusType.Rtu, "COM1", null, true, 2, 0);
}
[TestMethod]

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

@@ -6,20 +6,20 @@ namespace Modbus.Net.Tests
[TestClass]
public class ModbusTest
{
private BaseMachine? _modbusTcpMachine;
private BaseMachine<string, string>? _modbusTcpMachine;
private BaseMachine? _modbusRtuMachine;
private BaseMachine<string, string>? _modbusRtuMachine;
private BaseMachine? _modbusAsciiMachine;
private BaseMachine<string, string>? _modbusAsciiMachine;
[TestInitialize]
public void Init()
{
_modbusTcpMachine = new ModbusMachine("1", ModbusType.Tcp, "192.168.3.10", null, true, 2, 0);
_modbusTcpMachine = new ModbusMachine<string, string>("1", ModbusType.Tcp, "192.168.3.10", null, true, 2, 0);
_modbusRtuMachine = new ModbusMachine("2", ModbusType.Rtu, "COM5", null, true, 2, 0);
_modbusRtuMachine = new ModbusMachine<string, string>("2", ModbusType.Rtu, "COM5", null, true, 2, 0);
_modbusAsciiMachine = new ModbusMachine("3", ModbusType.Ascii, "COM5", null, true, 2, 0);
_modbusAsciiMachine = new ModbusMachine<string, string>("3", ModbusType.Ascii, "COM5", null, true, 2, 0);
}
[TestMethod]

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

@@ -6,12 +6,12 @@ namespace Modbus.Net.Tests
[TestClass]
public class SiemensTest
{
private BaseMachine? _siemensTcpMachine;
private BaseMachine<string, string>? _siemensTcpMachine;
[TestInitialize]
public void Init()
{
_siemensTcpMachine = new SiemensMachine("1", SiemensType.Tcp, "192.168.3.10", SiemensMachineModel.S7_1200, null, true, 2, 0);
_siemensTcpMachine = new SiemensMachine<string, string>("1", SiemensType.Tcp, "192.168.3.10", SiemensMachineModel.S7_1200, null, true, 2, 0);
}
[TestMethod]