diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Dan/InitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Dan/InitAction.cs index ed5ec0b..e537386 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Dan/InitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Dan/InitAction.cs @@ -521,8 +521,21 @@ namespace Mesnac.Action.ChemicalWeighing.Dan Ch(cbkN, txtBoxN, HslN, db.SiloN, false); Ch(cbkO, txtBoxO, HslO, db.Siloo, false); - //Ya.Text = db.Ya.ToString(); - //Yb.Text = db.Yb.ToString(); + Ya.Text = db.Ya.ToString(); + Yb.Text = db.Yb.ToString(); + Yc.Text = db.Yc.ToString(); + Yd.Text = db.Yd.ToString(); + Ye.Text = db.Ye.ToString(); + Yf.Text = db.Yf.ToString(); + Yg.Text = db.Yg.ToString(); + Yh.Text = db.Yh.ToString(); + Yi.Text = db.Yi.ToString(); + Yj.Text = db.Yj.ToString(); + Yk.Text = db.Yk.ToString(); + Yl.Text = db.Yl.ToString(); + Ym.Text = db.Ym.ToString(); + Yn.Text = db.Yn.ToString(); + Yo.Text = db.Yo.ToString(); } diff --git a/DataBlockHelper/DBHelpers/Db2101Helper.cs b/DataBlockHelper/DBHelpers/Db2101Helper.cs index e6e4a73..505bfff 100644 --- a/DataBlockHelper/DBHelpers/Db2101Helper.cs +++ b/DataBlockHelper/DBHelpers/Db2101Helper.cs @@ -15,7 +15,7 @@ namespace DataBlockHelper.DBHelpers public Db2101Helper() { - OperateResult db = PlcConnect.Instance.Read("DB2101.0.0", 154); + OperateResult db = PlcConnect.Instance.Read("DB2101.0.0", 216); bytes = db.Content; } @@ -47,26 +47,26 @@ namespace DataBlockHelper.DBHelpers public Db2101LinEntity LinC => new Db2101LinEntity(144, bytes); - - //public short Ya => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 186); - //public short Yb => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 188); - //public short Yc => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 190); - //public short Yd => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 192); - //public short Ye => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 194); - //public short Yf => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 196); - //public short Yg => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 198); - //public short Yh => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 200); - //public short Yi => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 202); + public short Ya => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 186); + public short Yb => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 188); + public short Yc => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 190); + public short Yd => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 192); + public short Ye => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 194); + public short Yf => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 196); - //public short Yj => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 204); - //public short Yk => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 206); - //public short Yl => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 208); - //public short Ym => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 210); + public short Yg => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 198); + public short Yh => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 200); + public short Yi => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 202); - //public short Yn => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 212); + public short Yj => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 204); + public short Yk => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 206); + public short Yl => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 208); + public short Ym => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 210); - //public short Yo => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 214); + public short Yn => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 212); + + public short Yo => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 214); } diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormDanQi.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormDanQi.xml index 5a60076..905426a 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormDanQi.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormDanQi.xml @@ -1479,7 +1479,7 @@ False False Control - 903, 780 + 634, 780 WindowsDefaultLocation 氮气设置 Normal