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

sample retest

Browse Source
This commit is contained in:
luosheng
2023-04-20 13:49:43 +08:00
parent 2687cf7cce
commit 78c305d37e
5 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Samples/AnyType/Controllers/HomeController.cs
View File

@@ -55,7 +55,7 @@ namespace AnyType.Controllers
Value = 0, Value = 0,
Type = unitValue.DataType.Name 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", await MachineJobSchedulerCreator.CreateScheduler("Trigger1", -1, 1).Result.From(machine.Id, machine, MachineDataType.CommunicationTag).Result.Query("Query1",
returnValues => returnValues =>

2
Samples/CrossLamp/Controllers/HomeController.cs
View File

@@ -30,7 +30,7 @@ namespace CrossLamp.Controllers
{ {
if (_utility == null) 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(); await _utility.ConnectAsync();
} }
Lamp light = new Lamp(); Lamp light = new Lamp();

6
Samples/MachineJob/appsettings.json
View File

@@ -9,7 +9,7 @@
} }
}, },
"ConnectionStrings": { "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": { "Modbus.Net": {
@@ -18,7 +18,7 @@
"a:id": "ModbusMachine1", "a:id": "ModbusMachine1",
"b:protocol": "Modbus", "b:protocol": "Modbus",
"c:type": "Tcp", "c:type": "Tcp",
"d:connectionString": "192.168.8.210", "d:connectionString": "10.10.18.251",
"e:addressMap": "AddressMapModbus", "e:addressMap": "AddressMapModbus",
"f:keepConnect": true, "f:keepConnect": true,
"g:slaveAddress": 1, "g:slaveAddress": 1,
@@ -29,7 +29,7 @@
"a:id": "SiemensMachine1", "a:id": "SiemensMachine1",
"b:protocol": "Siemens", "b:protocol": "Siemens",
"c:type": "Tcp", "c:type": "Tcp",
"d:connectionString": "192.168.8.210", "d:connectionString": "10.10.18.251",
"e:model": "S7_1200", "e:model": "S7_1200",
"f:addressMap": "AddressMapSiemens", "f:addressMap": "AddressMapSiemens",
"g:keepConnect": true, "g:keepConnect": true,

4
Samples/TripleAdd/Controllers/HomeController.cs
View File

@@ -41,7 +41,7 @@ namespace TripleAdd.Controllers
{ {
if (utility == null) 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(); utility.AddressTranslator = new AddressTranslatorModbus();
await utility.ConnectAsync(); await utility.ConnectAsync();
} }
@@ -54,7 +54,7 @@ namespace TripleAdd.Controllers
{ {
if (machine == null) if (machine == null)
{ {
machine = new ModbusMachine<string, string>("1", ModbusType.Tcp, "192.168.0.161", new List<AddressUnit>() machine = new ModbusMachine<string, string>("1", ModbusType.Tcp, "10.10.18.251", new List<AddressUnit>()
{ {
new AddressUnit() {Id = "1", Area = "4X", Address = 1, CommunicationTag = "Add1", 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 = "2", Area = "4X", Address = 2, CommunicationTag = "Add2", DataType = typeof(ushort), Zoom = 1, DecimalPos = 0},

2
Tests/Modbus.Net.Tests/Modbus.Net.orderedtest
View File

@@ -27,7 +27,5 @@
<TestLink id="48af77ea-9315-04b2-0358-da5b371af3e6" name="SiemensMSingle" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" /> <TestLink id="48af77ea-9315-04b2-0358-da5b371af3e6" name="SiemensMSingle" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="3ff65ca6-f244-fda3-f8ba-d5c12a96b092" name="SiemensDbSingle" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" /> <TestLink id="3ff65ca6-f244-fda3-f8ba-d5c12a96b092" name="SiemensDbSingle" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="0318ff48-7798-7715-00db-c4ff8ac8f735" name="SiemensDbMultiple" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" /> <TestLink id="0318ff48-7798-7715-00db-c4ff8ac8f735" name="SiemensDbMultiple" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="40dbef40-f566-82ba-377e-7ed3ce059399" name="TaskManagerGetMachineTest" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="e3245380-3a92-12a1-b38b-f31f7e50f5e6" name="TaskManagerValueReadWriteTest" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
</TestLinks> </TestLinks>
</OrderedTest> </OrderedTest>