Skip to content

刘韬 / SO815-AutoInOutStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 95a351e2 由 LN
选项

增加升降轴位置调试功能

1 个父辈 4ec025a9
内嵌 并排
正在显示 8 个修改的文件 包含 137 行增加 和 144 行删除
source/ACSingleStore/AutoInOutStore.csproj
......@@ -19,7 +19,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;PositionTool</DefineConstants>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
......
source/ACSingleStore/FrmIOStatus.Designer.cs
......@@ -108,9 +108,9 @@
this.groupBox1.Controls.Add(this.btnCloseDoor);
this.groupBox1.Controls.Add(this.btnOpenDoor);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(515, 3);
this.groupBox1.Location = new System.Drawing.Point(542, 3);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(437, 649);
this.groupBox1.Size = new System.Drawing.Size(418, 649);
this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入";
......@@ -140,7 +140,7 @@
// btnDisDoorClose
//
this.btnDisDoorClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDisDoorClose.Location = new System.Drawing.Point(297, 470);
this.btnDisDoorClose.Location = new System.Drawing.Point(280, 470);
this.btnDisDoorClose.Name = "btnDisDoorClose";
this.btnDisDoorClose.Size = new System.Drawing.Size(134, 52);
this.btnDisDoorClose.TabIndex = 268;
......@@ -151,7 +151,7 @@
// btnDisDoorOpen
//
this.btnDisDoorOpen.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDisDoorOpen.Location = new System.Drawing.Point(297, 412);
this.btnDisDoorOpen.Location = new System.Drawing.Point(280, 412);
this.btnDisDoorOpen.Name = "btnDisDoorOpen";
this.btnDisDoorOpen.Size = new System.Drawing.Size(134, 52);
this.btnDisDoorOpen.TabIndex = 267;
......@@ -162,7 +162,7 @@
// button4
//
this.button4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button4.Location = new System.Drawing.Point(154, 359);
this.button4.Location = new System.Drawing.Point(143, 359);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(134, 34);
this.button4.TabIndex = 266;
......@@ -173,7 +173,7 @@
// button5
//
this.button5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button5.Location = new System.Drawing.Point(154, 322);
this.button5.Location = new System.Drawing.Point(143, 322);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(134, 34);
this.button5.TabIndex = 265;
......@@ -184,7 +184,7 @@
// button2
//
this.button2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button2.Location = new System.Drawing.Point(294, 271);
this.button2.Location = new System.Drawing.Point(280, 271);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(134, 34);
this.button2.TabIndex = 264;
......@@ -195,7 +195,7 @@
// button3
//
this.button3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button3.Location = new System.Drawing.Point(294, 234);
this.button3.Location = new System.Drawing.Point(280, 234);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(134, 34);
this.button3.TabIndex = 263;
......@@ -206,7 +206,7 @@
// btnSXil
//
this.btnSXil.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSXil.Location = new System.Drawing.Point(13, 470);
this.btnSXil.Location = new System.Drawing.Point(5, 470);
this.btnSXil.Name = "btnSXil";
this.btnSXil.Size = new System.Drawing.Size(134, 52);
this.btnSXil.TabIndex = 262;
......@@ -217,7 +217,7 @@
// btnSXi
//
this.btnSXi.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSXi.Location = new System.Drawing.Point(13, 412);
this.btnSXi.Location = new System.Drawing.Point(5, 412);
this.btnSXi.Name = "btnSXi";
this.btnSXi.Size = new System.Drawing.Size(134, 52);
this.btnSXi.TabIndex = 261;
......@@ -228,7 +228,7 @@
// btnDClose
//
this.btnDClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDClose.Location = new System.Drawing.Point(294, 359);
this.btnDClose.Location = new System.Drawing.Point(280, 359);
this.btnDClose.Name = "btnDClose";
this.btnDClose.Size = new System.Drawing.Size(134, 34);
this.btnDClose.TabIndex = 260;
......@@ -239,7 +239,7 @@
// btnDOpen
//
this.btnDOpen.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDOpen.Location = new System.Drawing.Point(294, 322);
this.btnDOpen.Location = new System.Drawing.Point(280, 322);
this.btnDOpen.Name = "btnDOpen";
this.btnDOpen.Size = new System.Drawing.Size(134, 34);
this.btnDOpen.TabIndex = 259;
......@@ -250,7 +250,7 @@
// btnSuckingDiscDown
//
this.btnSuckingDiscDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSuckingDiscDown.Location = new System.Drawing.Point(154, 470);
this.btnSuckingDiscDown.Location = new System.Drawing.Point(143, 470);
this.btnSuckingDiscDown.Name = "btnSuckingDiscDown";
this.btnSuckingDiscDown.Size = new System.Drawing.Size(134, 52);
this.btnSuckingDiscDown.TabIndex = 258;
......@@ -261,7 +261,7 @@
// btnSuckingDiscUp
//
this.btnSuckingDiscUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSuckingDiscUp.Location = new System.Drawing.Point(154, 412);
this.btnSuckingDiscUp.Location = new System.Drawing.Point(143, 412);
this.btnSuckingDiscUp.Name = "btnSuckingDiscUp";
this.btnSuckingDiscUp.Size = new System.Drawing.Size(134, 52);
this.btnSuckingDiscUp.TabIndex = 257;
......@@ -272,7 +272,7 @@
// btnCloseLed
//
this.btnCloseLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseLed.Location = new System.Drawing.Point(154, 271);
this.btnCloseLed.Location = new System.Drawing.Point(143, 271);
this.btnCloseLed.Name = "btnCloseLed";
this.btnCloseLed.Size = new System.Drawing.Size(134, 34);
this.btnCloseLed.TabIndex = 256;
......@@ -304,7 +304,7 @@
// btnOpenLed
//
this.btnOpenLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenLed.Location = new System.Drawing.Point(154, 234);
this.btnOpenLed.Location = new System.Drawing.Point(143, 234);
this.btnOpenLed.Name = "btnOpenLed";
this.btnOpenLed.Size = new System.Drawing.Size(134, 34);
this.btnOpenLed.TabIndex = 255;
......@@ -347,7 +347,7 @@
// btnCloseAxisBreak
//
this.btnCloseAxisBreak.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAxisBreak.Location = new System.Drawing.Point(13, 271);
this.btnCloseAxisBreak.Location = new System.Drawing.Point(5, 271);
this.btnCloseAxisBreak.Name = "btnCloseAxisBreak";
this.btnCloseAxisBreak.Size = new System.Drawing.Size(134, 34);
this.btnCloseAxisBreak.TabIndex = 253;
......@@ -380,7 +380,7 @@
// btnOpenAxisBreak
//
this.btnOpenAxisBreak.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenAxisBreak.Location = new System.Drawing.Point(13, 234);
this.btnOpenAxisBreak.Location = new System.Drawing.Point(5, 234);
this.btnOpenAxisBreak.Name = "btnOpenAxisBreak";
this.btnOpenAxisBreak.Size = new System.Drawing.Size(134, 34);
this.btnOpenAxisBreak.TabIndex = 252;
......@@ -471,7 +471,7 @@
// btnCloseDoor
//
this.btnCloseDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseDoor.Location = new System.Drawing.Point(14, 359);
this.btnCloseDoor.Location = new System.Drawing.Point(6, 359);
this.btnCloseDoor.Name = "btnCloseDoor";
this.btnCloseDoor.Size = new System.Drawing.Size(134, 34);
this.btnCloseDoor.TabIndex = 249;
......@@ -482,7 +482,7 @@
// btnOpenDoor
//
this.btnOpenDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDoor.Location = new System.Drawing.Point(13, 322);
this.btnOpenDoor.Location = new System.Drawing.Point(5, 322);
this.btnOpenDoor.Name = "btnOpenDoor";
this.btnOpenDoor.Size = new System.Drawing.Size(134, 34);
this.btnOpenDoor.TabIndex = 248;
......@@ -520,9 +520,9 @@
this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(262, 3);
this.groupBox4.Location = new System.Drawing.Point(274, 3);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(245, 712);
this.groupBox4.Size = new System.Drawing.Size(263, 712);
this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表";
......@@ -539,7 +539,7 @@
this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(234, 692);
this.tableLayoutPanel2.Size = new System.Drawing.Size(252, 692);
this.tableLayoutPanel2.TabIndex = 103;
//
// groupBox3
......@@ -549,7 +549,7 @@
this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(12, 3);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(245, 712);
this.groupBox3.Size = new System.Drawing.Size(263, 712);
this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表";
......@@ -566,7 +566,7 @@
this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(234, 692);
this.tableLayoutPanel1.Size = new System.Drawing.Size(252, 692);
this.tableLayoutPanel1.TabIndex = 102;
//
// FrmIOStatus
......
source/ACSingleStore/FrmStoreBox.Designer.cs
......@@ -113,14 +113,10 @@
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.lblAxisStatus = new System.Windows.Forms.Label();
this.button3 = new System.Windows.Forms.Button();
this.axis_5_Alarm = new UserFromControl.IOStatusControl();
this.txtBatchTarget = new System.Windows.Forms.TextBox();
this.lblCountPulse5 = new System.Windows.Forms.TextBox();
this.lblOutPulse5 = new System.Windows.Forms.TextBox();
this.label20 = new System.Windows.Forms.Label();
this.axis_1_Alarm = new UserFromControl.IOStatusControl();
this.axis_3_Alarm = new UserFromControl.IOStatusControl();
this.axis_2_Alarm = new UserFromControl.IOStatusControl();
this.label38 = new System.Windows.Forms.Label();
this.txtMiddleTarget = new System.Windows.Forms.TextBox();
this.txtInoutTarget = new System.Windows.Forms.TextBox();
......@@ -238,6 +234,8 @@
this.清理日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
this.英文ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.升降轴位置调试ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator20 = new System.Windows.Forms.ToolStripSeparator();
this.contextMenuStrip1.SuspendLayout();
this.groupAuto.SuspendLayout();
this.groupBox6.SuspendLayout();
......@@ -1278,14 +1276,10 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox1.Controls.Add(this.lblAxisStatus);
this.groupBox1.Controls.Add(this.button3);
this.groupBox1.Controls.Add(this.axis_5_Alarm);
this.groupBox1.Controls.Add(this.txtBatchTarget);
this.groupBox1.Controls.Add(this.lblCountPulse5);
this.groupBox1.Controls.Add(this.lblOutPulse5);
this.groupBox1.Controls.Add(this.label20);
this.groupBox1.Controls.Add(this.axis_1_Alarm);
this.groupBox1.Controls.Add(this.axis_3_Alarm);
this.groupBox1.Controls.Add(this.axis_2_Alarm);
this.groupBox1.Controls.Add(this.label38);
this.groupBox1.Controls.Add(this.txtMiddleTarget);
this.groupBox1.Controls.Add(this.txtInoutTarget);
......@@ -1336,16 +1330,6 @@
this.button3.UseVisualStyleBackColor = true;
this.button3.Click += new System.EventHandler(this.button3_Click);
//
// axis_5_Alarm
//
this.axis_5_Alarm.IOName = "";
this.axis_5_Alarm.IOValue = 0;
this.axis_5_Alarm.isCanClick = false;
this.axis_5_Alarm.Location = new System.Drawing.Point(457, 54);
this.axis_5_Alarm.Name = "axis_5_Alarm";
this.axis_5_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_5_Alarm.TabIndex = 271;
//
// txtBatchTarget
//
this.txtBatchTarget.Location = new System.Drawing.Point(434, 156);
......@@ -1380,36 +1364,6 @@
this.label20.Text = "批量出入料轴";
this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// axis_1_Alarm
//
this.axis_1_Alarm.IOName = "";
this.axis_1_Alarm.IOValue = 0;
this.axis_1_Alarm.isCanClick = false;
this.axis_1_Alarm.Location = new System.Drawing.Point(155, 54);
this.axis_1_Alarm.Name = "axis_1_Alarm";
this.axis_1_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_1_Alarm.TabIndex = 264;
//
// axis_3_Alarm
//
this.axis_3_Alarm.IOName = "";
this.axis_3_Alarm.IOValue = 0;
this.axis_3_Alarm.isCanClick = false;
this.axis_3_Alarm.Location = new System.Drawing.Point(357, 54);
this.axis_3_Alarm.Name = "axis_3_Alarm";
this.axis_3_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_3_Alarm.TabIndex = 266;
//
// axis_2_Alarm
//
this.axis_2_Alarm.IOName = "";
this.axis_2_Alarm.IOValue = 0;
this.axis_2_Alarm.isCanClick = false;
this.axis_2_Alarm.Location = new System.Drawing.Point(252, 54);
this.axis_2_Alarm.Name = "axis_2_Alarm";
this.axis_2_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_2_Alarm.TabIndex = 265;
//
// label38
//
this.label38.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -2609,10 +2563,12 @@
this.设备调试ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.轴卡点动ToolStripMenuItem,
this.toolStripSeparator9,
this.升降轴位置调试ToolStripMenuItem,
this.toolStripSeparator11,
this.扫码测试ToolStripMenuItem,
this.toolStripSeparator10,
this.摄像机调试ToolStripMenuItem,
this.toolStripSeparator11,
this.toolStripSeparator20,
this.出入库调试ToolStripMenuItem});
this.设备调试ToolStripMenuItem.Name = "设备调试ToolStripMenuItem";
this.设备调试ToolStripMenuItem.Size = new System.Drawing.Size(86, 25);
......@@ -2621,43 +2577,43 @@
// 轴卡点动ToolStripMenuItem
//
this.轴卡点动ToolStripMenuItem.Name = "轴卡点动ToolStripMenuItem";
this.轴卡点动ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.轴卡点动ToolStripMenuItem.Size = new System.Drawing.Size(192, 26);
this.轴卡点动ToolStripMenuItem.Text = "轴卡点动";
this.轴卡点动ToolStripMenuItem.Click += new System.EventHandler(this.轴卡点动ToolStripMenuItem_Click);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(157, 6);
this.toolStripSeparator9.Size = new System.Drawing.Size(189, 6);
//
// 扫码测试ToolStripMenuItem
//
this.扫码测试ToolStripMenuItem.Name = "扫码测试ToolStripMenuItem";
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(192, 26);
this.扫码测试ToolStripMenuItem.Text = "扫码测试";
this.扫码测试ToolStripMenuItem.Click += new System.EventHandler(this.扫码测试ToolStripMenuItem_Click);
//
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
this.toolStripSeparator10.Size = new System.Drawing.Size(157, 6);
this.toolStripSeparator10.Size = new System.Drawing.Size(189, 6);
//
// 摄像机调试ToolStripMenuItem
//
this.摄像机调试ToolStripMenuItem.Name = "摄像机调试ToolStripMenuItem";
this.摄像机调试ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.摄像机调试ToolStripMenuItem.Size = new System.Drawing.Size(192, 26);
this.摄像机调试ToolStripMenuItem.Text = "二维码学习";
this.摄像机调试ToolStripMenuItem.Click += new System.EventHandler(this.摄像机调试ToolStripMenuItem_Click);
//
// toolStripSeparator11
//
this.toolStripSeparator11.Name = "toolStripSeparator11";
this.toolStripSeparator11.Size = new System.Drawing.Size(157, 6);
this.toolStripSeparator11.Size = new System.Drawing.Size(189, 6);
//
// 出入库调试ToolStripMenuItem
//
this.出入库调试ToolStripMenuItem.Name = "出入库调试ToolStripMenuItem";
this.出入库调试ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.出入库调试ToolStripMenuItem.Size = new System.Drawing.Size(192, 26);
this.出入库调试ToolStripMenuItem.Text = "启用调试";
this.出入库调试ToolStripMenuItem.Click += new System.EventHandler(this.出入库调试ToolStripMenuItem_Click);
//
......@@ -2690,6 +2646,18 @@
this.英文ToolStripMenuItem.Text = "英文";
this.英文ToolStripMenuItem.Click += new System.EventHandler(this.开启DEBUGToolStripMenuItem_Click);
//
// 升降轴位置调试ToolStripMenuItem
//
this.升降轴位置调试ToolStripMenuItem.Name = "升降轴位置调试ToolStripMenuItem";
this.升降轴位置调试ToolStripMenuItem.Size = new System.Drawing.Size(192, 26);
this.升降轴位置调试ToolStripMenuItem.Text = "升降轴位置调试";
this.升降轴位置调试ToolStripMenuItem.Click += new System.EventHandler(this.升降轴位置调试ToolStripMenuItem_Click);
//
// toolStripSeparator20
//
this.toolStripSeparator20.Name = "toolStripSeparator20";
this.toolStripSeparator20.Size = new System.Drawing.Size(189, 6);
//
// FrmStoreBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......@@ -2957,6 +2925,8 @@
private System.Windows.Forms.GroupBox groupAuto;
private System.Windows.Forms.CheckBox checkBox1;
private System.Windows.Forms.Button btnSingleTrayIn;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator20;
private System.Windows.Forms.ToolStripMenuItem 升降轴位置调试ToolStripMenuItem;
}
}
source/ACSingleStore/FrmStoreBox.cs
......@@ -1790,5 +1790,20 @@ namespace OnlineStore.AutoInOutStore
}
}
private void 升降轴位置调试ToolStripMenuItem_Click(object sender, EventArgs e)
{
string PortName = store.Config.UpDown_Axis.DeviceName;
int slvAddr = store.Config.UpDown_Axis.GetAxisValue();
string ioIP = "192.168.200.13";
int ioIndex = 0;
if (store.Config.StoreDIList.ContainsKey(IO_Type.UpdownPositionSingal))
{
ioIP = store.Config.StoreDIList[IO_Type.UpdownPositionSingal].DeviceName;
ioIndex = store.Config.StoreDIList[IO_Type.UpdownPositionSingal].GetIOAddr();
}
FrmPositionTool frm= new FrmPositionTool(PortName, slvAddr, ioIP, ioIndex);
frm.ShowDialog();
}
}
}
source/ACSingleStore/positionTool/FrmPositionTool.cs
......@@ -35,7 +35,7 @@ namespace OnlineStore.AutoInOutStore
this.IoIndex = ioIndex;
toolTimer.Enabled = false;
toolTimer.Interval = 300;
toolTimer.Interval = 100;
toolTimer.AutoReset = true;
toolTimer.Elapsed += ToolTimer_Elapsed;
......@@ -218,7 +218,12 @@ namespace OnlineStore.AutoInOutStore
txtActualPosition.Text = currPos.ToString();
PositionList.Add(currPos);
int num = PositionList.Count;
LogUtil.info(LogName + "收到信号，【"+ num + "】【" + currPos+"】");
int preValue = 0;
if (PositionList.Count > 1)
{
preValue = PositionList[num - 2];
}
LogUtil.info(LogName + "收到信号，【"+ num + "】【" + currPos+"】，差值【"+Math.Abs(currPos-preValue)+"】");
LastValue = IO_VALUE.HIGH;
}
......@@ -265,9 +270,7 @@ namespace OnlineStore.AutoInOutStore
{
LogUtil.error(LogName + "保存位置到文件【" + filePath + "】出错：" + ex.ToString());
}
}
private int getDataIndex = 0;
}
private void timer1_Tick(object sender, EventArgs e)
{
......@@ -290,7 +293,7 @@ namespace OnlineStore.AutoInOutStore
{
btnServoOff_Click(null, null);
}
ACServerManager.CloseAllPort();
//ACServerManager.CloseAllPort();
IOManager.instance.CloseAllConnection();
}
......
source/DeviceLibrary/DeviceLibrary.csproj
......@@ -18,7 +18,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;PositionTool</DefineConstants>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
......
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
......@@ -15,22 +15,22 @@ DI,门锁气缸打开端,BatchDoor_Open,12,192.168.200.11,0,门锁气缸打开端,X13,DI-13,0,
DI,门锁气缸关闭端,BatchDoor_Close,13,192.168.200.11,0,门锁气缸关闭端,X14,DI-14,0,
DI,料盘检测2（料叉机构）,TrayCheck_Fixture,14,192.168.200.11,0,料盘检测2（料叉机构）,X15,DI-15,0,
DI,压紧机构计量检测,CompressAxis_Check,15,192.168.200.11,0,压紧机构计量检测,X16,DI-16,0,
DO,自动指示灯,AutoRun_HddLed,16,192.168.200.11,0,自动指示灯,Y01,DO-01,0,
DO,故障指示灯,Alarm_HddLed,17,192.168.200.11,0,故障指示灯,Y02,DO-02,0,
DO,待机指示灯,RunSign_HddLed,18,192.168.200.11,0,待机指示灯,Y03,DO-03,0,
DO,吹气SOL ON,StartOrStopBlow,19,192.168.200.11,0,吹气SOL ON,Y04,DO-04,0,
DO,料仓运转ON,Run_Sign,20,192.168.200.11,0,料仓运转ON,Y05,DO-05,0,
DO,轴2刹车电源ON,Axis_Brake,21,192.168.200.11,0,轴2刹车电源ON,Y06,DO-06,0,
DO,相机照明开,CameraLight_Power,22,192.168.200.11,0,相机照明开,Y07,DO-07,0,
,备用,,23,192.168.200.11,0,备用,Y08,DO-08,0,
DO,进料口门上升SOL,Door_Up,24,192.168.200.11,0,进料口门上升SOL,Y09,DO-09,0,
DO,进料口门下降SOL,Door_Down,25,192.168.200.11,0,进料口门下降SOL,Y10,DO-10,0,
DO,抓取气缸上升SOL,ClampingDisc_Up,26,192.168.200.11,0,抓取气缸上升SOL,Y11,DO-11,0,
DO,抓取气缸下降SOL,ClampingDisc_Down,27,192.168.200.11,0,抓取气缸下降SOL,Y12,DO-12,0,
DO,门锁气缸打开SOL,BatchDoor_Open,28,192.168.200.11,0,门锁气缸打开SOL,Y13,DO-13,0,
DO,门锁气缸关闭SOL,BatchDoor_Close,29,192.168.200.11,0,门锁气缸关闭SOL,Y14,DO-14,0,
DO,门禁功能屏蔽,DisableDoorControl,30,192.168.200.11,0,门禁功能屏蔽,Y15,DO-15,0,
DO,报警蜂鸣器,Buzzer_Sign,31,192.168.200.11,0,报警蜂鸣器,Y16,DO-16,0,
DO,自动指示灯,AutoRun_HddLed,0,192.168.200.11,0,自动指示灯,Y01,DO-01,0,
DO,故障指示灯,Alarm_HddLed,1,192.168.200.11,0,故障指示灯,Y02,DO-02,0,
DO,待机指示灯,RunSign_HddLed,2,192.168.200.11,0,待机指示灯,Y03,DO-03,0,
DO,吹气SOL ON,StartOrStopBlow,3,192.168.200.11,0,吹气SOL ON,Y04,DO-04,0,
DO,料仓运转ON,Run_Sign,4,192.168.200.11,0,料仓运转ON,Y05,DO-05,0,
DO,轴2刹车电源ON,Axis_Brake,5,192.168.200.11,0,轴2刹车电源ON,Y06,DO-06,0,
DO,相机照明开,CameraLight_Power,6,192.168.200.11,0,相机照明开,Y07,DO-07,0,
,备用,,7,192.168.200.11,0,备用,Y08,DO-08,0,
DO,进料口门上升SOL,Door_Up,8,192.168.200.11,0,进料口门上升SOL,Y09,DO-09,0,
DO,进料口门下降SOL,Door_Down,9,192.168.200.11,0,进料口门下降SOL,Y10,DO-10,0,
DO,抓取气缸上升SOL,ClampingDisc_Up,10,192.168.200.11,0,抓取气缸上升SOL,Y11,DO-11,0,
DO,抓取气缸下降SOL,ClampingDisc_Down,11,192.168.200.11,0,抓取气缸下降SOL,Y12,DO-12,0,
DO,门锁气缸打开SOL,BatchDoor_Open,12,192.168.200.11,0,门锁气缸打开SOL,Y13,DO-13,0,
DO,门锁气缸关闭SOL,BatchDoor_Close,13,192.168.200.11,0,门锁气缸关闭SOL,Y14,DO-14,0,
DO,门禁功能屏蔽,DisableDoorControl,14,192.168.200.11,0,门禁功能屏蔽,Y15,DO-15,0,
DO,报警蜂鸣器,Buzzer_Sign,15,192.168.200.11,0,报警蜂鸣器,Y16,DO-16,0,
DI,上料机构门关闭,DoorClose_LoadMaterial,0,192.168.200.12,0,上料机构门关闭,X21,DI-21,0,
DI,气压检测,Airpressure_Check,1,192.168.200.12,0,气压检测,X22,DI-22,0,
DI,左侧门关闭,LeftDoorColse_Single,2,192.168.200.12,0,左侧门关闭,X23,DI-23,0,
......@@ -47,29 +47,30 @@ DI,夹爪气缸放松端,Clamping_Relax,9,192.168.200.12,0,夹爪气缸放松端,X30,DI-30,0,
,,,13,192.168.200.12,0,,X34,DI-34,0,
,,,14,192.168.200.12,0,,X35,DI-35,0,
,,,15,192.168.200.12,0,,X36,DI-36,0,
DO,夹爪气缸夹紧SOL,Clamping_Work,16,192.168.200.12,0,,Y21,DO-21,0,
DO,夹爪气缸放松SOL,Clamping_Relax,17,192.168.200.12,0,,Y22,DO-22,0,
,,,18,192.168.200.12,0,,Y23,DO-23,0,
,,,19,192.168.200.12,0,,Y24,DO-24,0,
,,,20,192.168.200.12,0,,Y25,DO-25,0,
,,,21,192.168.200.12,0,,Y26,DO-26,0,
,,,22,192.168.200.12,0,,Y27,DO-27,0,
,,,23,192.168.200.12,0,,Y28,DO-28,0,
,,,24,192.168.200.12,0,,Y29,DO-29,0,
,,,25,192.168.200.12,0,,Y30,DO-30,0,
,,,26,192.168.200.12,0,,Y31,DO-31,0,
,,,27,192.168.200.12,0,,Y32,DO-32,0,
,,,28,192.168.200.12,0,,Y33,DO-33,0,
,,,29,192.168.200.12,0,,Y34,DO-34,0,
,,,30,192.168.200.12,0,,Y35,DO-35,0,
,,,31,192.168.200.12,0,,Y36,DO-36,0,
DO,夹爪气缸夹紧SOL,Clamping_Work,0,192.168.200.12,0,,Y21,DO-21,0,
DO,夹爪气缸放松SOL,Clamping_Relax,1,192.168.200.12,0,,Y22,DO-22,0,
,,,2,192.168.200.12,0,,Y23,DO-23,0,
,,,3,192.168.200.12,0,,Y24,DO-24,0,
,,,4,192.168.200.12,0,,Y25,DO-25,0,
,,,5,192.168.200.12,0,,Y26,DO-26,0,
,,,6,192.168.200.12,0,,Y27,DO-27,0,
,,,7,192.168.200.12,0,,Y28,DO-28,0,
,,,8,192.168.200.12,0,,Y29,DO-29,0,
,,,9,192.168.200.12,0,,Y30,DO-30,0,
,,,10,192.168.200.12,0,,Y31,DO-31,0,
,,,11,192.168.200.12,0,,Y32,DO-32,0,
,,,12,192.168.200.12,0,,Y33,DO-33,0,
,,,13,192.168.200.12,0,,Y34,DO-34,0,
,,,14,192.168.200.12,0,,Y35,DO-35,0,
,,,15,192.168.200.12,0,,Y36,DO-36,0,
PRO,IO模块对应的DI数量,IO_DILength,192.168.200.21#16;192.168.200.22#16,,,,,, ,
PRO,模块对应的DO数量,IO_DOLength,192.168.200.21#16;192.168.200.22#16,,,,,,,
,,,,,,,,,,
AXIS,(轴一)旋转轴,Middle_Axis,1,COM1,0,,,,,
AXIS,(轴二)升降轴轴,UpDown_Axis,2,COM1,0,,,,,
AXIS,(轴三)进出轴,InOut_Axis,3,COM1,0,,,,,
AXIS,(轴五)批量上下料轴,Batch_Axis,4,COM1,0,,,,,
AXIS,(轴四)压紧轴,Comp_Axis,4,COM1,0,,,,,
AXIS,(轴五)批量上下料轴,Batch_Axis,5,COM1,0,,,,,
,,,,,,,,,,
,,,,,,,,,,
PRO,升降轴 仓门位置P7(人工拿走盘的位置),UpDownAxis_Door_P7,345000,,,,,,,
......@@ -85,8 +86,8 @@ PRO,是否使用定位气缸,IsHasLocationCylinder,0,,,,,,,
PRO,是否有左右侧门,IsHasDoorLimit,1,,,,,,,
PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,1,,,,,,,
PRO,设备是否调试状态（1=调试，0=正常）,IsInDebug,0,,,,,,,
PRO,默认的料盘宽度（不可更改）,Default_TrayWidth,0,,,,,,,
PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,180,,,,, ,,
PRO,默认的料盘宽度（不可更改）,Default_TrayWidth,0,,,,, ,,
PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,180,,,,,,,
,,,,,,,,,,
PRO,预警温度,WarnTemperate,80,,,,,,,
PRO,预警湿度,WarnHumidity,80,,,,,,,
......@@ -121,24 +122,24 @@ PRO,旋转轴(轴一)P1速度,MiddleAxis_P1_Speed,1200,,,,,,,
PRO,旋转轴(轴一)P2速度,MiddleAxis_P2_Speed,1200,,,,,,,
PRO,进出轴(轴三)P1速度,InOutAxis_P1_Speed,800,,,,,,,
PRO,进出轴(轴三)P2速度,InOutAxis_P2_Speed,1000,,,,,,,
PRO,进出轴(轴三)P3速度,InOutAxis_P3_Speed,1000,,,,,,,
PRO,(轴一)旋转轴最小误差脉冲值,MiddleAxis_ErrorCountMin,10,,,,,, ,
PRO,进出轴(轴三)P3速度,InOutAxis_P3_Speed,1000,,,,,, ,
PRO,(轴一)旋转轴最小误差脉冲值,MiddleAxis_ErrorCountMin,10,,,,,,,
PRO,(轴二)升降轴轴最小误差脉冲值,UpdownAxis_ErrorCountMin,10,,,,,,,
PRO,(轴三)进出轴最小误差脉冲值,InoutAxis_ErrorCountMin,10,,,,,,,
PRO,(轴一)旋转轴最大误差脉冲值,MiddleAxis_ErrorCountMax,1000,,,,,,,
PRO,(轴二)升降轴轴最大误差脉冲值,UpdownAxis_ErrorCountMax,1000,,,,,,,
PRO,(轴三)进出轴最大误差脉冲值,InoutAxis_ErrorCountMax,1000,,,,,,,
PRO,出入库多少次，会自动重置旋转轴,Box_ResetMCount,1000,,,,,,,
PRO,出入库多少次，会自动重置所有轴操作,Box_ResetACount,100,,,,,,,
PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,, ,
PRO,出入库多少次，会自动重置所有轴操作,Box_ResetACount,100,,,,,, ,
PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,
PRO,是否使用料盘检测信号,IsUse_Tray_Check,0,,,,,,,
PRO,(轴一)旋转轴最小限位,MiddleAxis_PositionMin,0,,,,,,,
PRO,(轴二)升降轴最小限位,UpdownAxis_PositionMin,0,,,,,,,
PRO,(轴三)进出轴最小限位,InoutAxis_PositionMin,0,,,,,,,
PRO,(轴一)旋转轴最大限位,MiddleAxis_PositionMax,0,,,,,,,
PRO,(轴二)升降轴最大限位,UpdownAxis_PositionMax,0,,,,,,,
PRO,(轴三)进出轴最大限位,InoutAxis_PositionMax,0,,,,,,,
PRO,需要吹气的温度(温度标准),Max_Temperature,0,,,,,, ,
PRO,(轴三)进出轴最大限位,InoutAxis_PositionMax,0,,,,,, ,
PRO,需要吹气的温度(温度标准),Max_Temperature,0,,,,,,,
PRO,需要吹气的湿度(湿度标准),Max_Humidity,5,,,,,,,
PRO,每次吹气的时间（分钟）,BlowAir_Time,30,,,,,,,
PRO,两次吹气间隔（分钟）,BlowAir_Interval,1,,,,,,,
......@@ -152,14 +153,14 @@ PRO,(轴五)上料轴加速度,BatchAxis_AddSpeed,300,,,,,,,
PRO,(轴五)上料轴减速度,BatchAxis_DelSpeed,300,,,,,,,
PRO,(轴五)上料轴原点低速,BatchAxis_HomeLowSpeed,20,,,,,,,
PRO,(轴五)上料轴原点高速,BatchAxis_HomeHighSpeed,60,,,,,,,
PRO,(轴五)上料轴原点加速度,BatchAxis_HomeAddSpeed,2000,,,,,,,
PRO,(轴五)上料轴原点加速度,BatchAxis_HomeAddSpeed,2000,,,,,, ,
PRO,(轴五)上料轴P1点（出库时接料盘的位置）,BatchAxis_P1,1700000,,,,,, ,
PRO,(轴五)上料轴P2点（待机点）,BatchAxis_P2,30000,,,,,, ,
PRO,(轴五)上料轴P2点（待机点）,BatchAxis_P2,30000,,,,,,,
PRO,(轴五)上料轴P2速度,BatchAxis_P2_Speed,2000,,,,,,,
PRO,(轴五)上料轴最小误差脉冲值,BatchAxis_ErrorCountMin,10,,,,,,,
PRO,(轴五)上料轴最大误差脉冲值,BatchAxis_ErrorCountMax,1000,,,,,,,
PRO,(轴五)上料轴最小限位,BatchAxis_PositionMin,0,,,,,,,
PRO,(轴五)上料轴最大限位,BatchAxis_PositionMax,0,,,,,,,
PRO,(轴五)上料轴最小限位,BatchAxis_PositionMin,0,,,,,,,
PRO,(轴五)上料轴最大限位,BatchAxis_PositionMax,0,,,,,,,
PRO,(轴五)上料轴P1速度,BatchAxis_P1_Speed,2000,,,,,,,
PRO,(轴五)上料轴出料时距离检测信号需要下降的高度,BatchAxis_OutDownPosition,100000,,,,,,,
PRO,(轴五)上料轴最最大料盘高度，到达后无法批量出库,BatchAxis_MaxHeight,250,,,,,,,
......@@ -168,13 +169,12 @@ PRO,最后一盘料需要补充的高度,LastTrayAddHeight,0,,,,,,,
PRO,(轴二)升降轴单盘入库抬升料盘的高度,UpdownAxis_UpPosition,3000,,,,,,,
PRO,(轴五)上料轴出库上升最大高度,BatchAxis_OutMaxValue,1610000,,,,,,,
,,,,,,,,,,
AXIS,（轴四）压紧轴,Comp_Axis,5,COM1,0,,,,,
PRO,（轴四）压紧轴目标速度,CompAxis_TargetSpeed,100,,,,,,,
PRO,（轴四）压紧轴加速度,CompAxis_AddSpeed,300,,,,,,,
PRO,（轴四）压紧轴减速度,CompAxis_DelSpeed,300,,,,,,,
PRO,（轴四）压紧轴原点低速,CompAxis_HomeLowSpeed,20,,,,,,,
PRO,（轴四）压紧轴原点高速,CompAxis_HomeHighSpeed,60,,,,,,,
PRO,（轴四）压紧轴原点加速度,CompAxis_HomeAddSpeed,200,,,,,,,
PRO,压紧轴（轴4）P1速度,CompAxis_P1_Speed,100,,,,,,,
PRO,压紧轴（轴4）P2速度,CompAxis_P2_Speed,100,,,,,,,
PRO,压紧轴（轴4）P3速度,CompAxis_P3_Speed,100,,,,,,,
PRO,(轴四)压紧轴目标速度,CompAxis_TargetSpeed,100,,,,,,,
PRO,(轴四)压紧轴加速度,CompAxis_AddSpeed,300,,,,,,,
PRO,(轴四)压紧轴减速度,CompAxis_DelSpeed,300,,,,,,,
PRO,(轴四)压紧轴原点低速,CompAxis_HomeLowSpeed,20,,,,,,,
PRO,(轴四)压紧轴原点高速,CompAxis_HomeHighSpeed,60,,,,,,,
PRO,(轴四)压紧轴原点加速度,CompAxis_HomeAddSpeed,200,,,,,,,
PRO,(轴四)压紧轴P1速度,CompAxis_P1_Speed,100,,,,,,,
PRO,(轴四)压紧轴P2速度,CompAxis_P2_Speed,100,,,,,,,
PRO,(轴四)压紧轴P3速度,CompAxis_P3_Speed,100,,,,,,,
source/LoadCVSLibrary/storeConfig/config/Store_IO_Type.cs
......@@ -237,5 +237,10 @@ namespace OnlineStore.LoadCSVLibrary
///// DO 吸盘吸料SOL SuckingDisc_Work 107 192.168.200.10 0 吸盘吸料SOL Y08 DO-08
///// </summary>
//public static string SuckingDisc_Work = "SuckingDisc_Work";
/// <summary>
/// 升降轴调位置的信号
/// </summary>
public static string UpdownPositionSingal = "UpdownPositionSingal";
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!