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

Several function enchancement

Browse Source
This commit is contained in:
luosheng
2023-06-28 09:10:50 +08:00
parent 32eb4a9afd
commit 4acff71c77
64 changed files with 2254 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Samples/MachineJob/MachineJob.csproj
View File

@@ -23,6 +23,7 @@
<ItemGroup>
<ProjectReference Include="..\..\Modbus.Net\Modbus.Net.Modbus\Modbus.Net.Modbus.csproj" />
<ProjectReference Include="..\..\Modbus.Net\Modbus.Net.OPC\Modbus.Net.Opc.csproj" />
<ProjectReference Include="..\..\Modbus.Net\Modbus.Net.Siemens\Modbus.Net.Siemens.csproj" />
<ProjectReference Include="..\..\Modbus.Net\Modbus.Net\Modbus.Net.csproj" />
</ItemGroup>

35
Samples/MachineJob/appsettings.json
View File

@@ -9,7 +9,7 @@
}
},
"ConnectionStrings": {
"DatabaseWriteConnectionString": "Server=10.10.18.245; User ID=root; Password=123456; Database=modbusnettest;"
"DatabaseWriteConnectionString": "Server=127.0.0.1; User ID=root; Password=123456; Database=modbusnettest;"
},
"Modbus.Net": {
@@ -18,7 +18,7 @@
"a:id": "ModbusMachine1",
"b:protocol": "Modbus",
"c:type": "Tcp",
"d:connectionString": "10.10.18.251",
"d:connectionString": "127.0.0.1",
"e:addressMap": "AddressMapModbus",
"f:keepConnect": true,
"g:slaveAddress": 1,
@@ -29,7 +29,7 @@
"a:id": "SiemensMachine1",
"b:protocol": "Siemens",
"c:type": "Tcp",
"d:connectionString": "10.10.18.251",
"d:connectionString": "127.0.0.1",
"e:model": "S7_1200",
"f:addressMap": "AddressMapSiemens",
"g:keepConnect": true,
@@ -53,7 +53,7 @@
"a:id": "SiemensMachine2",
"b:protocol": "Siemens",
"c:type": "Ppi",
"d:connectionString": "COM11",
"d:connectionString": "COM2",
"e:model": "S7_200",
"f:addressMap": "AddressMapSiemens",
"g:keepConnect": true,
@@ -61,6 +61,14 @@
"i:masterAddress": 0,
"j:src": 1,
"k:dst": 0
},
{
"a:id": "OpcMachine1",
"b:protocol": "Opc",
"c:type": "Da",
"d:connectionString": "opcda://localhost/Matrikon.OPC.Simulation.1",
"e:addressMap": "AddressMapOpc",
"f:tagSpliter": "."
}
],
"addressMap": {
@@ -207,6 +215,25 @@
"Id": "10",
"Name": "Test10"
}
],
"AddressMapOpc":
[
{
"Area": "Random",
"Address": "Real4",
"DataType": "Single",
"Id": "1",
"Name": "Test1",
"DecimalPos": 2
},
{
"Area": "Random",
"Address": "Real8",
"DataType": "Double",
"Id": "2",
"Name": "Test2",
"DecimalPos": 4
}
]
}
}