From 9c4d25da854d997b6bf13327336a66b17caeda35 Mon Sep 17 00:00:00 2001
From: parallelbgls <parallelbgls@outlook.com>
Date: Sun, 2 Oct 2016 18:35:45 +0800
Subject: [PATCH] Revert Sample

---
 Modbus.Net/NA200H.UI.WPF/MainWindow.xaml.cs   | 30 +++++++++----------
 .../MainWindow.xaml.cs                        |  2 +-
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/Modbus.Net/NA200H.UI.WPF/MainWindow.xaml.cs b/Modbus.Net/NA200H.UI.WPF/MainWindow.xaml.cs
index fbc7445..b4e0c9c 100644
--- a/Modbus.Net/NA200H.UI.WPF/MainWindow.xaml.cs
+++ b/Modbus.Net/NA200H.UI.WPF/MainWindow.xaml.cs
@@ -46,26 +46,24 @@ namespace NA200H.UI.WPF
         {
             if (machine == null)
             { 
-                machine = new ModbusMachine(ModbusType.Ascii, "COM3", new List<AddressUnit>()
-                {
-                    new AddressUnit() {Id = "1", Area = "4X", Address = 1, CommunicationTag = "Add1", DataType = typeof(ushort), Zoom = 1, DecimalPos = 0},
-                    new AddressUnit() {Id = "2", Area = "4X", Address = 2, CommunicationTag = "Add2", DataType = typeof(ushort), Zoom = 1, DecimalPos = 0},
-                    new AddressUnit() {Id = "3", Area = "4X", Address = 3, CommunicationTag = "Add3", DataType = typeof(ushort), Zoom = 1, DecimalPos = 0},
-                    new AddressUnit() {Id = "4", Area = "4X", Address = 4, CommunicationTag = "Ans",  DataType = typeof(ushort), Zoom = 1, DecimalPos = 0},
-                }, 2, 0);
-                //machine.AddressFormater = new AddressFormaterNA200H();
-                //machine.AddressTranslator = new AddressTranslatorNA200H();
-                machine.AddressCombiner = new AddressCombinerContinus(machine.AddressTranslator);
-                machine.AddressCombinerSet = new AddressCombinerContinus(machine.AddressTranslator);
-                //machine = new SiemensMachine(SiemensType.Tcp, "192.168.3.11", SiemensMachineModel.S7_300, new List<AddressUnit>()
+                //machine = new ModbusMachine(ModbusType.Rtu, "COM3", new List<AddressUnit>()
                 //{
-                    //new AddressUnit() {Id = "1", Area = "V", Address = 0, CommunicationTag = "Add1", DataType = typeof(ushort), Zoom = 1, DecimalPos = 0},
-                    //new AddressUnit() {Id = "2", Area = "V", Address = 2, CommunicationTag = "Add2", DataType = typeof(ushort), Zoom = 1, DecimalPos = 0},
-                    //new AddressUnit() {Id = "3", Area = "V", Address = 4, CommunicationTag = "Add3", DataType = typeof(ushort), Zoom = 1, DecimalPos = 0},
-                    //new AddressUnit() {Id = "4", Area = "V", Address = 6, CommunicationTag = "Ans",  DataType = typeof(ushort), Zoom = 1, DecimalPos = 0}
+                   //new AddressUnit() {Id = "1", Area = "4X", Address = 1, CommunicationTag = "Add1", DataType = typeof(ushort), Zoom = 1, DecimalPos = 0},
+                    //new AddressUnit() {Id = "2", Area = "4X", Address = 2, CommunicationTag = "Add2", DataType = typeof(ushort), Zoom = 1, DecimalPos = 0},
+                    //new AddressUnit() {Id = "3", Area = "4X", Address = 3, CommunicationTag = "Add3", DataType = typeof(ushort), Zoom = 1, DecimalPos = 0},
+                    //new AddressUnit() {Id = "4", Area = "4X", Address = 4, CommunicationTag = "Ans",  DataType = typeof(ushort), Zoom = 1, DecimalPos = 0},
                 //}, 2, 0);
                 //machine.AddressCombiner = new AddressCombinerContinus(machine.AddressTranslator);
                 //machine.AddressCombinerSet = new AddressCombinerContinus(machine.AddressTranslator);
+                machine = new SiemensMachine(SiemensType.Tcp, "192.168.3.11", SiemensMachineModel.S7_300, new List<AddressUnit>()
+                {
+                    new AddressUnit() {Id = "1", Area = "V", Address = 0, CommunicationTag = "Add1", DataType = typeof(ushort), Zoom = 1, DecimalPos = 0},
+                    new AddressUnit() {Id = "2", Area = "V", Address = 2, CommunicationTag = "Add2", DataType = typeof(ushort), Zoom = 1, DecimalPos = 0},
+                    new AddressUnit() {Id = "3", Area = "V", Address = 4, CommunicationTag = "Add3", DataType = typeof(ushort), Zoom = 1, DecimalPos = 0},
+                    new AddressUnit() {Id = "4", Area = "V", Address = 6, CommunicationTag = "Ans",  DataType = typeof(ushort), Zoom = 1, DecimalPos = 0}
+                }, 2, 0);
+                machine.AddressCombiner = new AddressCombinerContinus(machine.AddressTranslator);
+                machine.AddressCombinerSet = new AddressCombinerContinus(machine.AddressTranslator);
             }
             var result = machine.GetDatas(MachineGetDataType.CommunicationTag);
             var resultFormat = BaseMachine.MapGetValuesToSetValues(result);
diff --git a/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/MainWindow.xaml.cs b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/MainWindow.xaml.cs
index 63e1bdb..e163c84 100644
--- a/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/MainWindow.xaml.cs
+++ b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/MainWindow.xaml.cs
@@ -34,7 +34,7 @@ namespace Siemens_S7_200.UI.WPF.TaskTest
                 new AddressUnit() {Id = "1", Area = "V", Address = 3, CommunicationTag = "D2", DataType = typeof (float), Zoom = 1}
             };
             //初始化任务管理器
-            TaskManager task = new TaskManager(300, true);
+            TaskManager task = new TaskManager(10, 300, true);
             //向任务管理器中添加设备
             task.AddMachine(new SiemensMachine(SiemensType.Tcp, "192.168.3.11",SiemensMachineModel.S7_300, addressUnits,
             true, 2, 0));