From c45b779b48ff00f7a8c248236a0fca515b226954 Mon Sep 17 00:00:00 2001
From: parallelbgls <parallelbgls@outlook.com>
Date: Wed, 24 May 2017 16:48:44 +0800
Subject: [PATCH] Fix a bug in LRC

---
 Modbus.Net/src/Base.Common/CRC16.cs           |  2 ++
 .../Modbus.Net.Tests/Modbus.Net.Tests.csproj  |  5 +++
 Tests/Modbus.Net.Tests/Modbus.Net.orderedtest | 33 +++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 Tests/Modbus.Net.Tests/Modbus.Net.orderedtest

diff --git a/Modbus.Net/src/Base.Common/CRC16.cs b/Modbus.Net/src/Base.Common/CRC16.cs
index 478d6e2..16e19b2 100644
--- a/Modbus.Net/src/Base.Common/CRC16.cs
+++ b/Modbus.Net/src/Base.Common/CRC16.cs
@@ -176,6 +176,8 @@ namespace Modbus.Net
                     }
                 hexTotal = string.Concat(hexByte, hexTotal);
             }
+            if (hexTotal.Length == 0) hexTotal = "00" + hexTotal;
+            if (hexTotal.Length == 1) hexTotal = "0" + hexTotal;
             return hexTotal == checkString;
         }
 
diff --git a/Tests/Modbus.Net.Tests/Modbus.Net.Tests.csproj b/Tests/Modbus.Net.Tests/Modbus.Net.Tests.csproj
index 82f82f2..0d888dc 100644
--- a/Tests/Modbus.Net.Tests/Modbus.Net.Tests.csproj
+++ b/Tests/Modbus.Net.Tests/Modbus.Net.Tests.csproj
@@ -79,6 +79,11 @@
       <Name>Modbus.Net</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Modbus.Net.orderedtest">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
diff --git a/Tests/Modbus.Net.Tests/Modbus.Net.orderedtest b/Tests/Modbus.Net.Tests/Modbus.Net.orderedtest
new file mode 100644
index 0000000..cb74ea2
--- /dev/null
+++ b/Tests/Modbus.Net.Tests/Modbus.Net.orderedtest
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<OrderedTest name="orderedtest1" storage="d:\projects\modbus.net\tests\modbus.net.tests\orderedtest1.orderedtest" id="c2f51f4c-19e8-42d2-8c7f-1dbb4ebb2e88" continueAfterFailure="true" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
+  <TestLinks>
+    <TestLink id="8fc138ca-a847-7ba6-30bd-8465e5d81166" name="AddressCombinerSingleTest" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="948ce1c7-1a93-ff61-879f-01d07c465a96" name="AddressCombinerContinusTest" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="bcb65caa-0479-7113-a94c-0f4eda0fe7aa" name="AddressCombinerContinusLimitTest" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="97edc693-ec72-8e16-4387-2f8694c03de1" name="AddressCombinerNumericJumpTest" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="007296fa-3356-9471-45ea-c1b0e44d0e5e" name="AddressCombinerNumericJumpLimitTest" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="451b2cd5-84ee-1363-4cbe-cca378ad88dc" name="AddressCombinerPercentageJumpTest" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="10c49cd9-2989-03de-ebcc-bb2e64bc5fe5" name="AddressCombinerPercentageJumpLimitTest" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="a81ec237-5ad5-5e28-7818-e20a7c71cbd3" name="BaseMachineGetAddressTest" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="d9c84800-2fd3-0746-e627-273d971afaac" name="GetUtility" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="0a42a00e-b1ba-935b-6fea-bbfe93ca7a7b" name="InvokeMachine" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="d9441eaf-4742-d8db-ea94-db48cb66d52b" name="InvokeUtility" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="f8f2fe14-00f7-3f01-a076-a28e580d0492" name="ModbusCoilSingle" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="ab00dadb-beed-2925-baf9-4f6ea41860d2" name="ModbusDInputSingle" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="04bb0e91-6d84-dad5-ea4e-00cd79d3ed0b" name="ModbusIRegSingle" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="95448160-9d4e-6784-d82f-7da3a3d727fd" name="ModbusRegSingle" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="77205461-d045-e529-6de0-6a577d14de30" name="ModbusRegMultiple" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="bacee2fc-3c9e-79c9-8b30-78792be0e71a" name="MultiStation" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="b1895074-1d93-00aa-a730-5da486ca349b" name="OpcSingle" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="d0738e86-024c-dbab-42a7-73048b993f27" name="OpcMultiple" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="e9728028-f234-710c-fced-469c72d77159" name="OpcWrite" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="fe0338ba-435c-d2aa-8736-aec68c672cfd" name="SiemensCoilSingle" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="9f29d167-679e-28b9-f211-e3c430a8613c" name="SiemensDInputSingle" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="f37fb91e-1cc0-e9df-3163-173574b2c613" name="SiemensMSingleBool" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="48af77ea-9315-04b2-0358-da5b371af3e6" name="SiemensMSingle" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="3ff65ca6-f244-fda3-f8ba-d5c12a96b092" name="SiemensDbSingle" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="0318ff48-7798-7715-00db-c4ff8ac8f735" name="SiemensDbMultiple" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="40dbef40-f566-82ba-377e-7ed3ce059399" name="TaskManagerGetMachineTest" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    <TestLink id="e3245380-3a92-12a1-b38b-f31f7e50f5e6" name="TaskManagerValueReadWriteTest" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+  </TestLinks>
+</OrderedTest>
\ No newline at end of file