Skip to content

Commit ec98926

Browse files
committedAug 12, 2018
fix(settings): 配置文件改为引用机制,新增一个空设备的节点。
1 parent 659e7d4 commit ec98926

File tree

9 files changed

+15
-159
lines changed

9 files changed

+15
-159
lines changed
 

‎README.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ Install-Package SharpNodeSettings
1818
<Settings>
1919
<NodeClass Name="Devices" Description="所有的设备的集合对象">
2020
<NodeClass Name="分厂一" Description="">
21-
<NodeClass Name="车间一" Description="" />
21+
<NodeClass Name="车间一" Description="">
22+
<DeviceNode Name="测试空设备" Description="此设备安装在角落,编号0001" DeviceType="0" ConnectTimeOut="2000" CreateTime="2018/8/12 9:26:27" InstallationDate="2018/8/12 9:26:27">
23+
<DeviceRequest Name="数据请求" Description="一次完整的数据请求" Address="0" Length="10" CaptureInterval="1000" PraseRegularCode="B" />
24+
</DeviceNode>
25+
</NodeClass>
2226
<NodeClass Name="车间二" Description="">
2327
<DeviceNode Name="ModbusTcp客户端" Description="这是描述" DeviceType="10" ConnectTimeOut="1000" CreateTime="2018/8/9 19:58:49" InstallationDate="2018/8/9 19:58:49" IpAddress="127.0.0.1" Port="502" Station="1" IsAddressStartWithZero="true" IsWordReverse="false" IsStringReverse="false">
2428
<DeviceRequest Name="数据请求" Description="一次完整的数据请求" Address="0" Length="30" CaptureInterval="1000" PraseRegularCode="ABCD" />

‎SharpNodeSettings.OpcUaServer/SharpNodeSettings.OpcUaServer.csproj

+4-3
Original file line numberDiff line numberDiff line change
@@ -255,13 +255,14 @@
255255
<None Include="App.config" />
256256
</ItemGroup>
257257
<ItemGroup>
258-
<Content Include="App.ico">
258+
<Content Include="..\XmlFile\settings.xml">
259+
<Link>settings.xml</Link>
259260
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
260261
</Content>
261-
<Content Include="Opc.Ua.CertificateGenerator.exe">
262+
<Content Include="App.ico">
262263
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
263264
</Content>
264-
<Content Include="settings.xml">
265+
<Content Include="Opc.Ua.CertificateGenerator.exe">
265266
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
266267
</Content>
267268
<Content Include="SharpNodeSettingsServer.Config.xml">

‎SharpNodeSettings.OpcUaServer/settings.xml

-38
This file was deleted.

‎SharpNodeSettings.RedisServer/SharpNodeSettings.RedisServer.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@
6060
<None Include="packages.config" />
6161
</ItemGroup>
6262
<ItemGroup>
63-
<Content Include="settings.xml">
63+
<Content Include="..\XmlFile\settings.xml">
64+
<Link>settings.xml</Link>
6465
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
6566
</Content>
6667
</ItemGroup>

‎SharpNodeSettings.RedisServer/settings.xml

-38
This file was deleted.

‎SharpNodeSettings.SampleServer/SharpNodeSettings.SampleServer.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656
<None Include="App.config" />
5757
</ItemGroup>
5858
<ItemGroup>
59-
<Content Include="settings.xml">
59+
<Content Include="..\XmlFile\settings.xml">
60+
<Link>settings.xml</Link>
6061
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
6162
</Content>
6263
</ItemGroup>

‎SharpNodeSettings.SampleServer/settings.xml

-38
This file was deleted.

‎SharpNodeSettings.Tools/SharpNodeSettings.Tools.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@
7474
<None Include="App.config" />
7575
</ItemGroup>
7676
<ItemGroup>
77-
<Content Include="settings.xml">
77+
<Content Include="..\XmlFile\settings.xml">
78+
<Link>settings.xml</Link>
7879
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
7980
</Content>
8081
</ItemGroup>

‎SharpNodeSettings.Tools/settings.xml

-38
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.