1、#4

2、新增AllenBradleyClient
zhaopeiym · May 6, 2021 · 79e5b1a · 79e5b1a
1 parent c01ba65
commit 79e5b1a
Show file tree

Hide file tree

Showing 35 changed files with 2,848 additions and 1,214 deletions.
diff --git a/IoTClient.Tests/Modbus_Tests/ModBusRtuClient_tests.cs b/IoTClient.Tests/Modbus_Tests/ModBusRtuClient_tests.cs
@@ -17,41 +17,6 @@ public ModbusRtuClient_tests()
             client = new ModbusRtuClient("COM3", 9600, 8, StopBits.One, Parity.None);
         }
 
-        [Fact]
-        public void 批量读取()
-        {          
-            var list = new List<ModbusInput>();
-            list.Add(new ModbusInput()
-            {
-                Address = "2",
-                DataType = DataTypeEnum.Int16,
-                FunctionCode = 3,
-                StationNumber = 1
-            });
-            list.Add(new ModbusInput()
-            {
-                Address = "2",
-                DataType = DataTypeEnum.Int16,
-                FunctionCode = 4,
-                StationNumber = 1
-            });
-            list.Add(new ModbusInput()
-            {
-                Address = "5",
-                DataType = DataTypeEnum.Int16,
-                FunctionCode = 3,
-                StationNumber = 1
-            });
-            list.Add(new ModbusInput()
-            {
-                Address = "199",
-                DataType = DataTypeEnum.Int16,
-                FunctionCode = 3,
-                StationNumber = 1
-            });
-            var result = client.BatchRead(list);
-        }
-
         [Fact]
         public async Task 短连接自动开关()
         {
@@ -119,5 +84,103 @@ public async Task 长连接主动开关()
 
             client.Close();
         }
+
+        [Fact]
+        public void 批量读取()
+        {
+            var list = new List<ModbusInput>();
+            list.Add(new ModbusInput()
+            {
+                Address = "2",
+                DataType = DataTypeEnum.Int16,
+                FunctionCode = 3,
+                StationNumber = 1
+            });
+            list.Add(new ModbusInput()
+            {
+                Address = "2",
+                DataType = DataTypeEnum.Int16,
+                FunctionCode = 4,
+                StationNumber = 1
+            });
+            list.Add(new ModbusInput()
+            {
+                Address = "5",
+                DataType = DataTypeEnum.Int16,
+                FunctionCode = 3,
+                StationNumber = 1
+            });
+            list.Add(new ModbusInput()
+            {
+                Address = "199",
+                DataType = DataTypeEnum.Int16,
+                FunctionCode = 3,
+                StationNumber = 1
+            });
+            list.Add(new ModbusInput()
+            {
+                Address = "200",
+                DataType = DataTypeEnum.Bool,
+                FunctionCode = 2,
+                StationNumber = 1
+            });
+            list.Add(new ModbusInput()
+            {
+                Address = "201",
+                DataType = DataTypeEnum.Bool,
+                FunctionCode = 2,
+                StationNumber = 1
+            });
+            list.Add(new ModbusInput()
+            {
+                Address = "202",
+                DataType = DataTypeEnum.Bool,
+                FunctionCode = 2,
+                StationNumber = 1
+            });
+            list.Add(new ModbusInput()
+            {
+                Address = "203",
+                DataType = DataTypeEnum.Bool,
+                FunctionCode = 2,
+                StationNumber = 1
+            });
+            list.Add(new ModbusInput()
+            {
+                Address = "204",
+                DataType = DataTypeEnum.Bool,
+                FunctionCode = 2,
+                StationNumber = 1
+            });
+            list.Add(new ModbusInput()
+            {
+                Address = "205",
+                DataType = DataTypeEnum.Bool,
+                FunctionCode = 2,
+                StationNumber = 1
+            });
+            list.Add(new ModbusInput()
+            {
+                Address = "206",
+                DataType = DataTypeEnum.Bool,
+                FunctionCode = 2,
+                StationNumber = 1
+            });
+            list.Add(new ModbusInput()
+            {
+                Address = "207",
+                DataType = DataTypeEnum.Bool,
+                FunctionCode = 2,
+                StationNumber = 1
+            });
+            list.Add(new ModbusInput()
+            {
+                Address = "208",
+                DataType = DataTypeEnum.Bool,
+                FunctionCode = 2,
+                StationNumber = 1
+            });
+            var result = client.BatchRead(list);
+        }
     }
 }
