From 78c305d37ed2d90ef9306acfdb31d7cd9302aa04 Mon Sep 17 00:00:00 2001 From: luosheng Date: Thu, 20 Apr 2023 13:49:43 +0800 Subject: [PATCH] sample retest --- Samples/AnyType/Controllers/HomeController.cs | 2 +- Samples/CrossLamp/Controllers/HomeController.cs | 2 +- Samples/MachineJob/appsettings.json | 6 +++--- Samples/TripleAdd/Controllers/HomeController.cs | 4 ++-- Tests/Modbus.Net.Tests/Modbus.Net.orderedtest | 2 -- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Samples/AnyType/Controllers/HomeController.cs b/Samples/AnyType/Controllers/HomeController.cs index aadb87a..5422a2e 100644 --- a/Samples/AnyType/Controllers/HomeController.cs +++ b/Samples/AnyType/Controllers/HomeController.cs @@ -55,7 +55,7 @@ namespace AnyType.Controllers Value = 0, Type = unitValue.DataType.Name }; - var machine = new ModbusMachine("1", ModbusType.Tcp, "192.168.0.172:502", addressUnits, true, 2, 0); + var machine = new ModbusMachine("1", ModbusType.Tcp, "10.10.18.251:502", addressUnits, true, 2, 0); //启动任务 await MachineJobSchedulerCreator.CreateScheduler("Trigger1", -1, 1).Result.From(machine.Id, machine, MachineDataType.CommunicationTag).Result.Query("Query1", returnValues => diff --git a/Samples/CrossLamp/Controllers/HomeController.cs b/Samples/CrossLamp/Controllers/HomeController.cs index 4e9c5dd..e336dc9 100644 --- a/Samples/CrossLamp/Controllers/HomeController.cs +++ b/Samples/CrossLamp/Controllers/HomeController.cs @@ -30,7 +30,7 @@ namespace CrossLamp.Controllers { if (_utility == null) { - _utility = new ModbusUtility(ModbusType.Tcp, "192.168.0.161", 2, 0); + _utility = new ModbusUtility(ModbusType.Tcp, "10.10.18.251", 2, 0); await _utility.ConnectAsync(); } Lamp light = new Lamp(); diff --git a/Samples/MachineJob/appsettings.json b/Samples/MachineJob/appsettings.json index 7f18b4a..aa4b476 100644 --- a/Samples/MachineJob/appsettings.json +++ b/Samples/MachineJob/appsettings.json @@ -9,7 +9,7 @@ } }, "ConnectionStrings": { - "DatabaseWriteConnectionString": "Server=192.168.8.225; User ID=root; Password=123456; Database=modbusnettest;" + "DatabaseWriteConnectionString": "Server=10.10.18.245; User ID=root; Password=123456; Database=modbusnettest;" }, "Modbus.Net": { @@ -18,7 +18,7 @@ "a:id": "ModbusMachine1", "b:protocol": "Modbus", "c:type": "Tcp", - "d:connectionString": "192.168.8.210", + "d:connectionString": "10.10.18.251", "e:addressMap": "AddressMapModbus", "f:keepConnect": true, "g:slaveAddress": 1, @@ -29,7 +29,7 @@ "a:id": "SiemensMachine1", "b:protocol": "Siemens", "c:type": "Tcp", - "d:connectionString": "192.168.8.210", + "d:connectionString": "10.10.18.251", "e:model": "S7_1200", "f:addressMap": "AddressMapSiemens", "g:keepConnect": true, diff --git a/Samples/TripleAdd/Controllers/HomeController.cs b/Samples/TripleAdd/Controllers/HomeController.cs index 6428958..99c1ae1 100644 --- a/Samples/TripleAdd/Controllers/HomeController.cs +++ b/Samples/TripleAdd/Controllers/HomeController.cs @@ -41,7 +41,7 @@ namespace TripleAdd.Controllers { if (utility == null) { - utility = new ModbusUtility(ModbusType.Tcp, "192.168.0.161", 2, 0); + utility = new ModbusUtility(ModbusType.Tcp, "10.10.18.251", 2, 0); utility.AddressTranslator = new AddressTranslatorModbus(); await utility.ConnectAsync(); } @@ -54,7 +54,7 @@ namespace TripleAdd.Controllers { if (machine == null) { - machine = new ModbusMachine("1", ModbusType.Tcp, "192.168.0.161", new List() + machine = new ModbusMachine("1", ModbusType.Tcp, "10.10.18.251", new List() { 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}, diff --git a/Tests/Modbus.Net.Tests/Modbus.Net.orderedtest b/Tests/Modbus.Net.Tests/Modbus.Net.orderedtest index cb74ea2..7f3ab26 100644 --- a/Tests/Modbus.Net.Tests/Modbus.Net.orderedtest +++ b/Tests/Modbus.Net.Tests/Modbus.Net.orderedtest @@ -27,7 +27,5 @@ - - \ No newline at end of file