diff --git a/Modbus.Net/ModBus.Net/AddressCombiner.cs b/Modbus.Net/ModBus.Net/AddressCombiner.cs index 5a7588f..ff276ee 100644 --- a/Modbus.Net/ModBus.Net/AddressCombiner.cs +++ b/Modbus.Net/ModBus.Net/AddressCombiner.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace ModBus.Net { diff --git a/Modbus.Net/ModBus.Net/AddressFormater.cs b/Modbus.Net/ModBus.Net/AddressFormater.cs index 45dfa7d..fe932a3 100644 --- a/Modbus.Net/ModBus.Net/AddressFormater.cs +++ b/Modbus.Net/ModBus.Net/AddressFormater.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace ModBus.Net { diff --git a/Modbus.Net/ModBus.Net/AddressTranslator.cs b/Modbus.Net/ModBus.Net/AddressTranslator.cs index 6e530f3..83f583b 100644 --- a/Modbus.Net/ModBus.Net/AddressTranslator.cs +++ b/Modbus.Net/ModBus.Net/AddressTranslator.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Dynamic; namespace ModBus.Net { diff --git a/Modbus.Net/ModBus.Net/AsyncHelper.cs b/Modbus.Net/ModBus.Net/AsyncHelper.cs index f9b4512..9d93140 100644 --- a/Modbus.Net/ModBus.Net/AsyncHelper.cs +++ b/Modbus.Net/ModBus.Net/AsyncHelper.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Threading; using System.Threading.Tasks; diff --git a/Modbus.Net/ModBus.Net/BaseConnector.cs b/Modbus.Net/ModBus.Net/BaseConnector.cs index 0924822..194bb4e 100644 --- a/Modbus.Net/ModBus.Net/BaseConnector.cs +++ b/Modbus.Net/ModBus.Net/BaseConnector.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Threading.Tasks; namespace ModBus.Net diff --git a/Modbus.Net/ModBus.Net/BaseMachine.cs b/Modbus.Net/ModBus.Net/BaseMachine.cs index 2468057..1265cc7 100644 --- a/Modbus.Net/ModBus.Net/BaseMachine.cs +++ b/Modbus.Net/ModBus.Net/BaseMachine.cs @@ -1,10 +1,6 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; namespace ModBus.Net { diff --git a/Modbus.Net/ModBus.Net/BaseProtocal.cs b/Modbus.Net/ModBus.Net/BaseProtocal.cs index d794615..dba1459 100644 --- a/Modbus.Net/ModBus.Net/BaseProtocal.cs +++ b/Modbus.Net/ModBus.Net/BaseProtocal.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Reflection; -using System.Threading.Tasks; namespace ModBus.Net { diff --git a/Modbus.Net/ModBus.Net/BaseUtility.cs b/Modbus.Net/ModBus.Net/BaseUtility.cs index f303607..dbbaecf 100644 --- a/Modbus.Net/ModBus.Net/BaseUtility.cs +++ b/Modbus.Net/ModBus.Net/BaseUtility.cs @@ -1,9 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; namespace ModBus.Net { diff --git a/Modbus.Net/ModBus.Net/CRC16.cs b/Modbus.Net/ModBus.Net/CRC16.cs index f21bf72..39d72fe 100644 --- a/Modbus.Net/ModBus.Net/CRC16.cs +++ b/Modbus.Net/ModBus.Net/CRC16.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace ModBus.Net { diff --git a/Modbus.Net/ModBus.Net/ComConnector.cs b/Modbus.Net/ModBus.Net/ComConnector.cs index 4398daf..bf4e152 100644 --- a/Modbus.Net/ModBus.Net/ComConnector.cs +++ b/Modbus.Net/ModBus.Net/ComConnector.cs @@ -1,7 +1,5 @@ using System; -using System.Collections.Generic; using System.IO.Ports; -using System.Linq; using System.Text; using System.Threading; using System.Threading.Tasks; diff --git a/Modbus.Net/ModBus.Net/ComProtocalLinker.cs b/Modbus.Net/ModBus.Net/ComProtocalLinker.cs index ffcbdf2..8e11bd3 100644 --- a/Modbus.Net/ModBus.Net/ComProtocalLinker.cs +++ b/Modbus.Net/ModBus.Net/ComProtocalLinker.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace ModBus.Net { diff --git a/Modbus.Net/ModBus.Net/ModBus.Net-xamarin.csproj b/Modbus.Net/ModBus.Net/ModBus.Net-xamarin.csproj new file mode 100644 index 0000000..53611ee --- /dev/null +++ b/Modbus.Net/ModBus.Net/ModBus.Net-xamarin.csproj @@ -0,0 +1,80 @@ + + + + Debug + AnyCPU + {E97FCE46-855D-498B-8E58-00AFF3A1E760} + Library + ModBus.Net + ModBus.Net + v4.5 + + + true + full + false + bin\Debug + DEBUG; + prompt + 4 + false + + + full + true + bin\Release + prompt + 4 + false + + + + + + + + + + + + + + + ConfigurationManager.resx + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Modbus.Net/ModBus.Net/ModbusMachine.cs b/Modbus.Net/ModBus.Net/ModbusMachine.cs index c30eadf..0838692 100644 --- a/Modbus.Net/ModBus.Net/ModbusMachine.cs +++ b/Modbus.Net/ModBus.Net/ModbusMachine.cs @@ -1,8 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace ModBus.Net { diff --git a/Modbus.Net/ModBus.Net/ModbusProtocal.cs b/Modbus.Net/ModBus.Net/ModbusProtocal.cs index 4febb7c..c116185 100644 --- a/Modbus.Net/ModBus.Net/ModbusProtocal.cs +++ b/Modbus.Net/ModBus.Net/ModbusProtocal.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Runtime.Remoting.Messaging; internal enum ModbusProtocalVariableFunctionCode : byte { diff --git a/Modbus.Net/ModBus.Net/ModbusProtocalLinkerBytesExtend.cs b/Modbus.Net/ModBus.Net/ModbusProtocalLinkerBytesExtend.cs index da2ebd2..32f2984 100644 --- a/Modbus.Net/ModBus.Net/ModbusProtocalLinkerBytesExtend.cs +++ b/Modbus.Net/ModBus.Net/ModbusProtocalLinkerBytesExtend.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace ModBus.Net { diff --git a/Modbus.Net/ModBus.Net/ModbusRtuProtocal.cs b/Modbus.Net/ModBus.Net/ModbusRtuProtocal.cs index 415f5e8..c2ef5f6 100644 --- a/Modbus.Net/ModBus.Net/ModbusRtuProtocal.cs +++ b/Modbus.Net/ModBus.Net/ModbusRtuProtocal.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace ModBus.Net { diff --git a/Modbus.Net/ModBus.Net/ModbusRtuProtocalLinker.cs b/Modbus.Net/ModBus.Net/ModbusRtuProtocalLinker.cs index 8134387..e44d315 100644 --- a/Modbus.Net/ModBus.Net/ModbusRtuProtocalLinker.cs +++ b/Modbus.Net/ModBus.Net/ModbusRtuProtocalLinker.cs @@ -1,9 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace ModBus.Net { class ModbusRtuProtocalLinker : ComProtocalLinker diff --git a/Modbus.Net/ModBus.Net/ModbusTcpProtocal.cs b/Modbus.Net/ModBus.Net/ModbusTcpProtocal.cs new file mode 100644 index 0000000..c553e32 --- /dev/null +++ b/Modbus.Net/ModBus.Net/ModbusTcpProtocal.cs @@ -0,0 +1,19 @@ +using System; + +namespace ModBus.Net +{ + /// + /// Modbus/Tcp协议 + /// + public class ModbusTcpProtocal : ModbusProtocal + { + public ModbusTcpProtocal() : this(ConfigurationManager.IP) + { + } + + public ModbusTcpProtocal(string ip) + { + ProtocalLinker = new ModbusTcpProtocalLinker(ip); + } + } +} \ No newline at end of file diff --git a/Modbus.Net/ModBus.Net/ModbusTcpProtocalLinker.cs b/Modbus.Net/ModBus.Net/ModbusTcpProtocalLinker.cs index d738310..d62eb92 100644 --- a/Modbus.Net/ModBus.Net/ModbusTcpProtocalLinker.cs +++ b/Modbus.Net/ModBus.Net/ModbusTcpProtocalLinker.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace ModBus.Net { diff --git a/Modbus.Net/ModBus.Net/ModbusUtility.cs b/Modbus.Net/ModBus.Net/ModbusUtility.cs index ccf3e6e..b407a84 100644 --- a/Modbus.Net/ModBus.Net/ModbusUtility.cs +++ b/Modbus.Net/ModBus.Net/ModbusUtility.cs @@ -1,8 +1,4 @@ using System; -using System.Collections; -using System.Collections.Generic; -using System.Threading.Tasks; -using System.Windows.Forms; /// /// Modbus连接类型 diff --git a/Modbus.Net/ModBus.Net/ProtocalLinker.cs b/Modbus.Net/ModBus.Net/ProtocalLinker.cs index 13e6340..9413085 100644 --- a/Modbus.Net/ModBus.Net/ProtocalLinker.cs +++ b/Modbus.Net/ModBus.Net/ProtocalLinker.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Threading.Tasks; namespace ModBus.Net { diff --git a/Modbus.Net/ModBus.Net/ProtocalLinkerBytesExtend.cs b/Modbus.Net/ModBus.Net/ProtocalLinkerBytesExtend.cs index 511e6e2..e1cfe10 100644 --- a/Modbus.Net/ModBus.Net/ProtocalLinkerBytesExtend.cs +++ b/Modbus.Net/ModBus.Net/ProtocalLinkerBytesExtend.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace ModBus.Net { diff --git a/Modbus.Net/ModBus.Net/ProtocalUnit.cs b/Modbus.Net/ModBus.Net/ProtocalUnit.cs index d40557a..3d0fc14 100644 --- a/Modbus.Net/ModBus.Net/ProtocalUnit.cs +++ b/Modbus.Net/ModBus.Net/ProtocalUnit.cs @@ -1,7 +1,4 @@ using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; namespace ModBus.Net { diff --git a/Modbus.Net/ModBus.Net/SimenseMachine.cs b/Modbus.Net/ModBus.Net/SimenseMachine.cs index 67d9772..3142c23 100644 --- a/Modbus.Net/ModBus.Net/SimenseMachine.cs +++ b/Modbus.Net/ModBus.Net/SimenseMachine.cs @@ -1,8 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace ModBus.Net { diff --git a/Modbus.Net/ModBus.Net/SimenseProtocal.cs b/Modbus.Net/ModBus.Net/SimenseProtocal.cs index 35654c2..6aa84b6 100644 --- a/Modbus.Net/ModBus.Net/SimenseProtocal.cs +++ b/Modbus.Net/ModBus.Net/SimenseProtocal.cs @@ -1,9 +1,6 @@ using System; using System.Collections.Generic; -using System.Diagnostics.Eventing; using System.Linq; -using System.Reflection.Emit; -using System.Windows.Forms; public enum SimenseTypeCode : byte { diff --git a/Modbus.Net/ModBus.Net/SimenseProtocalLinkerBytesExtend.cs b/Modbus.Net/ModBus.Net/SimenseProtocalLinkerBytesExtend.cs index ada714c..9cdfac1 100644 --- a/Modbus.Net/ModBus.Net/SimenseProtocalLinkerBytesExtend.cs +++ b/Modbus.Net/ModBus.Net/SimenseProtocalLinkerBytesExtend.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace ModBus.Net { diff --git a/Modbus.Net/ModBus.Net/SimenseStructDefinition.cs b/Modbus.Net/ModBus.Net/SimenseStructDefinition.cs index 48c96df..3775b6a 100644 --- a/Modbus.Net/ModBus.Net/SimenseStructDefinition.cs +++ b/Modbus.Net/ModBus.Net/SimenseStructDefinition.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace ModBus.Net { diff --git a/Modbus.Net/ModBus.Net/SimenseTcpProtocal.cs b/Modbus.Net/ModBus.Net/SimenseTcpProtocal.cs index c6aed69..3a3da3c 100644 --- a/Modbus.Net/ModBus.Net/SimenseTcpProtocal.cs +++ b/Modbus.Net/ModBus.Net/SimenseTcpProtocal.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace ModBus.Net { diff --git a/Modbus.Net/ModBus.Net/SimenseTcpProtocalLinker.cs b/Modbus.Net/ModBus.Net/SimenseTcpProtocalLinker.cs index 6315f06..5a58f6a 100644 --- a/Modbus.Net/ModBus.Net/SimenseTcpProtocalLinker.cs +++ b/Modbus.Net/ModBus.Net/SimenseTcpProtocalLinker.cs @@ -1,8 +1,5 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; + namespace ModBus.Net { public class SimenseTcpProtocalLinker : TcpProtocalLinker diff --git a/Modbus.Net/ModBus.Net/SimenseUtility.cs b/Modbus.Net/ModBus.Net/SimenseUtility.cs index daab74e..1d4b033 100644 --- a/Modbus.Net/ModBus.Net/SimenseUtility.cs +++ b/Modbus.Net/ModBus.Net/SimenseUtility.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; public enum SimenseType { diff --git a/Modbus.Net/ModBus.Net/TaskManager.cs b/Modbus.Net/ModBus.Net/TaskManager.cs index 1b32005..559fbee 100644 --- a/Modbus.Net/ModBus.Net/TaskManager.cs +++ b/Modbus.Net/ModBus.Net/TaskManager.cs @@ -1,12 +1,10 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Linq; -using System.Text; using System.Threading; using System.Threading.Tasks; using Timer = System.Timers.Timer; -using ModBus.Net; + namespace ModBus.Net { diff --git a/Modbus.Net/ModBus.Net/TcpConnector.cs b/Modbus.Net/ModBus.Net/TcpConnector.cs index bf01ea9..d971036 100644 --- a/Modbus.Net/ModBus.Net/TcpConnector.cs +++ b/Modbus.Net/ModBus.Net/TcpConnector.cs @@ -1,8 +1,5 @@ using System; -using System.IO; -using System.Net; using System.Net.Sockets; -using System.Threading; using System.Threading.Tasks; namespace ModBus.Net diff --git a/Modbus.Net/ModBus.Net/TcpProtocalLinker.cs b/Modbus.Net/ModBus.Net/TcpProtocalLinker.cs index c28c6b8..7bcb601 100644 --- a/Modbus.Net/ModBus.Net/TcpProtocalLinker.cs +++ b/Modbus.Net/ModBus.Net/TcpProtocalLinker.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; namespace ModBus.Net { diff --git a/Modbus.Net/Modbus.Net-xamarin.sln b/Modbus.Net/Modbus.Net-xamarin.sln new file mode 100644 index 0000000..26f250c --- /dev/null +++ b/Modbus.Net/Modbus.Net-xamarin.sln @@ -0,0 +1,17 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModBus.Net-xamarin", "ModBus.Net\ModBus.Net-xamarin.csproj", "{E97FCE46-855D-498B-8E58-00AFF3A1E760}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E97FCE46-855D-498B-8E58-00AFF3A1E760}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E97FCE46-855D-498B-8E58-00AFF3A1E760}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E97FCE46-855D-498B-8E58-00AFF3A1E760}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E97FCE46-855D-498B-8E58-00AFF3A1E760}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/Modbus.Net/Modbus.Net-xamarin.userprefs b/Modbus.Net/Modbus.Net-xamarin.userprefs new file mode 100644 index 0000000..0a271dc --- /dev/null +++ b/Modbus.Net/Modbus.Net-xamarin.userprefs @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + Modbus.Net-xamarin\Modbus.Net.csproj + ModBus.Net\ModBus.Net.csproj + + \ No newline at end of file diff --git a/Modbus.Net/packages/Microsoft.AspNet.WebApi.HelpPage.5.2.0/Content/Areas/HelpPage/ModelDescriptions/ModelNameAttribute.cs.pp b/Modbus.Net/packages/Microsoft.AspNet.WebApi.HelpPage.5.2.0/Content/Areas/HelpPage/ModelDescriptions/ModelNameAttribute.cs.pp new file mode 100644 index 0000000..2faa8c7 --- /dev/null +++ b/Modbus.Net/packages/Microsoft.AspNet.WebApi.HelpPage.5.2.0/Content/Areas/HelpPage/ModelDescriptions/ModelNameAttribute.cs.pp @@ -0,0 +1,18 @@ +using System; + +namespace $rootnamespace$.Areas.HelpPage.ModelDescriptions +{ + /// + /// Use this attribute to change the name of the generated for a type. + /// + [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Enum, AllowMultiple = false, Inherited = false)] + public sealed class ModelNameAttribute : Attribute + { + public ModelNameAttribute(string name) + { + Name = name; + } + + public string Name { get; private set; } + } +} \ No newline at end of file