From 78bc3ddd210a9c337d108a1ca10b8cd0a50070a1 Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Tue, 15 Sep 2020 20:01:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E7=A7=B0=E9=87=8D=E5=9E=8B=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ButcherFactory.Form/ButcherFactory.Form.csproj    | 1 +
 ButcherFactory.Form/Controls/WeightControl.cs     | 3 +++
 ButcherFactory.Form/Controls/WeightSettingFrom.cs | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ButcherFactory.Form/ButcherFactory.Form.csproj b/ButcherFactory.Form/ButcherFactory.Form.csproj
index bad3154..0106ca7 100644
--- a/ButcherFactory.Form/ButcherFactory.Form.csproj
+++ b/ButcherFactory.Form/ButcherFactory.Form.csproj
@@ -99,6 +99,7 @@
     <Compile Include="Controls\Utils\AoHaoSi3000DataFormat.cs" />
     <Compile Include="Controls\Utils\DataFormatBase.cs" />
     <Compile Include="Controls\Utils\IND560DataFormat.cs" />
+    <Compile Include="Controls\Utils\JST2018SDataFormat.cs" />
     <Compile Include="Controls\Utils\Xk3124DataFormat.cs" />
     <Compile Include="Controls\Utils\Xk3190A9DataFormat.cs" />
     <Compile Include="Controls\Utils\Xk3190D10DataFormat.cs" />
diff --git a/ButcherFactory.Form/Controls/WeightControl.cs b/ButcherFactory.Form/Controls/WeightControl.cs
index 0c2cff7..f14c804 100644
--- a/ButcherFactory.Form/Controls/WeightControl.cs
+++ b/ButcherFactory.Form/Controls/WeightControl.cs
@@ -141,6 +141,9 @@ namespace ButcherFactory.Controls
           break;
         case "Xk3190A9":
           _dataFormat = new Xk3190A9DataFormat();
+          break;
+        case "JST2018S":
+          _dataFormat = new JST2018SDataFormat();
           break;
         default:
           _dataFormat = new Xk3190D10DataFormat();
diff --git a/ButcherFactory.Form/Controls/WeightSettingFrom.cs b/ButcherFactory.Form/Controls/WeightSettingFrom.cs
index c3f471d..cbebad7 100644
--- a/ButcherFactory.Form/Controls/WeightSettingFrom.cs
+++ b/ButcherFactory.Form/Controls/WeightSettingFrom.cs
@@ -11,8 +11,8 @@ using System.Windows.Forms;
 namespace ButcherFactory.Controls
 {
   public partial class WeightSettingFrom : Form
-  {
-    List<string> weight = new List<string> { "IND560", "Xk3124", "Xk3190A9", "Xk3190D10", "IND231", "AHS3000" };
+  {
+    List<string> weight = new List<string> { "IND560", "Xk3124", "Xk3190A9", "Xk3190D10", "IND231", "AHS3000", "JST2018S" };
     List<string> com = new List<string> { "COM1", "COM2", "COM3", "COM4", "COM5" };
     List<string> rate = new List<string> { "1200", "2400", "4800", "7200", "9600" };
     List<string> bit = new List<string> { "5", "6", "7", "8" };