diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Dan/InitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Dan/InitAction.cs index 2ec8117..ed5ec0b 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Dan/InitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Dan/InitAction.cs @@ -20,72 +20,87 @@ namespace Mesnac.Action.ChemicalWeighing.Dan MCCheckBox cbkA; MCTextBox txtBoxA; HslLanternSimple HslA; + MCLabel Ya; MCCheckBox cbkB; MCTextBox txtBoxB; HslLanternSimple HslB; + MCLabel Yb; MCCheckBox cbkC; MCTextBox txtBoxC; HslLanternSimple HslC; + MCLabel Yc; MCCheckBox cbkD; MCTextBox txtBoxD; HslLanternSimple HslD; + MCLabel Yd; MCCheckBox cbkE; MCTextBox txtBoxE; HslLanternSimple HslE; + MCLabel Ye; MCCheckBox cbkF; MCTextBox txtBoxF; HslLanternSimple HslF; + MCLabel Yf; MCCheckBox cbkG; MCTextBox txtBoxG; HslLanternSimple HslG; + MCLabel Yg; MCCheckBox cbkH; MCTextBox txtBoxH; HslLanternSimple HslH; + MCLabel Yh; MCCheckBox cbkI; MCTextBox txtBoxI; HslLanternSimple HslI; + MCLabel Yi; MCCheckBox cbkJ; MCTextBox txtBoxJ; HslLanternSimple HslJ; + MCLabel Yj; MCCheckBox cbkK; MCTextBox txtBoxK; HslLanternSimple HslK; + MCLabel Yk; MCCheckBox cbkL; MCTextBox txtBoxL; HslLanternSimple HslL; + MCLabel Yl; MCCheckBox cbkM; MCTextBox txtBoxM; HslLanternSimple HslM; + MCLabel Ym; MCCheckBox cbkN; MCTextBox txtBoxN; HslLanternSimple HslN; + MCLabel Yn; MCCheckBox cbkO; MCTextBox txtBoxO; HslLanternSimple HslO; + MCLabel Yo; MCButton MCButton1; @@ -191,6 +206,27 @@ namespace Mesnac.Action.ChemicalWeighing.Dan + Ya = controll.FirstOrDefault(x => x.Name == "Ya") as MCLabel; + Yb = controll.FirstOrDefault(x => x.Name == "Yb") as MCLabel; + Yc = controll.FirstOrDefault(x => x.Name == "Yc") as MCLabel; + + Yd = controll.FirstOrDefault(x => x.Name == "Yd") as MCLabel; + Ye = controll.FirstOrDefault(x => x.Name == "Ye") as MCLabel; + Yf = controll.FirstOrDefault(x => x.Name == "Yf") as MCLabel; + + Yg = controll.FirstOrDefault(x => x.Name == "Yg") as MCLabel; + Yh = controll.FirstOrDefault(x => x.Name == "Yh") as MCLabel; + Yi = controll.FirstOrDefault(x => x.Name == "Yi") as MCLabel; + + Yj = controll.FirstOrDefault(x => x.Name == "Yj") as MCLabel; + Yk = controll.FirstOrDefault(x => x.Name == "Yk") as MCLabel; + + Yl = controll.FirstOrDefault(x => x.Name == "Yl") as MCLabel; + Ym = controll.FirstOrDefault(x => x.Name == "Ym") as MCLabel; + Yn = controll.FirstOrDefault(x => x.Name == "Yn") as MCLabel; + Yo = controll.FirstOrDefault(x => x.Name == "Yo") as MCLabel; + + MCButton2_Click(new object(), new EventArgs()); backColor=txtBoxA.BackColor; cbkA.CheckedChanged += CbkA_CheckedChanged; @@ -485,6 +521,10 @@ 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(); + + } diff --git a/DataBlockHelper/DBHelpers/Db2101Helper.cs b/DataBlockHelper/DBHelpers/Db2101Helper.cs index 8f6eb4f..e6e4a73 100644 --- a/DataBlockHelper/DBHelpers/Db2101Helper.cs +++ b/DataBlockHelper/DBHelpers/Db2101Helper.cs @@ -12,6 +12,7 @@ namespace DataBlockHelper.DBHelpers { public class Db2101Helper : DBHelper { + public Db2101Helper() { OperateResult db = PlcConnect.Instance.Read("DB2101.0.0", 154); @@ -45,6 +46,28 @@ namespace DataBlockHelper.DBHelpers public Db2101LinEntity LinB => new Db2101LinEntity(134, bytes); 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 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 Yn => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 212); + + //public short Yo => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 214); + } public class Db2101WriteHelp diff --git a/Main/MCEdit/Data/EventConfig/小料称量/我叫锄头.xml b/Main/MCEdit/Data/EventConfig/小料称量/我叫锄头.xml index bedf862..c9b826d 100644 --- a/Main/MCEdit/Data/EventConfig/小料称量/我叫锄头.xml +++ b/Main/MCEdit/Data/EventConfig/小料称量/我叫锄头.xml @@ -15,6 +15,12 @@ 输送记录 输送记录 + + + 氮气 + 氮气 + + @@ -30,6 +36,10 @@ + + + + @@ -38,6 +48,9 @@ + + + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormDanQi.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormDanQi.xml index f3ed4c1..5a60076 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormDanQi.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormDanQi.xml @@ -1,5 +1,309 @@ + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + 423, 337 + Yi + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + 423, 526 + Yo + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + 423, 491 + Yn + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + 423, 113 + Yb + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + 423, 150 + Yc + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + 423, 187 + Yd + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + 423, 218 + Ye + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + 423, 248 + Yf + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + 423, 276 + Yg + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + 423, 307 + Yh + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + 423, 460 + Ym + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + 423, 425 + Yl + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + 423, 394 + Yk + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + 423, 364 + Yj + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + 423, 84 + Ya + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 剩余时间 + 399, 38 + MCLabel19 + 53, 12 + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -19,7 +323,7 @@ Red DarkGray 刷新 - 407, 292 + 42, 607 MCButton2 219, 107 99 @@ -43,7 +347,7 @@ Red DarkGray 启动 - 407, 435 + 292, 607 MCButton1 219, 107 64 @@ -1116,7 +1420,7 @@ None True True - 充氮气时间(秒) + 充氮气时间(分) 196, 39 MCLabel3 89, 12 @@ -1160,7 +1464,7 @@ 29, 12 - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIGI0NWRkODA1MzMyMjQwZWE4YWFkNWVmYjM1ZDUyOGJmBgYAAAAM5by55Ye656qX5L2TBgcAAAAM5by55Ye656qX5L2TCw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDI3MDJEOTFGMzFGNTExNTk3QUFDOTFDREExNDY4RUM5BgYAAAAG5rCu5rCUBgcAAAAG5rCu5rCUCw== AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -1175,7 +1479,7 @@ False False Control - 749, 780 + 903, 780 WindowsDefaultLocation 氮气设置 Normal