diff --git a/Rs.DeweyTester/Commom/GlobalVar.cs b/Rs.DeweyTester/Commom/GlobalVar.cs index d69c428..95555b0 100644 --- a/Rs.DeweyTester/Commom/GlobalVar.cs +++ b/Rs.DeweyTester/Commom/GlobalVar.cs @@ -21,7 +21,57 @@ namespace Rs.Framework public static class GlobalVar { #region newpro - + + + + + /// + /// 精度验证开始X + /// + [ParameterInit("double", "0", "system", "精度验证开始X")] + public static double AccuracyVerificationStartX + { + get + { + return SysConfigParam.GetValue(nameof(AccuracyVerificationStartX)); + } + } + + /// + /// 精度验证开始Y2 + /// + [ParameterInit("double", "0", "system", "精度验证开始Y2")] + public static double AccuracyVerificationStartY2 + { + get + { + return SysConfigParam.GetValue(nameof(AccuracyVerificationStartY2)); + } + } + + /// + /// 精度验证结束X + /// + [ParameterInit("double", "0", "system", "精度验证结束X")] + public static double AccuracyVerificationEndX + { + get + { + return SysConfigParam.GetValue(nameof(AccuracyVerificationEndX)); + } + } + + /// + /// 精度验证结束Y2 + /// + [ParameterInit("double", "0", "system", "精度验证结束Y2")] + public static double AccuracyVerificationEndY2 + { + get + { + return SysConfigParam.GetValue(nameof(AccuracyVerificationEndY2)); + } + } /// /// 二维码长度 /// diff --git a/Rs.DeweyTester/Commom/Ops.cs b/Rs.DeweyTester/Commom/Ops.cs index b35cc68..3fb77d5 100644 --- a/Rs.DeweyTester/Commom/Ops.cs +++ b/Rs.DeweyTester/Commom/Ops.cs @@ -214,6 +214,7 @@ namespace Rs.MotionPlat.Commom { if(SafeDoorCheck.Check()) { + MachineManage.Instance.MachineStatus = EMachineStatus.Homing; HomeFlow.Instance.StartGoHome(); } } diff --git a/Rs.DeweyTester/Flow/HomeFlow.cs b/Rs.DeweyTester/Flow/HomeFlow.cs index 47a3fa5..20318a0 100644 --- a/Rs.DeweyTester/Flow/HomeFlow.cs +++ b/Rs.DeweyTester/Flow/HomeFlow.cs @@ -68,7 +68,8 @@ namespace Rs.MotionPlat.Flow { while (!m_bCancle && !m_bHomed) { - if(GlobalVar.VirtualAxis) + MachineManage.Instance.MachineStatus = EMachineStatus.Homing; + if (GlobalVar.VirtualAxis) { MessageQueue.Instance.Insert("Device home ok"); MachineManage.Instance.MachineStatus = EMachineStatus.Homed; @@ -233,7 +234,7 @@ namespace Rs.MotionPlat.Flow case EHomeFlowStep.Z轴回原: MessageQueue.Instance.Insert("Z轴开始回零"); - MachineManage.Instance.MachineStatus = EMachineStatus.Homing; + //料仓Z轴回零 AxisControl.GetAxis($"StockZ1").Home(); AxisControl.GetAxis($"StockZ2").Home(); diff --git a/Rs.DeweyTester/FormMain.cs b/Rs.DeweyTester/FormMain.cs index 6c0d305..5cfe73f 100644 --- a/Rs.DeweyTester/FormMain.cs +++ b/Rs.DeweyTester/FormMain.cs @@ -167,7 +167,7 @@ namespace Rs.MotionPlat dgv_errinfo.Rows.Insert(0, errorInfo.Time, errorInfo.Content); } } - if(MachineManage.Instance.MachineStatus== EMachineStatus.Working) + if(MachineManage.Instance.MachineStatus== EMachineStatus.Working || MachineManage.Instance.MachineStatus== EMachineStatus.Homing) { if (btnWholeHome.Visible == true) btnWholeHome.Visible = false; @@ -370,6 +370,7 @@ namespace Rs.MotionPlat private void btnWholeHome_Load(object sender, EventArgs e) { Ops.GoHome(); + btnWholeHome.Visible = false; } private void btnSpaceRun_BtnClick(object sender, EventArgs e) @@ -864,5 +865,28 @@ namespace Rs.MotionPlat DevLog.EventTracker("End", 0, "", "End"); } } + + private void timerLight_Tick(object sender, EventArgs e) + { + if(MachineManage.Instance.MachineStatus== EMachineStatus.Working) + { + if(btnLight.Visible) + { + btnLight.Visible = false; + } + if (Ops.IsOutOn("照明灯")) + { + Ops.Off("照明灯"); + LogHelper.Debug("关闭照明灯"); + } + } + else + { + if (!btnLight.Visible) + { + btnLight.Visible = true; + } + } + } } } diff --git a/Rs.DeweyTester/FormMain.designer.cs b/Rs.DeweyTester/FormMain.designer.cs index abe6e53..45eabd7 100644 --- a/Rs.DeweyTester/FormMain.designer.cs +++ b/Rs.DeweyTester/FormMain.designer.cs @@ -32,9 +32,13 @@ namespace Rs.MotionPlat private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.timer1 = new System.Windows.Forms.Timer(this.components); this.panel1 = new System.Windows.Forms.Panel(); + this.groupBox37 = new System.Windows.Forms.GroupBox(); + this.dgv_errinfo = new System.Windows.Forms.DataGridView(); + this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.groupBox36 = new System.Windows.Forms.GroupBox(); this.btnSelectProduct = new System.Windows.Forms.Button(); this.btnUpCameraGrab = new System.Windows.Forms.Button(); @@ -151,11 +155,10 @@ namespace Rs.MotionPlat this.timertc5 = new System.Windows.Forms.Timer(this.components); this.timertc6 = new System.Windows.Forms.Timer(this.components); this.timeruph = new System.Windows.Forms.Timer(this.components); - this.groupBox37 = new System.Windows.Forms.GroupBox(); - this.dgv_errinfo = new System.Windows.Forms.DataGridView(); - this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.timerLight = new System.Windows.Forms.Timer(this.components); this.panel1.SuspendLayout(); + this.groupBox37.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dgv_errinfo)).BeginInit(); this.groupBox36.SuspendLayout(); this.panel4.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); @@ -183,8 +186,6 @@ namespace Rs.MotionPlat this.tabPage2.SuspendLayout(); this.tableLayoutPanel5.SuspendLayout(); this.tableLayoutPanel4.SuspendLayout(); - this.groupBox37.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dgv_errinfo)).BeginInit(); this.SuspendLayout(); // // timer1 @@ -204,6 +205,64 @@ namespace Rs.MotionPlat this.panel1.Size = new System.Drawing.Size(320, 880); this.panel1.TabIndex = 8; // + // groupBox37 + // + this.groupBox37.Controls.Add(this.dgv_errinfo); + this.groupBox37.Dock = System.Windows.Forms.DockStyle.Fill; + this.groupBox37.ForeColor = System.Drawing.Color.White; + this.groupBox37.Location = new System.Drawing.Point(0, 259); + this.groupBox37.Name = "groupBox37"; + this.groupBox37.Size = new System.Drawing.Size(320, 261); + this.groupBox37.TabIndex = 8; + this.groupBox37.TabStop = false; + this.groupBox37.Tag = ""; + this.groupBox37.Text = "Warn list"; + // + // dgv_errinfo + // + this.dgv_errinfo.AllowUserToAddRows = false; + this.dgv_errinfo.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dgv_errinfo.BackgroundColor = System.Drawing.SystemColors.ActiveCaptionText; + this.dgv_errinfo.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.Red; + dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgv_errinfo.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + this.dgv_errinfo.ColumnHeadersHeight = 30; + this.dgv_errinfo.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.dataGridViewTextBoxColumn1, + this.dataGridViewTextBoxColumn2}); + this.dgv_errinfo.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgv_errinfo.Location = new System.Drawing.Point(3, 17); + this.dgv_errinfo.Name = "dgv_errinfo"; + this.dgv_errinfo.RowHeadersVisible = false; + this.dgv_errinfo.RowHeadersWidth = 51; + this.dgv_errinfo.RowTemplate.DefaultCellStyle.BackColor = System.Drawing.Color.Black; + this.dgv_errinfo.RowTemplate.DefaultCellStyle.ForeColor = System.Drawing.Color.Red; + this.dgv_errinfo.RowTemplate.Height = 23; + this.dgv_errinfo.Size = new System.Drawing.Size(314, 241); + this.dgv_errinfo.TabIndex = 4; + // + // dataGridViewTextBoxColumn1 + // + this.dataGridViewTextBoxColumn1.DataPropertyName = "Time"; + this.dataGridViewTextBoxColumn1.FillWeight = 25F; + this.dataGridViewTextBoxColumn1.HeaderText = "Time"; + this.dataGridViewTextBoxColumn1.MinimumWidth = 6; + this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; + // + // dataGridViewTextBoxColumn2 + // + this.dataGridViewTextBoxColumn2.DataPropertyName = "Content"; + this.dataGridViewTextBoxColumn2.FillWeight = 75F; + this.dataGridViewTextBoxColumn2.HeaderText = "Content"; + this.dataGridViewTextBoxColumn2.MinimumWidth = 6; + this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; + // // groupBox36 // this.groupBox36.Controls.Add(this.btnSelectProduct); @@ -1729,63 +1788,11 @@ namespace Rs.MotionPlat this.timeruph.Interval = 3000; this.timeruph.Tick += new System.EventHandler(this.timer3_Tick_1); // - // groupBox37 + // timerLight // - this.groupBox37.Controls.Add(this.dgv_errinfo); - this.groupBox37.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox37.ForeColor = System.Drawing.Color.White; - this.groupBox37.Location = new System.Drawing.Point(0, 259); - this.groupBox37.Name = "groupBox37"; - this.groupBox37.Size = new System.Drawing.Size(320, 261); - this.groupBox37.TabIndex = 8; - this.groupBox37.TabStop = false; - this.groupBox37.Tag = ""; - this.groupBox37.Text = "Warn list"; - // - // dgv_errinfo - // - this.dgv_errinfo.AllowUserToAddRows = false; - this.dgv_errinfo.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dgv_errinfo.BackgroundColor = System.Drawing.SystemColors.ActiveCaptionText; - this.dgv_errinfo.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.Red; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgv_errinfo.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; - this.dgv_errinfo.ColumnHeadersHeight = 30; - this.dgv_errinfo.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.dataGridViewTextBoxColumn1, - this.dataGridViewTextBoxColumn2}); - this.dgv_errinfo.Dock = System.Windows.Forms.DockStyle.Fill; - this.dgv_errinfo.Location = new System.Drawing.Point(3, 17); - this.dgv_errinfo.Name = "dgv_errinfo"; - this.dgv_errinfo.RowHeadersVisible = false; - this.dgv_errinfo.RowHeadersWidth = 51; - this.dgv_errinfo.RowTemplate.DefaultCellStyle.BackColor = System.Drawing.Color.Black; - this.dgv_errinfo.RowTemplate.DefaultCellStyle.ForeColor = System.Drawing.Color.Red; - this.dgv_errinfo.RowTemplate.Height = 23; - this.dgv_errinfo.Size = new System.Drawing.Size(314, 241); - this.dgv_errinfo.TabIndex = 4; - // - // dataGridViewTextBoxColumn1 - // - this.dataGridViewTextBoxColumn1.DataPropertyName = "Time"; - this.dataGridViewTextBoxColumn1.FillWeight = 25F; - this.dataGridViewTextBoxColumn1.HeaderText = "Time"; - this.dataGridViewTextBoxColumn1.MinimumWidth = 6; - this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; - // - // dataGridViewTextBoxColumn2 - // - this.dataGridViewTextBoxColumn2.DataPropertyName = "Content"; - this.dataGridViewTextBoxColumn2.FillWeight = 75F; - this.dataGridViewTextBoxColumn2.HeaderText = "Content"; - this.dataGridViewTextBoxColumn2.MinimumWidth = 6; - this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; + this.timerLight.Enabled = true; + this.timerLight.Interval = 500; + this.timerLight.Tick += new System.EventHandler(this.timerLight_Tick); // // FormMain // @@ -1799,6 +1806,8 @@ namespace Rs.MotionPlat this.Text = "FormMain"; this.Load += new System.EventHandler(this.FormMain_Load); this.panel1.ResumeLayout(false); + this.groupBox37.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dgv_errinfo)).EndInit(); this.groupBox36.ResumeLayout(false); this.panel4.ResumeLayout(false); this.tableLayoutPanel2.ResumeLayout(false); @@ -1828,8 +1837,6 @@ namespace Rs.MotionPlat this.tabPage2.ResumeLayout(false); this.tableLayoutPanel5.ResumeLayout(false); this.tableLayoutPanel4.ResumeLayout(false); - this.groupBox37.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dgv_errinfo)).EndInit(); this.ResumeLayout(false); } @@ -1958,5 +1965,6 @@ namespace Rs.MotionPlat private System.Windows.Forms.DataGridView dgv_errinfo; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; + private System.Windows.Forms.Timer timerLight; } } \ No newline at end of file diff --git a/Rs.DeweyTester/FormMain.resx b/Rs.DeweyTester/FormMain.resx index f253b2a..bac1f43 100644 --- a/Rs.DeweyTester/FormMain.resx +++ b/Rs.DeweyTester/FormMain.resx @@ -150,4 +150,7 @@ 792, 17 + + 898, 17 + \ No newline at end of file diff --git a/Rs.DeweyTester/Home.cs b/Rs.DeweyTester/Home.cs index 6e4a670..9933bff 100644 --- a/Rs.DeweyTester/Home.cs +++ b/Rs.DeweyTester/Home.cs @@ -24,6 +24,7 @@ using System.IO; using Rs.MotionPlat.Entitys; using Rs.MotionPlat.Flow.SubFlow; using System.Runtime.Remoting.Metadata; +using System.Net.Http; namespace Rs.MotionPlat { @@ -339,8 +340,35 @@ namespace Rs.MotionPlat btnRunData.Selected = false; } + //void GoGoogle() + //{ + // HttpClient httpClient = new HttpClient(); + // Stopwatch tm = new Stopwatch(); + // tm.Restart(); + // Task.Run(() => { + // while (true) + // { + // if(tm.ElapsedMilliseconds > 1000 * 60 * 10) + // { + // try + // { + // var res = httpClient.GetStringAsync("http://www.google.com").Result; + // tm.Restart(); + + // } + // catch (Exception ex) + // { + + // } + // } + // Thread.Sleep(100); + // } + // }); + //} + private void Home2_Load(object sender, EventArgs e) { + //GoGoogle(); string cardMode = File.ReadAllText("CardMode.txt"); if (Enum.TryParse(cardMode, out ECardMode mode)) { diff --git a/Rs.DeweyTester/Home.resx b/Rs.DeweyTester/Home.resx index b4e5158..5b1c542 100644 --- a/Rs.DeweyTester/Home.resx +++ b/Rs.DeweyTester/Home.resx @@ -147,135 +147,6 @@ 8 - - btnRunData - - - Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.4, Culture=neutral, PublicKeyToken=null - - - tableLayoutPanel2 - - - 0 - - - panel8 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel2 - - - 1 - - - panel9 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel2 - - - 2 - - - panel10 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel2 - - - 3 - - - panel11 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel2 - - - 4 - - - panel12 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel2 - - - 5 - - - panel13 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel2 - - - 6 - - - panel14 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel2 - - - 7 - - - Top - - - 0, 0 - - - 0, 0, 0, 0 - - - 1 - - - 1806, 53 - - - 6 - - - tableLayoutPanel2 - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="btnRunData" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="panel8" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="panel9" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="panel10" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="panel11" Row="0" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="panel12" Row="0" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="panel13" Row="0" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="panel14" Row="0" RowSpan="1" Column="7" ColumnSpan="1" /></Controls><Columns Styles="Percent,12.5,Percent,12.5,Percent,12.5,Percent,12.5,Percent,12.5,Percent,12.5,Percent,12.5,Percent,12.5,Absolute,20" /><Rows Styles="Percent,100" /></TableLayoutSettings> - Fill @@ -304,7 +175,7 @@ btnRunData - Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.4, Culture=neutral, PublicKeyToken=null + Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.6, Culture=neutral, PublicKeyToken=null tableLayoutPanel2 @@ -312,11 +183,35 @@ 0 + + Fill + + + Flat + + + SimSun-ExtB, 14pt + + + 0, 0 + + + 0, 0, 0, 0 + + + 0, 0, 30, 0 + + + 225, 53 + + + 2 + btnMain - Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.4, Culture=neutral, PublicKeyToken=null + Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.6, Culture=neutral, PublicKeyToken=null panel8 @@ -351,47 +246,32 @@ 1 - + Fill - + Flat - + SimSun-ExtB, 14pt - + 0, 0 - + 0, 0, 0, 0 - - 0, 0, 30, 0 - - + 225, 53 - - 2 - - - btnMain - - - Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.4, Culture=neutral, PublicKeyToken=null - - - panel8 - - + 0 btnRecipe - Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.4, Culture=neutral, PublicKeyToken=null + Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.6, Culture=neutral, PublicKeyToken=null panel9 @@ -426,44 +306,32 @@ 2 - + Fill - + Flat - + SimSun-ExtB, 14pt - + 0, 0 - + 0, 0, 0, 0 - + 225, 53 - - 0 - - - btnRecipe - - - Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.4, Culture=neutral, PublicKeyToken=null - - - panel9 - - - 0 + + 1 btnSystem - Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.4, Culture=neutral, PublicKeyToken=null + Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.6, Culture=neutral, PublicKeyToken=null panel10 @@ -498,44 +366,32 @@ 3 - + Fill - + Flat - + SimSun-ExtB, 14pt - + 0, 0 - + 0, 0, 0, 0 - + 225, 53 - - 1 - - - btnSystem - - - Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.4, Culture=neutral, PublicKeyToken=null - - - panel10 - - - 0 + + 6 btnAbout - Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.4, Culture=neutral, PublicKeyToken=null + Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.6, Culture=neutral, PublicKeyToken=null panel11 @@ -570,44 +426,32 @@ 4 - + Fill - + Flat - + SimSun-ExtB, 14pt - + 0, 0 - + 0, 0, 0, 0 - + 225, 53 - - 6 + + 3 - - btnAbout + + btnData - - Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.4, Culture=neutral, PublicKeyToken=null - - - panel11 - - - 0 - - - btnData - - - Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.4, Culture=neutral, PublicKeyToken=null + + Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.6, Culture=neutral, PublicKeyToken=null panel12 @@ -642,44 +486,35 @@ 5 - + Fill - + Flat - + SimSun-ExtB, 14pt - + + NoControl + + 0, 0 - + 0, 0, 0, 0 - + 225, 53 - - 3 - - - btnData - - - Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.4, Culture=neutral, PublicKeyToken=null - - - panel12 - - - 0 + + 4 btnLanguage - Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.4, Culture=neutral, PublicKeyToken=null + Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.6, Culture=neutral, PublicKeyToken=null panel13 @@ -714,47 +549,32 @@ 6 - + Fill - + Flat - + SimSun-ExtB, 14pt - - NoControl - - + 0, 0 - + 0, 0, 0, 0 - - 225, 53 - - - 4 - - - btnLanguage - - - Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.4, Culture=neutral, PublicKeyToken=null - - - panel13 + + 231, 53 - - 0 + + 7 btnPermission - Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.4, Culture=neutral, PublicKeyToken=null + Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.6, Culture=neutral, PublicKeyToken=null panel14 @@ -789,173 +609,56 @@ 7 - - Fill - - - Flat - - - SimSun-ExtB, 14pt + + Top - + 0, 0 - + 0, 0, 0, 0 - - 231, 53 - - - 7 - - - btnPermission - - - Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.4, Culture=neutral, PublicKeyToken=null - - - panel14 - - - 0 - - - panel16 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 0 - - - panel7 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - + 1 - - panel6 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 2 - - - panel5 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 3 - - - panel4 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 4 - - - panel3 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 5 - - - panelEx2 - - - Rs.Controls.PanelEx, Rs.Controls, Version=2.20.24.4, Culture=neutral, PublicKeyToken=null - - - panel1 + + 1806, 53 - + 6 - - tableLayoutPanel3 + + tableLayoutPanel2 - + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - panel1 - - - 7 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lblMachineState" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,30,Percent,70" /><Rows Styles="Percent,100" /></TableLayoutSettings> - - - panelEx1 - - - Rs.Controls.PanelEx, Rs.Controls, Version=2.20.24.4, Culture=neutral, PublicKeyToken=null - - - panel1 - - - 8 + + $this - - Bottom + + 1 - - 0, 743 + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="btnRunData" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="panel8" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="panel9" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="panel10" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /><Control Name="panel11" Row="0" RowSpan="1" Column="4" ColumnSpan="1" /><Control Name="panel12" Row="0" RowSpan="1" Column="5" ColumnSpan="1" /><Control Name="panel13" Row="0" RowSpan="1" Column="6" ColumnSpan="1" /><Control Name="panel14" Row="0" RowSpan="1" Column="7" ColumnSpan="1" /></Controls><Columns Styles="Percent,12.5,Percent,12.5,Percent,12.5,Percent,12.5,Percent,12.5,Percent,12.5,Percent,12.5,Percent,12.5,Absolute,20" /><Rows Styles="Percent,100" /></TableLayoutSettings> - - 1806, 33 + + Fill - - 7 + + 0, 0 - - panel1 + + 184, 33 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3 - - $this + + Monitor: - - 2 + + MiddleLeft lblMonitorFlow @@ -993,36 +696,27 @@ 0 - + Fill - + + NoControl + + 0, 0 - + 184, 33 - - 3 + + 5 - - Monitor: + + 治具下料: - + MiddleLeft - - lblMonitorFlow - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel16 - - - 0 - lblFixtureTakeFlow @@ -1059,39 +753,27 @@ 1 - + Fill - + NoControl - + 0, 0 - - 184, 33 + + 237, 33 - - 5 + + 4 - - 治具下料: + + 治具上料: - + MiddleLeft - - lblFixtureTakeFlow - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel7 - - - 0 - lblFixturePlaceFlow @@ -1128,39 +810,21 @@ 2 - + Fill - - NoControl - - + 0, 0 - - 237, 33 - - - 4 - - - 治具上料: - - - MiddleLeft - - - lblFixturePlaceFlow - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel6 + + 126, 33 - + 0 + + MiddleCenter + lblMemory @@ -1197,32 +861,26 @@ 3 - + Fill - - 0, 0 - - - 126, 33 - - - 0 + + NoControl - - MiddleCenter + + 0, 0 - - lblMemory + + 213, 33 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 5 - - panel5 + + 料仓下料: - - 0 + + MiddleLeft lblStockPlaceFlow @@ -1260,39 +918,24 @@ 4 - + Fill - - NoControl - - + 0, 0 - - 213, 33 + + 215, 33 - - 5 + + 3 - - 料仓下料: + + 料仓上料: - + MiddleLeft - - lblStockPlaceFlow - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel4 - - - 0 - lblStockLoadProductFlow @@ -1329,36 +972,24 @@ 5 - + Fill - + 0, 0 - - 215, 33 + + 213, 33 - + 3 - - 料仓上料: + + 主流程: - + MiddleLeft - - lblStockLoadProductFlow - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel3 - - - 0 - lblDischargeFlow @@ -1387,7 +1018,7 @@ panelEx2 - Rs.Controls.PanelEx, Rs.Controls, Version=2.20.24.4, Culture=neutral, PublicKeyToken=null + Rs.Controls.PanelEx, Rs.Controls, Version=2.20.24.6, Culture=neutral, PublicKeyToken=null panel1 @@ -1395,38 +1026,26 @@ 6 - - Fill - - - 0, 0 - - - 213, 33 - - - 3 - - - 主流程: - - - MiddleLeft + + 2 - - lblDischargeFlow + + Fill - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3, 0 - - panelEx2 + + 43, 33 - + 0 - - 2 + + State: + + + MiddleCenter label1 @@ -1440,6 +1059,24 @@ 0 + + Fill + + + 52, 0 + + + 111, 33 + + + 1 + + + Noinit + + + MiddleLeft + lblMachineState @@ -1482,65 +1119,44 @@ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="lblMachineState" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,30,Percent,70" /><Rows Styles="Percent,100" /></TableLayoutSettings> - + Fill - - 3, 0 + + 0, 0 - - 43, 33 + + 168, 33 - + 0 - - State: - - + MiddleCenter - - label1 + + lblVersion - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tableLayoutPanel3 + + panel2 - + 0 - - Fill - - - 52, 0 - - - 111, 33 - - - 1 - - - Noinit - - - MiddleLeft - - - lblMachineState + + Right - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 69, 0 - - tableLayoutPanel3 + + 168, 33 - - 1 + + 0 panel2 @@ -1570,7 +1186,7 @@ panelEx1 - Rs.Controls.PanelEx, Rs.Controls, Version=2.20.24.4, Culture=neutral, PublicKeyToken=null + Rs.Controls.PanelEx, Rs.Controls, Version=2.20.24.6, Culture=neutral, PublicKeyToken=null panel1 @@ -1578,68 +1194,29 @@ 8 - - lblVersion - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 0 - - - Right + + Bottom - - 69, 0 + + 0, 743 - - 168, 33 + + 1806, 33 - - 0 + + 7 - - panel2 + + panel1 - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - panelEx1 - - - 0 - - - Fill - - - 0, 0 - - - 168, 33 - - - 0 - - - MiddleCenter - - - lblVersion - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 + + $this - - 0 + + 2 17, 17 diff --git a/Rs.DeweyTester/Properties/AssemblyInfo.cs b/Rs.DeweyTester/Properties/AssemblyInfo.cs index e7c60c9..7490d05 100644 --- a/Rs.DeweyTester/Properties/AssemblyInfo.cs +++ b/Rs.DeweyTester/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Runtime.InteropServices; // //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: - [assembly: AssemblyVersion("20.25.20.1")] + [assembly: AssemblyVersion("20.25.22.1")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Rs.DeweyTester/Recipe/StockTrayLocationRecipe.zh-CN.resx b/Rs.DeweyTester/Recipe/StockTrayLocationRecipe.zh-CN.resx deleted file mode 100644 index ee35ab0..0000000 --- a/Rs.DeweyTester/Recipe/StockTrayLocationRecipe.zh-CN.resx +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 移动到此 - - - 移动到此 - - - 示教 - - - 示教 - - - - 525, 144 - - - 取放料补偿Y: - - - 拍照偏移Y: - - - 拍照偏移X: - - - 取放料补偿X: - - \ No newline at end of file diff --git a/Rs.DeweyTester/Rs.DeweyTester.csproj b/Rs.DeweyTester/Rs.DeweyTester.csproj index 9fdaf42..5c98dfa 100644 --- a/Rs.DeweyTester/Rs.DeweyTester.csproj +++ b/Rs.DeweyTester/Rs.DeweyTester.csproj @@ -578,9 +578,6 @@ StockTrayLocationRecipe.cs - - StockTrayLocationRecipe.cs - SubMenuForm.cs diff --git a/Rs.DeweyTester/SysConfig/FixtureConfig.resx b/Rs.DeweyTester/SysConfig/FixtureConfig.resx index 36dad05..cd58673 100644 --- a/Rs.DeweyTester/SysConfig/FixtureConfig.resx +++ b/Rs.DeweyTester/SysConfig/FixtureConfig.resx @@ -3834,6 +3834,9 @@ Aging test + + False + groupBox3 @@ -3868,6 +3871,6 @@ FixtureConfig - Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=20.25.20.1, Culture=neutral, PublicKeyToken=null + Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=20.25.21.1, Culture=neutral, PublicKeyToken=null \ No newline at end of file