2016-01-30 update 3

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -5,7 +5,7 @@ VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1 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}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NA200H.UI.ConsoleApp", "NA200H.UI.Console\NA200H.UI.ConsoleApp.csproj", "{D06F6A34-93F6-4139-B485-8F5686E4E2C9}"
EndProject 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 EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NA200H.UI.WPF", "NA200H.UI.WPF\NA200H.UI.WPF.csproj", "{78916B03-C910-468E-B593-667A3EFF68BE}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NA200H.UI.WPF", "NA200H.UI.WPF\NA200H.UI.WPF.csproj", "{78916B03-C910-468E-B593-667A3EFF68BE}"
EndProject EndProject

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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