2016-01-30 update 3
This commit is contained in:
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|||||||
@@ -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>
|
||||||
/// 地址组合器,组合后的每一组地址将只需一次向设备进行通讯
|
/// 地址组合器,组合后的每一组地址将只需一次向设备进行通讯
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
|
|
||||||
namespace ModBus.Net
|
namespace Modbus.Net
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 地址编码器
|
/// 地址编码器
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
|
||||||
namespace ModBus.Net
|
namespace Modbus.Net
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 地址翻译器
|
/// 地址翻译器
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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>
|
||||||
/// 向设备设置值的方式
|
/// 向设备设置值的方式
|
||||||
|
|||||||
@@ -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>
|
||||||
/// 基本协议
|
/// 基本协议
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
|
|
||||||
namespace ModBus.Net
|
namespace Modbus.Net
|
||||||
{
|
{
|
||||||
public class Crc16
|
public class Crc16
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
|
|
||||||
namespace ModBus.Net
|
namespace Modbus.Net
|
||||||
{
|
{
|
||||||
public abstract class ComProtocalLinker : ProtocalLinker
|
public abstract class ComProtocalLinker : ProtocalLinker
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
namespace ModBus.Net
|
namespace Modbus.Net
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 协议转换的接口
|
/// 协议转换的接口
|
||||||
|
|||||||
@@ -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 />
|
||||||
|
|||||||
@@ -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("")]
|
||||||
|
|||||||
@@ -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>
|
||||||
/// 基本的协议连接器
|
/// 基本的协议连接器
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
|
|
||||||
namespace ModBus.Net
|
namespace Modbus.Net
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 协议字节伸缩
|
/// 协议字节伸缩
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
|
|
||||||
namespace ModBus.Net
|
namespace Modbus.Net
|
||||||
{
|
{
|
||||||
public abstract class ProtocalUnit : IProtocalFormatting
|
public abstract class ProtocalUnit : IProtocalFormatting
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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收到的数据
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
|
|
||||||
namespace ModBus.Net
|
namespace Modbus.Net
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Tcp连接对象
|
/// Tcp连接对象
|
||||||
|
|||||||
@@ -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类
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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.
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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数据单元翻译器
|
||||||
|
|||||||
@@ -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" />
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
|
|
||||||
namespace ModBus.Net.Modbus
|
namespace Modbus.Net.Modbus
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Tcp协议字节伸缩
|
/// Tcp协议字节伸缩
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
namespace ModBus.Net.Modbus
|
namespace Modbus.Net.Modbus
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Modbus/Rtu协议
|
/// Modbus/Rtu协议
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
namespace ModBus.Net.Modbus
|
namespace Modbus.Net.Modbus
|
||||||
{
|
{
|
||||||
class ModbusRtuProtocalLinker : ComProtocalLinker
|
class ModbusRtuProtocalLinker : ComProtocalLinker
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
namespace ModBus.Net.Modbus
|
namespace Modbus.Net.Modbus
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Modbus/Tcp协议
|
/// Modbus/Tcp协议
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
namespace ModBus.Net.Modbus
|
namespace Modbus.Net.Modbus
|
||||||
{
|
{
|
||||||
public class ModbusTcpProtocalLinker : TcpProtocalLinker
|
public class ModbusTcpProtocalLinker : TcpProtocalLinker
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace ModBus.Net.Modbus
|
namespace Modbus.Net.Modbus
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Modbus连接类型
|
/// Modbus连接类型
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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" />
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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" />
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
|
|
||||||
namespace ModBus.Net.Siemens
|
namespace Modbus.Net.Siemens
|
||||||
{
|
{
|
||||||
public class SiemensTcpProtocalLinkerBytesExtend : ProtocalLinkerBytesExtend
|
public class SiemensTcpProtocalLinkerBytesExtend : ProtocalLinkerBytesExtend
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
namespace ModBus.Net.Siemens
|
namespace Modbus.Net.Siemens
|
||||||
{
|
{
|
||||||
public struct TodClockStatus
|
public struct TodClockStatus
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
|
|
||||||
namespace ModBus.Net.Siemens
|
namespace Modbus.Net.Siemens
|
||||||
{
|
{
|
||||||
public class SiemensTcpProtocalLinker : TcpProtocalLinker
|
public class SiemensTcpProtocalLinker : TcpProtocalLinker
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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" />
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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" />
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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" />
|
||||||
|
|||||||
Reference in New Issue
Block a user