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

2016-01-30 update 3

Browse Source
This commit is contained in:
parallelbgls@outlook.com
2016-01-30 15:20:14 +08:00
parent a57fd39ab5
commit 1e8a7130a6
74 changed files with 97 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modbus.Net/CrossLampControl.WebApi/Controllers/CrossLampController.cs
View File

@@ -6,8 +6,8 @@ using System.Net.Http;
using System.Web.Http;
using System.Web.Http.Routing;
using CrossLampControl.WebApi.Models;
using ModBus.Net;
using ModBus.Net.Siemens;
using Modbus.Net;
using Modbus.Net.Siemens;
namespace CrossLampControl.WebApi.Controllers
{

4
Modbus.Net/CrossLampControl.WebApi/CrossLampControl.WebApi.csproj
View File

@@ -316,9 +316,9 @@
<Project>{6258f9d9-0df4-497f-9f3b-6d2f6f752a21}</Project>
<Name>Modbus.Net.Siemens</Name>
</ProjectReference>
<ProjectReference Include="..\ModBus.Net\ModBus.Net.csproj">
<ProjectReference Include="..\ModBus.Net\Modbus.Net.csproj">
<Project>{124ebef2-8960-4447-84cf-1d683b1ef7cc}</Project>
<Name>ModBus.Net</Name>
<Name>Modbus.Net</Name>
</ProjectReference>
</ItemGroup>
<PropertyGroup>

2
Modbus.Net/ModBus.Net/AddressCombiner.cs
View File

@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;
namespace ModBus.Net
namespace Modbus.Net
{
/// <summary>
/// 地址组合器，组合后的每一组地址将只需一次向设备进行通讯

2
Modbus.Net/ModBus.Net/AddressFormater.cs
View File

@@ -1,6 +1,6 @@
using System;
namespace ModBus.Net
namespace Modbus.Net
{
/// <summary>
/// 地址编码器

2
Modbus.Net/ModBus.Net/AddressTranslator.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
namespace ModBus.Net
namespace Modbus.Net
{
/// <summary>
/// 地址翻译器

2
Modbus.Net/ModBus.Net/AsyncHelper.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
namespace ModBus.Net
namespace Modbus.Net
{
public static class AsyncHelper
{

2
Modbus.Net/ModBus.Net/BaseConnector.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Threading.Tasks;
namespace ModBus.Net
namespace Modbus.Net
{
public abstract class BaseConnector
{

2
Modbus.Net/ModBus.Net/BaseMachine.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace ModBus.Net
namespace Modbus.Net
{
/// <summary>
/// 向设备设置值的方式

2
Modbus.Net/ModBus.Net/BaseProtocal.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Reflection;
using System.Threading.Tasks;
namespace ModBus.Net
namespace Modbus.Net
{
/// <summary>
/// 基本协议

2
Modbus.Net/ModBus.Net/BaseUtility.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace ModBus.Net
namespace Modbus.Net
{
public abstract class BaseUtility
{

2
Modbus.Net/ModBus.Net/CRC16.cs
View File

@@ -1,6 +1,6 @@
using System;
namespace ModBus.Net
namespace Modbus.Net
{
public class Crc16
{

2
Modbus.Net/ModBus.Net/ComConnector.cs
View File

@@ -4,7 +4,7 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace ModBus.Net
namespace Modbus.Net
{
public class ComConnector : BaseConnector, IDisposable
{

2
Modbus.Net/ModBus.Net/ComProtocalLinker.cs
View File

@@ -1,6 +1,6 @@
using System;
namespace ModBus.Net
namespace Modbus.Net
{
public abstract class ComProtocalLinker : ProtocalLinker
{

4
Modbus.Net/ModBus.Net/ConfigurationManager.Designer.cs generated
View File

@@ -8,7 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace ModBus.Net {
namespace Modbus.Net {
using System;
@@ -39,7 +39,7 @@ namespace ModBus.Net {
public static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ModBus.Net.ConfigurationManager", typeof(ConfigurationManager).Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Modbus.Net.ConfigurationManager", typeof(ConfigurationManager).Assembly);
resourceMan = temp;
}
return resourceMan;

2
Modbus.Net/ModBus.Net/IProtocalFormatting.cs
View File

@@ -1,4 +1,4 @@
namespace ModBus.Net
namespace Modbus.Net
{
/// <summary>
/// 协议转换的接口

4
Modbus.Net/ModBus.Net/ModBus.Net.csproj
View File

@@ -7,8 +7,8 @@
<ProjectGuid>{124EBEF2-8960-4447-84CF-1D683B1EF7CC}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ModBus.Net</RootNamespace>
<AssemblyName>ModBus.Net</AssemblyName>
<RootNamespace>Modbus.Net</RootNamespace>
<AssemblyName>Modbus.Net</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />

4
Modbus.Net/ModBus.Net/Properties/AssemblyInfo.cs
View File

@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
// 特性集控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("ModBus.Net")]
[assembly: AssemblyTitle("Modbus.Net")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("杭州德联科技股份有限公司")]
[assembly: AssemblyProduct("ModBus.Net")]
[assembly: AssemblyProduct("Modbus.Net")]
[assembly: AssemblyCopyright("Copyright © Chris L. 2014 HangZhou Delian Technology")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

2
Modbus.Net/ModBus.Net/ProtocalLinker.cs
View File

@@ -2,7 +2,7 @@
using System.Text;
using System.Threading.Tasks;
namespace ModBus.Net
namespace Modbus.Net
{
/// <summary>
/// 基本的协议连接器

2
Modbus.Net/ModBus.Net/ProtocalLinkerBytesExtend.cs
View File

@@ -1,6 +1,6 @@
using System;
namespace ModBus.Net
namespace Modbus.Net
{
/// <summary>
/// 协议字节伸缩

2
Modbus.Net/ModBus.Net/ProtocalUnit.cs
View File

@@ -1,6 +1,6 @@
using System;
namespace ModBus.Net
namespace Modbus.Net
{
public abstract class ProtocalUnit : IProtocalFormatting
{

2
Modbus.Net/ModBus.Net/TaskManager.cs
View File

@@ -5,7 +5,7 @@ using System.Threading;
using System.Threading.Tasks;
namespace ModBus.Net
namespace Modbus.Net
{
public static class TimeRestore
{

2
Modbus.Net/ModBus.Net/TcpConnector.cs
View File

@@ -4,7 +4,7 @@ using System.Net.Sockets;
using System.Threading;
using System.Threading.Tasks;
namespace ModBus.Net
namespace Modbus.Net
{
/// <summary>
/// Socket收到的数据

2
Modbus.Net/ModBus.Net/TcpProtocalLinker.cs
View File

@@ -1,6 +1,6 @@
using System;
namespace ModBus.Net
namespace Modbus.Net
{
/// <summary>
/// Tcp连接对象

2
Modbus.Net/ModBus.Net/ValueHelper.cs
View File

@@ -4,7 +4,7 @@ using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
namespace ModBus.Net
namespace Modbus.Net
{
/// <summary>
/// 值与字节数组之间转换的辅助类，这是一个Singleton类

2
Modbus.Net/Modbus.Net.FBox/AddressCombinerFBox.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ModBus.Net.FBox
namespace Modbus.Net.FBox
{
public class AddressCombinerFBox : AddressCombiner
{

2
Modbus.Net/Modbus.Net.FBox/AddressFormaterFBox.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ModBus.Net.FBox
namespace Modbus.Net.FBox
{
public class AddressFormaterFBox : AddressFormater
{

2
Modbus.Net/Modbus.Net.FBox/AddressTranslatorFBox.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ModBus.Net.FBox
namespace Modbus.Net.FBox
{
public class AddressTranslatorFBox : AddressTranslator
{

2
Modbus.Net/Modbus.Net.FBox/Constants.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ModBus.Net.FBox
namespace Modbus.Net.FBox
{
public enum SignalRServer
{

2
Modbus.Net/Modbus.Net.FBox/Entity.cs
View File

@@ -2,7 +2,7 @@
using System.Collections.Generic;
using Newtonsoft.Json;
namespace ModBus.Net.FBox
namespace Modbus.Net.FBox
{
public class BoxGroup
{

2
Modbus.Net/Modbus.Net.FBox/FBoxConnector.cs
View File

@@ -10,7 +10,7 @@ using Microsoft.AspNet.SignalR.Client;
using Newtonsoft.Json;
using Thinktecture.IdentityModel.Client;
namespace ModBus.Net.FBox
namespace Modbus.Net.FBox
{
public struct SignalRSigninMsg
{

2
Modbus.Net/Modbus.Net.FBox/FBoxMachine.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
namespace ModBus.Net.FBox
namespace Modbus.Net.FBox
{
public class FBoxMachine : BaseMachine
{

6
Modbus.Net/Modbus.Net.FBox/FBoxProtocal.cs
View File

@@ -3,10 +3,10 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using ModBus.Net;
using ModBus.Net.FBox;
using Modbus.Net;
using Modbus.Net.FBox;
namespace ModBus.Net.FBox
namespace Modbus.Net.FBox
{
public abstract class FBoxProtocal : BaseProtocal
{

2
Modbus.Net/Modbus.Net.FBox/FBoxProtocalLinker.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ModBus.Net.FBox
namespace Modbus.Net.FBox
{
public class FBoxProtocalLinker : ProtocalLinker
{

2
Modbus.Net/Modbus.Net.FBox/FBoxSignalRProtocal.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ModBus.Net.FBox
namespace Modbus.Net.FBox
{
public class FBoxSignalRProtocal : FBoxProtocal
{

2
Modbus.Net/Modbus.Net.FBox/FBoxSignalRProtocalLinker.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ModBus.Net.FBox
namespace Modbus.Net.FBox
{
public class FBoxSignalRProtocalLinker : FBoxProtocalLinker
{

2
Modbus.Net/Modbus.Net.FBox/FBoxUtility.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ModBus.Net.FBox
namespace Modbus.Net.FBox
{
public enum FBoxType
{

12
Modbus.Net/Modbus.Net.FBox/Modbus.Net.FBox.csproj
View File

@@ -67,16 +67,16 @@
<Compile Include="FBoxUtility.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ModBus.Net\ModBus.Net.csproj">
<Project>{124ebef2-8960-4447-84cf-1d683b1ef7cc}</Project>
<Name>ModBus.Net</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ModBus.Net\Modbus.Net.csproj">
<Project>{124ebef2-8960-4447-84cf-1d683b1ef7cc}</Project>
<Name>Modbus.Net</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

2
Modbus.Net/Modbus.Net.Modbus/AddressFormaterModbus.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ModBus.Net.Modbus
namespace Modbus.Net.Modbus
{
public class AddressFormaterNA200H : AddressFormater
{

2
Modbus.Net/Modbus.Net.Modbus/AddressTranslatorModbus.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ModBus.Net.Modbus
namespace Modbus.Net.Modbus
{
/// <summary>
/// NA200H数据单元翻译器

4
Modbus.Net/Modbus.Net.Modbus/Modbus.Net.Modbus.csproj
View File

@@ -54,9 +54,9 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ModBus.Net\ModBus.Net.csproj">
<ProjectReference Include="..\ModBus.Net\Modbus.Net.csproj">
<Project>{124ebef2-8960-4447-84cf-1d683b1ef7cc}</Project>
<Name>ModBus.Net</Name>
<Name>Modbus.Net</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

2
Modbus.Net/Modbus.Net.Modbus/ModbusMachine.cs
View File

@@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace ModBus.Net.Modbus
namespace Modbus.Net.Modbus
{
public class ModbusMachine : BaseMachine
{

2
Modbus.Net/Modbus.Net.Modbus/ModbusProtocal.cs
View File

@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Threading.Tasks;
namespace ModBus.Net.Modbus
namespace Modbus.Net.Modbus
{
internal enum ModbusProtocalVariableFunctionCode : byte
{

2
Modbus.Net/Modbus.Net.Modbus/ModbusProtocalLinkerBytesExtend.cs
View File

@@ -1,6 +1,6 @@
using System;
namespace ModBus.Net.Modbus
namespace Modbus.Net.Modbus
{
/// <summary>
/// Tcp协议字节伸缩

2
Modbus.Net/Modbus.Net.Modbus/ModbusRtuProtocal.cs
View File

@@ -1,4 +1,4 @@
namespace ModBus.Net.Modbus
namespace Modbus.Net.Modbus
{
/// <summary>
/// Modbus/Rtu协议

2
Modbus.Net/Modbus.Net.Modbus/ModbusRtuProtocalLinker.cs
View File

@@ -1,4 +1,4 @@
namespace ModBus.Net.Modbus
namespace Modbus.Net.Modbus
{
class ModbusRtuProtocalLinker : ComProtocalLinker
{

2
Modbus.Net/Modbus.Net.Modbus/ModbusTcpProtocal.cs
View File

@@ -1,4 +1,4 @@
namespace ModBus.Net.Modbus
namespace Modbus.Net.Modbus
{
/// <summary>
/// Modbus/Tcp协议

2
Modbus.Net/Modbus.Net.Modbus/ModbusTcpProtocalLinker.cs
View File

@@ -1,4 +1,4 @@
namespace ModBus.Net.Modbus
namespace Modbus.Net.Modbus
{
public class ModbusTcpProtocalLinker : TcpProtocalLinker
{

2
Modbus.Net/Modbus.Net.Modbus/ModbusUtility.cs
View File

@@ -1,6 +1,6 @@
using System.Threading.Tasks;
namespace ModBus.Net.Modbus
namespace Modbus.Net.Modbus
{
/// <summary>
/// Modbus连接类型

2
Modbus.Net/Modbus.Net.OPC/AddressFormaterOpc.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ModBus.Net.OPC
namespace Modbus.Net.OPC
{
public class AddressFormaterOpc : AddressFormater
{

2
Modbus.Net/Modbus.Net.OPC/FBox/FBoxOpcDaManchine.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ModBus.Net.OPC.FBox
namespace Modbus.Net.OPC.FBox
{
public class FBoxOpcDaMachine : OpcDaMachine
{

4
Modbus.Net/Modbus.Net.OPC/Modbus.Net.OPC.csproj
View File

@@ -75,9 +75,9 @@
<Project>{4f43b6f0-0c32-4c34-978e-9b8b5b0b6e80}</Project>
<Name>h-opc</Name>
</ProjectReference>
<ProjectReference Include="..\ModBus.Net\ModBus.Net.csproj">
<ProjectReference Include="..\ModBus.Net\Modbus.Net.csproj">
<Project>{124ebef2-8960-4447-84cf-1d683b1ef7cc}</Project>
<Name>ModBus.Net</Name>
<Name>Modbus.Net</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

2
Modbus.Net/Modbus.Net.OPC/OpcDaConnector.cs
View File

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
using Hylasoft.Opc.Common;
using Hylasoft.Opc.Da;
namespace ModBus.Net.OPC
namespace Modbus.Net.OPC
{
public class OpcDaConnector : BaseConnector
{

2
Modbus.Net/Modbus.Net.OPC/OpcDaMachine.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ModBus.Net.OPC
namespace Modbus.Net.OPC
{
public class OpcDaMachine : BaseMachine
{

2
Modbus.Net/Modbus.Net.OPC/OpcDaProtocal.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ModBus.Net.OPC
namespace Modbus.Net.OPC
{
public class OpcDaProtocal : OpcProtocal
{

2
Modbus.Net/Modbus.Net.OPC/OpcDaProtocalLinker.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ModBus.Net.OPC
namespace Modbus.Net.OPC
{
public class OpcDaProtocalLinker : ProtocalLinker
{

2
Modbus.Net/Modbus.Net.OPC/OpcDaUtility.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ModBus.Net.OPC
namespace Modbus.Net.OPC
{
public class OpcDaUtility : BaseUtility
{

2
Modbus.Net/Modbus.Net.OPC/OpcProtocal.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ModBus.Net.OPC
namespace Modbus.Net.OPC
{
public abstract class OpcProtocal : BaseProtocal
{

2
Modbus.Net/Modbus.Net.Siemens/AddressFormaterSiemens.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ModBus.Net.Siemens
namespace Modbus.Net.Siemens
{
public class AddressFormaterSiemens : AddressFormater
{

2
Modbus.Net/Modbus.Net.Siemens/AddressTranslatorSiemens.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
namespace ModBus.Net.Siemens
namespace Modbus.Net.Siemens
{
public class AddressTranslatorSiemens : AddressTranslator
{

4
Modbus.Net/Modbus.Net.Siemens/Modbus.Net.Siemens.csproj
View File

@@ -53,9 +53,9 @@
<Compile Include="SiemensUtility.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ModBus.Net\ModBus.Net.csproj">
<ProjectReference Include="..\ModBus.Net\Modbus.Net.csproj">
<Project>{124ebef2-8960-4447-84cf-1d683b1ef7cc}</Project>
<Name>ModBus.Net</Name>
<Name>Modbus.Net</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

2
Modbus.Net/Modbus.Net.Siemens/SiemensMachine.cs
View File

@@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace ModBus.Net.Siemens
namespace Modbus.Net.Siemens
{
public class SiemensMachine : BaseMachine
{

2
Modbus.Net/Modbus.Net.Siemens/SiemensProtocal.cs
View File

@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;
namespace ModBus.Net.Siemens
namespace Modbus.Net.Siemens
{
public enum SiemensTypeCode : byte
{

2
Modbus.Net/Modbus.Net.Siemens/SiemensProtocalLinkerBytesExtend.cs
View File

@@ -1,6 +1,6 @@
using System;
namespace ModBus.Net.Siemens
namespace Modbus.Net.Siemens
{
public class SiemensTcpProtocalLinkerBytesExtend : ProtocalLinkerBytesExtend
{

2
Modbus.Net/Modbus.Net.Siemens/SiemensStructDefinition.cs
View File

@@ -1,4 +1,4 @@
namespace ModBus.Net.Siemens
namespace Modbus.Net.Siemens
{
public struct TodClockStatus
{

2
Modbus.Net/Modbus.Net.Siemens/SiemensTcpProtocal.cs
View File

@@ -1,6 +1,6 @@
using System.Threading.Tasks;
namespace ModBus.Net.Siemens
namespace Modbus.Net.Siemens
{
public class SiemensTcpProtocal : SiemensProtocal
{

2
Modbus.Net/Modbus.Net.Siemens/SiemensTcpProtocalLinker.cs
View File

@@ -1,6 +1,6 @@
using System;
namespace ModBus.Net.Siemens
namespace Modbus.Net.Siemens
{
public class SiemensTcpProtocalLinker : TcpProtocalLinker
{

2
Modbus.Net/Modbus.Net.Siemens/SiemensUtility.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Threading.Tasks;
namespace ModBus.Net.Siemens
namespace Modbus.Net.Siemens
{
public enum SiemensType
{

2
Modbus.Net/Modbus.Net.sln
View File

@@ -5,7 +5,7 @@ VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NA200H.UI.ConsoleApp", "NA200H.UI.Console\NA200H.UI.ConsoleApp.csproj", "{D06F6A34-93F6-4139-B485-8F5686E4E2C9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModBus.Net", "ModBus.Net\ModBus.Net.csproj", "{124EBEF2-8960-4447-84CF-1D683B1EF7CC}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Modbus.Net", "ModBus.Net\Modbus.Net.csproj", "{124EBEF2-8960-4447-84CF-1D683B1EF7CC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NA200H.UI.WPF", "NA200H.UI.WPF\NA200H.UI.WPF.csproj", "{78916B03-C910-468E-B593-667A3EFF68BE}"
EndProject

4
Modbus.Net/NA200H.UI.Console/NA200H.UI.ConsoleApp.csproj
View File

@@ -57,9 +57,9 @@
<Project>{6258f9d9-0df4-497f-9f3b-6d2f6f752a21}</Project>
<Name>Modbus.Net.Siemens</Name>
</ProjectReference>
<ProjectReference Include="..\ModBus.Net\ModBus.Net.csproj">
<ProjectReference Include="..\ModBus.Net\Modbus.Net.csproj">
<Project>{124ebef2-8960-4447-84cf-1d683b1ef7cc}</Project>
<Name>ModBus.Net</Name>
<Name>Modbus.Net</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

6
Modbus.Net/NA200H.UI.Console/Program.cs
View File

@@ -4,10 +4,10 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using ModBus.Net;
using Modbus.Net;
using System.Reflection;
using ModBus.Net.Modbus;
using ModBus.Net.Siemens;
using Modbus.Net.Modbus;
using Modbus.Net.Siemens;
namespace NA200H.UI.ConsoleApp
{

6
Modbus.Net/NA200H.UI.WPF/MainWindow.xaml.cs
View File

@@ -1,10 +1,10 @@
using System;
using System.Collections.Generic;
using System.Threading;
using ModBus.Net;
using Modbus.Net;
using System.Windows;
using ModBus.Net.Modbus;
using ModBus.Net.Siemens;
using Modbus.Net.Modbus;
using Modbus.Net.Siemens;
namespace NA200H.UI.WPF

4
Modbus.Net/NA200H.UI.WPF/NA200H.UI.WPF.csproj
View File

@@ -103,9 +103,9 @@
<Project>{6258f9d9-0df4-497f-9f3b-6d2f6f752a21}</Project>
<Name>Modbus.Net.Siemens</Name>
</ProjectReference>
<ProjectReference Include="..\ModBus.Net\ModBus.Net.csproj">
<ProjectReference Include="..\ModBus.Net\Modbus.Net.csproj">
<Project>{124ebef2-8960-4447-84cf-1d683b1ef7cc}</Project>
<Name>ModBus.Net</Name>
<Name>Modbus.Net</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

4
Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/MainWindow.xaml.cs
View File

@@ -12,8 +12,8 @@ using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using ModBus.Net;
using ModBus.Net.Siemens;
using Modbus.Net;
using Modbus.Net.Siemens;
namespace Siemens_S7_200.UI.WPF.TaskTest
{

4
Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Siemens_S7_200.UI.WPF.TaskTest.csproj
View File

@@ -99,9 +99,9 @@
<Project>{6258f9d9-0df4-497f-9f3b-6d2f6f752a21}</Project>
<Name>Modbus.Net.Siemens</Name>
</ProjectReference>
<ProjectReference Include="..\ModBus.Net\ModBus.Net.csproj">
<ProjectReference Include="..\ModBus.Net\Modbus.Net.csproj">
<Project>{124ebef2-8960-4447-84cf-1d683b1ef7cc}</Project>
<Name>ModBus.Net</Name>
<Name>Modbus.Net</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />