lhiven
/
Rs.DeweyTester
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、飞拍速度最大限制到7%

Browse Source 
2、取料失败后点击重试时，关闭真空吸
3、修复有无料盘拍照后把空料盘搬运到空料仓后INPUT盘显示满盘的问题
Eight
lhiven 6 months ago
parent c4d1ee2a31
commit 7e3cbc3290
7 changed files with 1794 additions and 1787 deletions
Show Stats Download Patch File Download Diff File

3
Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs
Unescape Escape View File

@ -326,6 +326,7 @@ namespace Rs.MotionPlat.Flow
{
//先把轴移动到安全位
DischargeModuleGoSafePosFlow.Instance.GoSafePostion();
TakeTrayFlow.Instance.Take(ETrayType.Input, ETrayType.Empty);
//TakeTrayFlow.Instance.Take(ETrayType.Input, ETrayType.Empty);
//Stock2Flow.Instance.PrepareTray();
StockManager.PrepareTray(2);
@ -341,7 +342,7 @@ namespace Rs.MotionPlat.Flow
//先把轴移动到安全位
DischargeModuleGoSafePosFlow.Instance.GoSafePostion();
TakeTrayFlow.Instance.Take(ETrayType.Input, ETrayType.Empty);
GlobalTray.InputTray.ChangeStatus(ESlotStatus.Have);
//GlobalTray.InputTray.ChangeStatus(ESlotStatus.Have);
takeSlotIndex = 1;
}
}

5
Rs.DeweyTester/Flow/SubFlow/StockTakeFlow.cs
Unescape Escape View File

@ -94,7 +94,7 @@ namespace Rs.MotionPlat.Flow.SubFlow
curNozzle = NozzleManager.GetNozzle(nozzleIndex);
if (curNozzle != null)
{
if(trayType== ETrayType.Input)
if (trayType== ETrayType.Input)
{
waitTakeProductSlot = GlobalTray.InputTray.GetSlot(slotIndex);
}
@ -149,6 +149,7 @@ namespace Rs.MotionPlat.Flow.SubFlow
}
break;
case EStockTakeFlowStep.到料仓取料位下方:
targetPosition.StockZ = NozzleManager.GetNozzleToTrayTakeProductPos(trayType, curNozzle.NozzleIndex);
if (NozzleManager.Go(curNozzle, targetPosition.StockZ, GlobalVar.WholeSpeed))
{
@ -265,6 +266,8 @@ namespace Rs.MotionPlat.Flow.SubFlow
case EButtonType.Retry:
logInfo = GetClassName() + $"选择了重试";
MessageQueue.Instance.Insert(logInfo);
curNozzle.VacBreak(EIoOperate.Close, GetClassName());
curNozzle.VacSuction(EIoOperate.Close, GetClassName());
//先把产品放下
//StockPlaceFlow.Instance.Place(ETrayType.Input, waitTakeProductSlot.Index, curNozzle.NozzleIndex);
flowStep = EStockTakeFlowStep.到料仓取料位下方;

2
Rs.DeweyTester/Home.cs
Unescape Escape View File

@ -684,11 +684,11 @@ namespace Rs.MotionPlat
string dirpath = string.Empty;
dirpath = "D://Communition";
string[] dirs = Directory.GetDirectories(dirpath);
if (!Directory.Exists(dirpath))
{
Directory.CreateDirectory(dirpath);
}
string[] dirs = Directory.GetDirectories(dirpath);
foreach (var dir in dirs)
{
DirectoryInfo di = new DirectoryInfo(dir);

2
Rs.DeweyTester/Properties/AssemblyInfo.cs
Unescape Escape View File

@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
//
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
[assembly: AssemblyVersion("1.20.24.27")]
[assembly: AssemblyVersion("1.20.24.28")]
//[assembly: AssemblyVersion("1.0.0.0")]
//[assembly: AssemblyFileVersion("1.0.0.0")]

36
Rs.DeweyTester/SysConfig/CommonConfig.Designer.cs generated
Unescape Escape View File

@ -146,6 +146,7 @@
//
// groupBox8
//
resources.ApplyResources(this.groupBox8, "groupBox8");
this.groupBox8.Controls.Add(this.button1);
this.groupBox8.Controls.Add(this.cboxLanguage);
this.groupBox8.Controls.Add(this.label2);
@ -156,16 +157,15 @@
this.groupBox8.Controls.Add(this.cboxEnableIndexTimeStatistics);
this.groupBox8.Controls.Add(this.cboxEnableStock);
this.groupBox8.Controls.Add(this.cboxRunSpace);
resources.ApplyResources(this.groupBox8, "groupBox8");
this.groupBox8.ForeColor = System.Drawing.Color.White;
this.groupBox8.Name = "groupBox8";
this.groupBox8.TabStop = false;
//
// button1
//
resources.ApplyResources(this.button1, "button1");
this.button1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56)))));
this.button1.FlatAppearance.BorderColor = System.Drawing.Color.White;
resources.ApplyResources(this.button1, "button1");
this.button1.ForeColor = System.Drawing.Color.White;
this.button1.Name = "button1";
this.button1.UseVisualStyleBackColor = false;
@ -173,11 +173,11 @@
//
// cboxLanguage
//
resources.ApplyResources(this.cboxLanguage, "cboxLanguage");
this.cboxLanguage.FormattingEnabled = true;
this.cboxLanguage.Items.AddRange(new object[] {
resources.GetString("cboxLanguage.Items"),
resources.GetString("cboxLanguage.Items1")});
resources.ApplyResources(this.cboxLanguage, "cboxLanguage");
this.cboxLanguage.Name = "cboxLanguage";
//
// label2
@ -237,6 +237,7 @@
//
// groupBox3
//
resources.ApplyResources(this.groupBox3, "groupBox3");
this.groupBox3.Controls.Add(this.btnSaveRelCategory);
this.groupBox3.Controls.Add(this.txtSiteID);
this.groupBox3.Controls.Add(this.comBoxCp);
@ -256,16 +257,15 @@
this.groupBox3.Controls.Add(this.label17);
this.groupBox3.Controls.Add(this.txtMachineID);
this.groupBox3.Controls.Add(this.label5);
resources.ApplyResources(this.groupBox3, "groupBox3");
this.groupBox3.ForeColor = System.Drawing.Color.White;
this.groupBox3.Name = "groupBox3";
this.groupBox3.TabStop = false;
//
// btnSaveRelCategory
//
resources.ApplyResources(this.btnSaveRelCategory, "btnSaveRelCategory");
this.btnSaveRelCategory.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56)))));
this.btnSaveRelCategory.FlatAppearance.BorderColor = System.Drawing.Color.White;
resources.ApplyResources(this.btnSaveRelCategory, "btnSaveRelCategory");
this.btnSaveRelCategory.ForeColor = System.Drawing.Color.White;
this.btnSaveRelCategory.Name = "btnSaveRelCategory";
this.btnSaveRelCategory.UseVisualStyleBackColor = false;
@ -279,47 +279,47 @@
//
// comBoxCp
//
resources.ApplyResources(this.comBoxCp, "comBoxCp");
this.comBoxCp.FormattingEnabled = true;
this.comBoxCp.Items.AddRange(new object[] {
resources.GetString("comBoxCp.Items"),
resources.GetString("comBoxCp.Items1"),
resources.GetString("comBoxCp.Items2")});
resources.ApplyResources(this.comBoxCp, "comBoxCp");
this.comBoxCp.Name = "comBoxCp";
this.comBoxCp.SelectedIndexChanged += new System.EventHandler(this.comBoxCp_SelectedIndexChanged);
//
// comBoxRelCategory
//
resources.ApplyResources(this.comBoxRelCategory, "comBoxRelCategory");
this.comBoxRelCategory.FormattingEnabled = true;
this.comBoxRelCategory.Items.AddRange(new object[] {
resources.GetString("comBoxRelCategory.Items"),
resources.GetString("comBoxRelCategory.Items1"),
resources.GetString("comBoxRelCategory.Items2")});
resources.ApplyResources(this.comBoxRelCategory, "comBoxRelCategory");
this.comBoxRelCategory.Name = "comBoxRelCategory";
this.comBoxRelCategory.SelectedIndexChanged += new System.EventHandler(this.comBoxRelCategory_SelectedIndexChanged);
//
// cboxHostType
//
resources.ApplyResources(this.cboxHostType, "cboxHostType");
this.cboxHostType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cboxHostType.FormattingEnabled = true;
this.cboxHostType.Items.AddRange(new object[] {
resources.GetString("cboxHostType.Items"),
resources.GetString("cboxHostType.Items1"),
resources.GetString("cboxHostType.Items2")});
resources.ApplyResources(this.cboxHostType, "cboxHostType");
this.cboxHostType.Name = "cboxHostType";
this.cboxHostType.SelectedIndexChanged += new System.EventHandler(this.cboxHostType_SelectedIndexChanged);
//
// cboxConfigName
//
resources.ApplyResources(this.cboxConfigName, "cboxConfigName");
this.cboxConfigName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cboxConfigName.FormattingEnabled = true;
this.cboxConfigName.Items.AddRange(new object[] {
resources.GetString("cboxConfigName.Items"),
resources.GetString("cboxConfigName.Items1"),
resources.GetString("cboxConfigName.Items2")});
resources.ApplyResources(this.cboxConfigName, "cboxConfigName");
this.cboxConfigName.Name = "cboxConfigName";
this.cboxConfigName.SelectedIndexChanged += new System.EventHandler(this.cboxConfigName_SelectedIndexChanged);
//
@ -394,6 +394,7 @@
//
// groupBox1
//
resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Controls.Add(this.txtUphRefreshCycle);
this.groupBox1.Controls.Add(this.cboxMsgShowEn);
this.groupBox1.Controls.Add(this.cboxMsgShowCn);
@ -434,7 +435,6 @@
this.groupBox1.Controls.Add(this.lblTakeTrayFromNg2InputSpeed);
this.groupBox1.Controls.Add(this.lblWholeSpeed);
this.groupBox1.Controls.Add(this.label1);
resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.ForeColor = System.Drawing.Color.White;
this.groupBox1.Name = "groupBox1";
this.groupBox1.TabStop = false;
@ -496,10 +496,10 @@
//
// panelEx1
//
resources.ApplyResources(this.panelEx1, "panelEx1");
this.panelEx1.Controls.Add(this.btnSaveSpeedParam);
this.panelEx1.Controls.Add(this.cboxCurRecipe);
this.panelEx1.Controls.Add(this.label4);
resources.ApplyResources(this.panelEx1, "panelEx1");
this.panelEx1.Name = "panelEx1";
//
// btnSaveSpeedParam
@ -514,10 +514,10 @@
//
// cboxCurRecipe
//
resources.ApplyResources(this.cboxCurRecipe, "cboxCurRecipe");
this.cboxCurRecipe.FormattingEnabled = true;
this.cboxCurRecipe.Items.AddRange(new object[] {
resources.GetString("cboxCurRecipe.Items")});
resources.ApplyResources(this.cboxCurRecipe, "cboxCurRecipe");
this.cboxCurRecipe.Name = "cboxCurRecipe";
//
// label4
@ -529,7 +529,7 @@
//
resources.ApplyResources(this.tbarFlyCameraSpeed, "tbarFlyCameraSpeed");
this.tbarFlyCameraSpeed.LargeChange = 1;
this.tbarFlyCameraSpeed.Maximum = 100;
this.tbarFlyCameraSpeed.Maximum = 7;
this.tbarFlyCameraSpeed.Minimum = 1;
this.tbarFlyCameraSpeed.Name = "tbarFlyCameraSpeed";
this.tbarFlyCameraSpeed.TickStyle = System.Windows.Forms.TickStyle.None;
@ -730,6 +730,7 @@
//
// groupBox4
//
resources.ApplyResources(this.groupBox4, "groupBox4");
this.groupBox4.Controls.Add(this.dataGridView1);
this.groupBox4.Controls.Add(this.label6);
this.groupBox4.Controls.Add(this.panel1);
@ -739,13 +740,13 @@
this.groupBox4.Controls.Add(this.txtControlCenterPort);
this.groupBox4.Controls.Add(this.cboxEnableExceptionHandlingNozzle);
this.groupBox4.Controls.Add(this.cboxEnableScanBarCodeByDownCamera);
resources.ApplyResources(this.groupBox4, "groupBox4");
this.groupBox4.ForeColor = System.Drawing.Color.White;
this.groupBox4.Name = "groupBox4";
this.groupBox4.TabStop = false;
//
// dataGridView1
//
resources.ApplyResources(this.dataGridView1, "dataGridView1");
this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@ -754,7 +755,6 @@
this.英文名,
this.是否显示,
this.是否需要登录});
resources.ApplyResources(this.dataGridView1, "dataGridView1");
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellEndEdit);
@ -802,9 +802,9 @@
//
// panel1
//
resources.ApplyResources(this.panel1, "panel1");
this.panel1.Controls.Add(this.radioButton4);
this.panel1.Controls.Add(this.radioButton3);
resources.ApplyResources(this.panel1, "panel1");
this.panel1.Name = "panel1";
//
// radioButton4
@ -825,9 +825,9 @@
//
// txtControlCenterIP
//
resources.ApplyResources(this.txtControlCenterIP, "txtControlCenterIP");
this.txtControlCenterIP.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16)))));
this.txtControlCenterIP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
resources.ApplyResources(this.txtControlCenterIP, "txtControlCenterIP");
this.txtControlCenterIP.ForeColor = System.Drawing.Color.White;
this.txtControlCenterIP.Name = "txtControlCenterIP";
//
@ -843,9 +843,9 @@
//
// txtControlCenterPort
//
resources.ApplyResources(this.txtControlCenterPort, "txtControlCenterPort");
this.txtControlCenterPort.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16)))));
this.txtControlCenterPort.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
resources.ApplyResources(this.txtControlCenterPort, "txtControlCenterPort");
this.txtControlCenterPort.ForeColor = System.Drawing.Color.White;
this.txtControlCenterPort.Name = "txtControlCenterPort";
//

18
Rs.DeweyTester/SysConfig/CommonConfig.en-US.resx
Unescape Escape View File

@ -266,10 +266,10 @@
<value>838, 66</value>
</data>
<data name="tbarFlyCameraSpeed.Location" type="System.Drawing.Point, System.Drawing">
<value>296, 44</value>
<value>154, 71</value>
</data>
<data name="tbarTakeTrayFromNg2InputSpeed.Location" type="System.Drawing.Point, System.Drawing">
<value>299, 73</value>
<value>154, 42</value>
</data>
<data name="cboxEnableTC6.Location" type="System.Drawing.Point, System.Drawing">
<value>512, 211</value>
@ -416,10 +416,10 @@
<value>Disabled safety door</value>
</data>
<data name="tbarWholeSpeed.Location" type="System.Drawing.Point, System.Drawing">
<value>296, 14</value>
<value>156, 12</value>
</data>
<data name="label16.Location" type="System.Drawing.Point, System.Drawing">
<value>166, 73</value>
<value>26, 71</value>
</data>
<data name="label16.Size" type="System.Drawing.Size, System.Drawing">
<value>125, 12</value>
@ -428,10 +428,10 @@
<value>Code scanning speed:</value>
</data>
<data name="lblFlyCameraSpeed.Location" type="System.Drawing.Point, System.Drawing">
<value>599, 49</value>
<value>460, 74</value>
</data>
<data name="label15.Location" type="System.Drawing.Point, System.Drawing">
<value>166, 52</value>
<value>26, 50</value>
</data>
<data name="label15.Size" type="System.Drawing.Size, System.Drawing">
<value>125, 12</value>
@ -440,13 +440,13 @@
<value>Handling tray speed:</value>
</data>
<data name="lblTakeTrayFromNg2InputSpeed.Location" type="System.Drawing.Point, System.Drawing">
<value>600, 73</value>
<value>459, 48</value>
</data>
<data name="lblWholeSpeed.Location" type="System.Drawing.Point, System.Drawing">
<value>599, 18</value>
<value>459, 16</value>
</data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>202, 18</value>
<value>62, 16</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>89, 12</value>

3515
Rs.DeweyTester/SysConfig/CommonConfig.resx
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save