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 @@ + 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 weight = new List { "IND560", "Xk3124", "Xk3190A9", "Xk3190D10", "IND231", "AHS3000" }; + { + List weight = new List { "IND560", "Xk3124", "Xk3190A9", "Xk3190D10", "IND231", "AHS3000", "JST2018S" }; List com = new List { "COM1", "COM2", "COM3", "COM4", "COM5" }; List rate = new List { "1200", "2400", "4800", "7200", "9600" }; List bit = new List { "5", "6", "7", "8" };