diff --git a/IoTClient.Tests/Modbus_Tests/ModBusTcpClient_tests.cs b/IoTClient.Tests/Modbus_Tests/ModBusTcpClient_tests.cs
@@ -36,7 +36,7 @@ public async Task 短连接自动开关()
                 ulong ulong_number = (ulong)Math.Abs(rnd.Next(int.MinValue, int.MaxValue));
                 float float_number = rnd.Next(int.MinValue, int.MaxValue) / 100;
                 double double_number = (double)rnd.Next(int.MinValue, int.MaxValue) / 100;
-                bool coil = int_number % 2 == 0; 
+                bool coil = int_number % 2 == 0;
                 #endregion
 
                 //写入地址:0 值为:short_number 站号:stationNumber 功能码:默认16(也可以自己传入对应的功能码)
@@ -124,14 +124,6 @@ public async Task 长连接主动开关()
         [Fact]
         public void 批量读取()
         {
-            Dictionary<string, DataTypeEnum> addresses = new Dictionary<string, DataTypeEnum>();
-            addresses.Add("2", DataTypeEnum.Int16);
-            addresses.Add("5", DataTypeEnum.Int16);
-            addresses.Add("13", DataTypeEnum.Int16);
-            addresses.Add("19", DataTypeEnum.Int16);
-            addresses.Add("198", DataTypeEnum.Int16);
-            addresses.Add("199", DataTypeEnum.Int16);
-
             var list = new List<ModbusInput>();
             list.Add(new ModbusInput()
             {
@@ -161,6 +153,69 @@ public void 批量读取()
                 FunctionCode = 3,
                 StationNumber = 1
             });
+            list.Add(new ModbusInput()
+            {
+                Address = "200",
+                DataType = DataTypeEnum.Bool,
+                FunctionCode = 2,
+                StationNumber = 1
+            });
+            list.Add(new ModbusInput()
+            {
+                Address = "201",
+                DataType = DataTypeEnum.Bool,
+                FunctionCode = 2,
+                StationNumber = 1
+            });
+            list.Add(new ModbusInput()
+            {
+                Address = "202",
+                DataType = DataTypeEnum.Bool,
+                FunctionCode = 2,
+                StationNumber = 1
+            });
+            list.Add(new ModbusInput()
+            {
+                Address = "203",
+                DataType = DataTypeEnum.Bool,
+                FunctionCode = 2,
+                StationNumber = 1
+            });
+            list.Add(new ModbusInput()
+            {
+                Address = "204",
+                DataType = DataTypeEnum.Bool,
+                FunctionCode = 2,
+                StationNumber = 1
+            });
+            list.Add(new ModbusInput()
+            {
+                Address = "205",
+                DataType = DataTypeEnum.Bool,
+                FunctionCode = 2,
+                StationNumber = 1
+            });
+            list.Add(new ModbusInput()
+            {
+                Address = "206",
+                DataType = DataTypeEnum.Bool,
+                FunctionCode = 2,
+                StationNumber = 1
+            });
+            list.Add(new ModbusInput()
+            {
+                Address = "207",
+                DataType = DataTypeEnum.Bool,
+                FunctionCode = 2,
+                StationNumber = 1
+            });
+            list.Add(new ModbusInput()
+            {
+                Address = "208",
+                DataType = DataTypeEnum.Bool,
+                FunctionCode = 2,
+                StationNumber = 1
+            });
             var result = client.BatchRead(list);
         }
     }