From cb2d552cdfe343294273532b581364726aac47ed Mon Sep 17 00:00:00 2001 From: parallelbgls Date: Wed, 3 Jan 2018 14:55:30 +0800 Subject: [PATCH] Revert --- Tests/Modbus.Net.PersistedTests/Program.cs | 84 +++++++++++++++++++++- 1 file changed, 82 insertions(+), 2 deletions(-) diff --git a/Tests/Modbus.Net.PersistedTests/Program.cs b/Tests/Modbus.Net.PersistedTests/Program.cs index 930b98d..af3d229 100644 --- a/Tests/Modbus.Net.PersistedTests/Program.cs +++ b/Tests/Modbus.Net.PersistedTests/Program.cs @@ -12,7 +12,7 @@ namespace Modbus.Net.PersistedTests { Log.Logger = new LoggerConfiguration().MinimumLevel.Verbose().WriteTo.Console().CreateLogger(); - IMachineProperty machine = new ModbusMachine(1, ModbusType.Tcp, "127.0.0.1", + IMachineProperty machine = new ModbusMachine(1, ModbusType.Rtu, "COM1", new List() { new AddressUnit() @@ -40,9 +40,65 @@ namespace Modbus.Net.PersistedTests DataType = typeof(ushort) }, }, true, 2, 1); + IMachineProperty machine2 = new ModbusMachine(2, ModbusType.Rtu, "COM1", + new List() + { + new AddressUnit() + { + Id = "1", + Area = "4X", + Address = 11, + Name = "test 1", + DataType = typeof(ushort) + }, + new AddressUnit() + { + Id = "2", + Area = "4X", + Address = 12, + Name = "test 2", + DataType = typeof(ushort) + }, + new AddressUnit() + { + Id = "3", + Area = "4X", + Address = 13, + Name = "test 3", + DataType = typeof(ushort) + }, + }, true, 3, 1); + IMachineProperty machine3 = new ModbusMachine(3, ModbusType.Rtu, "COM1", + new List() + { + new AddressUnit() + { + Id = "1", + Area = "4X", + Address = 21, + Name = "test 1", + DataType = typeof(ushort) + }, + new AddressUnit() + { + Id = "2", + Area = "4X", + Address = 22, + Name = "test 2", + DataType = typeof(ushort) + }, + new AddressUnit() + { + Id = "3", + Area = "4X", + Address = 23, + Name = "test 3", + DataType = typeof(ushort) + }, + }, true, 4, 1); TaskManager manager = new TaskManager(20, true); - manager.AddMachines(new List> { machine }); + manager.AddMachines(new List> { machine, machine2, machine3 }); Random r = new Random(); manager.InvokeTimerForMachine(1, new TaskItemSetData(() => new Dictionary { @@ -56,6 +112,30 @@ namespace Modbus.Net.PersistedTests "4X 3.0", r.Next() % 65536 }, }, MachineSetDataType.Address, 10000, 10000)); + manager.InvokeTimerForMachine(2, new TaskItemSetData(() => new Dictionary + { + { + "4X 11.0", r.Next() % 65536 + }, + { + "4X 12.0", r.Next() % 65536 + }, + { + "4X 13.0", r.Next() % 65536 + }, + }, MachineSetDataType.Address, 10000, 10000)); + manager.InvokeTimerForMachine(3, new TaskItemSetData(() => new Dictionary + { + { + "4X 21.0", r.Next() % 65536 + }, + { + "4X 22.0", r.Next() % 65536 + }, + { + "4X 23.0", r.Next() % 65536 + }, + }, MachineSetDataType.Address, 10000, 10000)); Thread.Sleep(5000); manager.InvokeTimerAll(new TaskItemGetData(data => {