From 21635b0ad9cdba77b0ea36733db5c85fc8b8385b Mon Sep 17 00:00:00 2001
From: "parallelbgls@outlook.com" <parallelbgls@outlook.com>
Date: Wed, 13 Jan 2016 17:51:17 +0800
Subject: [PATCH] 2016-01-13 update 1

---
 .../ConfigurationManager.Designer.cs          | 17 +++--
 .../ModBus.Net/ConfigurationManager.resx      |  9 ++-
 .../ModBus.Net/ModBus.Net-xamarin.csproj      | 63 -------------------
 .../Modbus/ModbusTcpProtocalLinker.cs         |  2 +-
 .../Siemens/SiemensTcpProtocalLinker.cs       |  2 +-
 Modbus.Net/ModBus.Net/TcpProtocalLinker.cs    |  2 +-
 6 files changed, 22 insertions(+), 73 deletions(-)
 delete mode 100644 Modbus.Net/ModBus.Net/ModBus.Net-xamarin.csproj

diff --git a/Modbus.Net/ModBus.Net/ConfigurationManager.Designer.cs b/Modbus.Net/ModBus.Net/ConfigurationManager.Designer.cs
index a8ecd42..3e90557 100644
--- a/Modbus.Net/ModBus.Net/ConfigurationManager.Designer.cs
+++ b/Modbus.Net/ModBus.Net/ConfigurationManager.Designer.cs
@@ -61,7 +61,7 @@ namespace ModBus.Net {
         }
         
         /// <summary>
-        ///   查找类似 COM6 的本地化字符串。
+        ///   查找类似 COM1 的本地化字符串。
         /// </summary>
         internal static string COM {
             get {
@@ -70,7 +70,7 @@ namespace ModBus.Net {
         }
         
         /// <summary>
-        ///   查找类似 192.168.3.247 的本地化字符串。
+        ///   查找类似 192.168.1.1 的本地化字符串。
         /// </summary>
         internal static string IP {
             get {
@@ -90,9 +90,18 @@ namespace ModBus.Net {
         /// <summary>
         ///   查找类似 502 的本地化字符串。
         /// </summary>
-        internal static string Port {
+        internal static string ModbusPort {
             get {
-                return ResourceManager.GetString("Port", resourceCulture);
+                return ResourceManager.GetString("ModbusPort", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 102 的本地化字符串。
+        /// </summary>
+        internal static string SiemensPort {
+            get {
+                return ResourceManager.GetString("SiemensPort", resourceCulture);
             }
         }
     }
diff --git a/Modbus.Net/ModBus.Net/ConfigurationManager.resx b/Modbus.Net/ModBus.Net/ConfigurationManager.resx
index 0c3084d..720ced4 100644
--- a/Modbus.Net/ModBus.Net/ConfigurationManager.resx
+++ b/Modbus.Net/ModBus.Net/ConfigurationManager.resx
@@ -118,15 +118,18 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="COM" xml:space="preserve">
-    <value>COM6</value>
+    <value>COM1</value>
   </data>
   <data name="IP" xml:space="preserve">
-    <value>192.168.3.247</value>
+    <value>192.168.1.1</value>
   </data>
   <data name="IPConnectionTimeout" xml:space="preserve">
     <value>5000</value>
   </data>
-  <data name="Port" xml:space="preserve">
+  <data name="ModbusPort" xml:space="preserve">
     <value>502</value>
   </data>
+  <data name="SiemensPort" xml:space="preserve">
+    <value>102</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Modbus.Net/ModBus.Net/ModBus.Net-xamarin.csproj b/Modbus.Net/ModBus.Net/ModBus.Net-xamarin.csproj
deleted file mode 100644
index 23a3ac3..0000000
--- a/Modbus.Net/ModBus.Net/ModBus.Net-xamarin.csproj
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{E97FCE46-855D-498B-8E58-00AFF3A1E760}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>ModBus.Net</RootNamespace>
-    <AssemblyName>ModBus.Net</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="AddressCombiner.cs" />
-    <Compile Include="AddressFormater.cs" />
-    <Compile Include="AddressTranslator.cs" />
-    <Compile Include="AsyncHelper.cs" />
-    <Compile Include="BaseConnector.cs" />
-    <Compile Include="BaseMachine.cs" />
-    <Compile Include="BaseProtocal.cs" />
-    <Compile Include="BaseUtility.cs" />
-    <Compile Include="ComConnector.cs" />
-    <Compile Include="ComProtocalLinker.cs" />
-    <Compile Include="ConfigurationManager.Designer.cs">
-      <DependentUpon>ConfigurationManager.resx</DependentUpon>
-    </Compile>
-    <Compile Include="CRC16.cs" />
-    <Compile Include="IProtocalFormatting.cs" />
-    <Compile Include="ProtocalLinker.cs" />
-    <Compile Include="ProtocalLinkerBytesExtend.cs" />
-    <Compile Include="ProtocalUnit.cs" />
-    <Compile Include="TaskManager.cs" />
-    <Compile Include="TcpConnector.cs" />
-    <Compile Include="TcpProtocalLinker.cs" />
-    <Compile Include="ValueHelper.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <None Include="ConfigurationManager.resx" />
-  </ItemGroup>
-  <ItemGroup />
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Modbus.Net/ModBus.Net/Modbus/ModbusTcpProtocalLinker.cs b/Modbus.Net/ModBus.Net/Modbus/ModbusTcpProtocalLinker.cs
index cbe4272..5205339 100644
--- a/Modbus.Net/ModBus.Net/Modbus/ModbusTcpProtocalLinker.cs
+++ b/Modbus.Net/ModBus.Net/Modbus/ModbusTcpProtocalLinker.cs
@@ -18,7 +18,7 @@
             return true;
         }
 
-        public ModbusTcpProtocalLinker(string ip) : base(ip, 102)
+        public ModbusTcpProtocalLinker(string ip) : base(ip, int.Parse(ConfigurationManager.ModbusPort))
         {
             
         }
diff --git a/Modbus.Net/ModBus.Net/Siemens/SiemensTcpProtocalLinker.cs b/Modbus.Net/ModBus.Net/Siemens/SiemensTcpProtocalLinker.cs
index 8f1253a..02f4d7d 100644
--- a/Modbus.Net/ModBus.Net/Siemens/SiemensTcpProtocalLinker.cs
+++ b/Modbus.Net/ModBus.Net/Siemens/SiemensTcpProtocalLinker.cs
@@ -29,7 +29,7 @@ namespace ModBus.Net.Siemens
         }
 
         public SiemensTcpProtocalLinker(string ip)
-            : base(ip, 102)
+            : base(ip, int.Parse(ConfigurationManager.SiemensPort))
         {
             
         }
diff --git a/Modbus.Net/ModBus.Net/TcpProtocalLinker.cs b/Modbus.Net/ModBus.Net/TcpProtocalLinker.cs
index ec14b45..68b556b 100644
--- a/Modbus.Net/ModBus.Net/TcpProtocalLinker.cs
+++ b/Modbus.Net/ModBus.Net/TcpProtocalLinker.cs
@@ -8,7 +8,7 @@ namespace ModBus.Net
     public abstract class TcpProtocalLinker : ProtocalLinker
     {
         
-        protected TcpProtocalLinker() : this(ConfigurationManager.IP, int.Parse(ConfigurationManager.Port))
+        protected TcpProtocalLinker() : this(ConfigurationManager.IP, int.Parse(ConfigurationManager.ModbusPort))
         {
             
         }