Skip to content

孙克 / RC30-AutoInOutStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 898b84e1 由 renym1968
选项

进料轴序号改为轴五（原为轴四） 

界面增加相关轴五的配置。
1 个父辈 279e5762
内嵌 并排
正在显示 11 个修改的文件 包含 602 行增加 和 86 行删除
source/ACSingleStore/FrmAxisDebug.Designer.cs
......@@ -54,6 +54,11 @@
this.btnComMove = new System.Windows.Forms.Button();
this.txtComSpeed = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
this.txtChargingPosition = new System.Windows.Forms.TextBox();
this.btnChargingMovej = new System.Windows.Forms.Button();
this.btnChargingMove = new System.Windows.Forms.Button();
this.txtChargingSpeed = new System.Windows.Forms.TextBox();
this.lblCharging = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// label1
......@@ -178,7 +183,7 @@
//
// button1
//
this.button1.Location = new System.Drawing.Point(401, 336);
this.button1.Location = new System.Drawing.Point(458, 349);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(126, 37);
this.button1.TabIndex = 16;
......@@ -277,11 +282,68 @@
this.label4.TabIndex = 22;
this.label4.Text = "（轴四）压紧轴";
//
// txtChargingPosition
//
this.txtChargingPosition.Location = new System.Drawing.Point(551, 296);
this.txtChargingPosition.Name = "txtChargingPosition";
this.txtChargingPosition.Size = new System.Drawing.Size(108, 23);
this.txtChargingPosition.TabIndex = 31;
this.txtChargingPosition.Visible = false;
//
// btnChargingMovej
//
this.btnChargingMovej.BackColor = System.Drawing.SystemColors.Control;
this.btnChargingMovej.Location = new System.Drawing.Point(401, 291);
this.btnChargingMovej.Name = "btnChargingMovej";
this.btnChargingMovej.Size = new System.Drawing.Size(131, 36);
this.btnChargingMovej.TabIndex = 30;
this.btnChargingMovej.Text = "进料轴-(下降)";
this.btnChargingMovej.UseVisualStyleBackColor = false;
this.btnChargingMovej.Visible = false;
this.btnChargingMovej.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnChargingMovej_MouseDown);
this.btnChargingMovej.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnChargingMovej_MouseUp);
//
// btnChargingMove
//
this.btnChargingMove.BackColor = System.Drawing.SystemColors.Control;
this.btnChargingMove.Location = new System.Drawing.Point(266, 291);
this.btnChargingMove.Name = "btnChargingMove";
this.btnChargingMove.Size = new System.Drawing.Size(131, 36);
this.btnChargingMove.TabIndex = 29;
this.btnChargingMove.Text = "进料轴+(上升)";
this.btnChargingMove.UseVisualStyleBackColor = false;
this.btnChargingMove.Visible = false;
this.btnChargingMove.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnChargingMove_MouseDown);
this.btnChargingMove.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnChargingMove_MouseUp);
//
// txtChargingSpeed
//
this.txtChargingSpeed.Location = new System.Drawing.Point(150, 296);
this.txtChargingSpeed.Name = "txtChargingSpeed";
this.txtChargingSpeed.Size = new System.Drawing.Size(108, 23);
this.txtChargingSpeed.TabIndex = 28;
this.txtChargingSpeed.Visible = false;
//
// lblCharging
//
this.lblCharging.AutoSize = true;
this.lblCharging.Location = new System.Drawing.Point(39, 298);
this.lblCharging.Name = "lblCharging";
this.lblCharging.Size = new System.Drawing.Size(95, 17);
this.lblCharging.TabIndex = 27;
this.lblCharging.Text = "（轴五）进l料轴";
this.lblCharging.Visible = false;
//
// FrmAxisDebug
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(707, 413);
this.Controls.Add(this.txtChargingPosition);
this.Controls.Add(this.btnChargingMovej);
this.Controls.Add(this.btnChargingMove);
this.Controls.Add(this.txtChargingSpeed);
this.Controls.Add(this.lblCharging);
this.Controls.Add(this.txtComPosition);
this.Controls.Add(this.btnComMovej);
this.Controls.Add(this.btnComMove);
......@@ -343,5 +405,10 @@
private System.Windows.Forms.Button btnComMove;
private System.Windows.Forms.TextBox txtComSpeed;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.TextBox txtChargingPosition;
private System.Windows.Forms.Button btnChargingMovej;
private System.Windows.Forms.Button btnChargingMove;
private System.Windows.Forms.TextBox txtChargingSpeed;
private System.Windows.Forms.Label lblCharging;
}
}
\ No newline at end of file
source/ACSingleStore/FrmAxisDebug.cs
......@@ -25,6 +25,9 @@ namespace OnlineStore.ACSingleStore
private ConfigMoveAxis inout = null;
private int compress_Slv = 0;
//add by renym 2018-11-26 定义轴五
private ConfigMoveAxis charging = null;
public static readonly ILog LOGGER = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public FrmAxisDebug(AC_SA_BoxBean boxBean)
{
......@@ -32,6 +35,19 @@ namespace OnlineStore.ACSingleStore
updown = boxBean.Config.UpDown_Axis;
compress_Slv = boxBean.Config.CompressAxis_Slv;
inout = boxBean.Config.InOut_Axis;
//
if (boxBean.Config.Charging_Axis != null)
{
charging = boxBean.Config.Charging_Axis;
this.txtChargingPosition.Visible = true;
this.btnChargingMove.Visible = true;
this.btnChargingMovej.Visible = true;
this.txtChargingSpeed.Visible = true;
this.lblCharging.Visible = true;
}
InitializeComponent();
txtComSpeed.Text = boxBean.Config.CompressAxis_EndSpeed.ToString();
this.Text = boxBean.StoreName + "_轴点动调试";
......@@ -49,6 +65,10 @@ namespace OnlineStore.ACSingleStore
txtInOutSpeed.Text = inout.TargetSpeed.ToString();
txtUpDownSpeed.Text = updown.TargetSpeed.ToString();
txtComSpeed.Text = ACStoreManager.store.Config.CompressAxis_EndSpeed.ToString();
//add by renym 2018-11-26
if(charging !=null)
txtChargingSpeed.Text = charging.TargetSpeed.ToString();
timer1.Start();
}
/// <summary>
......@@ -311,6 +331,9 @@ namespace OnlineStore.ACSingleStore
UpdateInOutPosition();
UpdateUpdownPosition();
txtComPosition.Text = ShuoKeControls.GetLastPosition(compress_Slv).ToString();
//add by renym 2018-11-26
if (charging != null)
UpdateChargingPosition();
}
}
......@@ -340,5 +363,77 @@ namespace OnlineStore.ACSingleStore
txtInOutPosition.Text = inoutPosition.ToString();
}
}
//add by Reny 2018-11-26
private void UpdateChargingPosition()
{
int chargingPosition = ACServerManager.GetTargetPosition(charging.DeviceName, charging.GetAxisValue());
if (!txtChargingPosition.Text.Equals(chargingPosition.ToString()))
{
txtChargingPosition.Text = chargingPosition.ToString();
}
}
private void btnChargingMove_MouseDown(object sender, MouseEventArgs e)
{
//if (!InOutIsIsP1())
//{
// return;
//}
if (btnChargingMove .BackColor.Equals(System.Drawing.SystemColors.Control))
{
int speed = FormUtil.GetIntValue(txtChargingSpeed);
if (speed <= 0)
{
MessageBox.Show("提示", "请先输入正确的速度");
return;
}
btnUpDownMove.BackColor = Color.Green;
AxisMove(charging, speed);
}
}
private void btnChargingMove_MouseUp(object sender, MouseEventArgs e)
{
if (btnChargingMove.BackColor == Color.Green)
{
btnChargingMove.BackColor = System.Drawing.SystemColors.Control;
ACServerManager.SuddenStop(charging.DeviceName, charging.GetAxisValue());
UpdateChargingPosition();
}
}
private void btnChargingMovej_MouseDown(object sender, MouseEventArgs e)
{
//if (!InOutIsIsP1())
//{
// return;
//}
if (btnChargingMovej.BackColor.Equals(System.Drawing.SystemColors.Control))
{
int speed = FormUtil.GetIntValue(txtChargingSpeed);
if (speed <= 0)
{
MessageBox.Show("提示", "请先输入正确的速度");
return;
}
btnChargingMovej.BackColor = Color.Green;
AxisMove(charging, -speed);
}
}
private void btnChargingMovej_MouseUp(object sender, MouseEventArgs e)
{
if (btnChargingMovej.BackColor == Color.Green)
{
btnChargingMovej.BackColor = System.Drawing.SystemColors.Control;
ACServerManager.SuddenStop(charging.DeviceName, charging.GetAxisValue());
UpdateChargingPosition();
}
}
}
}
source/ACSingleStore/FrmIOStatus.Designer.cs
......@@ -18,6 +18,11 @@
this.components = new System.ComponentModel.Container();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.btnSucker_SuctionSOL = new System.Windows.Forms.Button();
this.btnSuckerUp = new System.Windows.Forms.Button();
this.btnSuckerDown = new System.Windows.Forms.Button();
this.btnOpenGateLock = new System.Windows.Forms.Button();
this.btnCloseGateLock = new System.Windows.Forms.Button();
this.btnCloseLed = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label();
this.txtSlaveId = new System.Windows.Forms.TextBox();
......@@ -49,6 +54,8 @@
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.txtSize = new System.Windows.Forms.TextBox();
this.label10 = new System.Windows.Forms.Label();
this.txtHeight = new System.Windows.Forms.TextBox();
this.label9 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
......@@ -61,8 +68,6 @@
this.label4 = new System.Windows.Forms.Label();
this.txtAI1 = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.txtSize = new System.Windows.Forms.TextBox();
this.label10 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout();
......@@ -79,6 +84,11 @@
//
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox1.Controls.Add(this.btnSucker_SuctionSOL);
this.groupBox1.Controls.Add(this.btnSuckerUp);
this.groupBox1.Controls.Add(this.btnSuckerDown);
this.groupBox1.Controls.Add(this.btnOpenGateLock);
this.groupBox1.Controls.Add(this.btnCloseGateLock);
this.groupBox1.Controls.Add(this.btnCloseLed);
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Controls.Add(this.txtSlaveId);
......@@ -106,15 +116,70 @@
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(482, 164);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(332, 358);
this.groupBox1.Size = new System.Drawing.Size(365, 408);
this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入";
//
// btnSucker_SuctionSOL
//
this.btnSucker_SuctionSOL.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSucker_SuctionSOL.Location = new System.Drawing.Point(249, 169);
this.btnSucker_SuctionSOL.Name = "btnSucker_SuctionSOL";
this.btnSucker_SuctionSOL.Size = new System.Drawing.Size(102, 34);
this.btnSucker_SuctionSOL.TabIndex = 266;
this.btnSucker_SuctionSOL.Text = "吸盘吸料";
this.btnSucker_SuctionSOL.UseVisualStyleBackColor = true;
this.btnSucker_SuctionSOL.Visible = false;
//
// btnSuckerUp
//
this.btnSuckerUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSuckerUp.Location = new System.Drawing.Point(249, 214);
this.btnSuckerUp.Name = "btnSuckerUp";
this.btnSuckerUp.Size = new System.Drawing.Size(102, 34);
this.btnSuckerUp.TabIndex = 265;
this.btnSuckerUp.Text = "吸盘上升";
this.btnSuckerUp.UseVisualStyleBackColor = true;
this.btnSuckerUp.Visible = false;
//
// btnSuckerDown
//
this.btnSuckerDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSuckerDown.Location = new System.Drawing.Point(249, 249);
this.btnSuckerDown.Name = "btnSuckerDown";
this.btnSuckerDown.Size = new System.Drawing.Size(102, 34);
this.btnSuckerDown.TabIndex = 264;
this.btnSuckerDown.Text = "吸盘下降";
this.btnSuckerDown.UseVisualStyleBackColor = true;
this.btnSuckerDown.Visible = false;
//
// btnOpenGateLock
//
this.btnOpenGateLock.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenGateLock.Location = new System.Drawing.Point(249, 284);
this.btnOpenGateLock.Name = "btnOpenGateLock";
this.btnOpenGateLock.Size = new System.Drawing.Size(102, 34);
this.btnOpenGateLock.TabIndex = 263;
this.btnOpenGateLock.Text = "打开门锁";
this.btnOpenGateLock.UseVisualStyleBackColor = true;
this.btnOpenGateLock.Visible = false;
//
// btnCloseGateLock
//
this.btnCloseGateLock.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseGateLock.Location = new System.Drawing.Point(249, 318);
this.btnCloseGateLock.Name = "btnCloseGateLock";
this.btnCloseGateLock.Size = new System.Drawing.Size(102, 34);
this.btnCloseGateLock.TabIndex = 262;
this.btnCloseGateLock.Text = "关闭门锁";
this.btnCloseGateLock.UseVisualStyleBackColor = true;
this.btnCloseGateLock.Visible = false;
//
// 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(173, 317);
this.btnCloseLed.Location = new System.Drawing.Point(134, 318);
this.btnCloseLed.Name = "btnCloseLed";
this.btnCloseLed.Size = new System.Drawing.Size(102, 34);
this.btnCloseLed.TabIndex = 256;
......@@ -147,7 +212,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(56, 317);
this.btnOpenLed.Location = new System.Drawing.Point(17, 318);
this.btnOpenLed.Name = "btnOpenLed";
this.btnOpenLed.Size = new System.Drawing.Size(102, 34);
this.btnOpenLed.TabIndex = 255;
......@@ -190,7 +255,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(173, 283);
this.btnCloseAxisBreak.Location = new System.Drawing.Point(134, 284);
this.btnCloseAxisBreak.Name = "btnCloseAxisBreak";
this.btnCloseAxisBreak.Size = new System.Drawing.Size(102, 34);
this.btnCloseAxisBreak.TabIndex = 253;
......@@ -213,7 +278,7 @@
// btnReadIO
//
this.btnReadIO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReadIO.Location = new System.Drawing.Point(56, 133);
this.btnReadIO.Location = new System.Drawing.Point(17, 134);
this.btnReadIO.Name = "btnReadIO";
this.btnReadIO.Size = new System.Drawing.Size(102, 34);
this.btnReadIO.TabIndex = 243;
......@@ -224,7 +289,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(56, 283);
this.btnOpenAxisBreak.Location = new System.Drawing.Point(17, 284);
this.btnOpenAxisBreak.Name = "btnOpenAxisBreak";
this.btnOpenAxisBreak.Size = new System.Drawing.Size(102, 34);
this.btnOpenAxisBreak.TabIndex = 252;
......@@ -247,7 +312,7 @@
// btnWriteSingleDO
//
this.btnWriteSingleDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWriteSingleDO.Location = new System.Drawing.Point(173, 133);
this.btnWriteSingleDO.Location = new System.Drawing.Point(134, 134);
this.btnWriteSingleDO.Name = "btnWriteSingleDO";
this.btnWriteSingleDO.Size = new System.Drawing.Size(102, 34);
this.btnWriteSingleDO.TabIndex = 232;
......@@ -268,7 +333,7 @@
// btnLocationDown
//
this.btnLocationDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLocationDown.Location = new System.Drawing.Point(173, 248);
this.btnLocationDown.Location = new System.Drawing.Point(134, 249);
this.btnLocationDown.Name = "btnLocationDown";
this.btnLocationDown.Size = new System.Drawing.Size(102, 34);
this.btnLocationDown.TabIndex = 251;
......@@ -291,7 +356,7 @@
// btnReadAllDi
//
this.btnReadAllDi.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReadAllDi.Location = new System.Drawing.Point(56, 168);
this.btnReadAllDi.Location = new System.Drawing.Point(17, 169);
this.btnReadAllDi.Name = "btnReadAllDi";
this.btnReadAllDi.Size = new System.Drawing.Size(102, 34);
this.btnReadAllDi.TabIndex = 244;
......@@ -317,7 +382,7 @@
// btnLocationUp
//
this.btnLocationUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLocationUp.Location = new System.Drawing.Point(56, 248);
this.btnLocationUp.Location = new System.Drawing.Point(17, 249);
this.btnLocationUp.Name = "btnLocationUp";
this.btnLocationUp.Size = new System.Drawing.Size(102, 34);
this.btnLocationUp.TabIndex = 250;
......@@ -340,7 +405,7 @@
// btnReadAllDo
//
this.btnReadAllDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReadAllDo.Location = new System.Drawing.Point(173, 168);
this.btnReadAllDo.Location = new System.Drawing.Point(134, 169);
this.btnReadAllDo.Name = "btnReadAllDo";
this.btnReadAllDo.Size = new System.Drawing.Size(102, 34);
this.btnReadAllDo.TabIndex = 245;
......@@ -366,7 +431,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(173, 213);
this.btnCloseDoor.Location = new System.Drawing.Point(134, 214);
this.btnCloseDoor.Name = "btnCloseDoor";
this.btnCloseDoor.Size = new System.Drawing.Size(102, 34);
this.btnCloseDoor.TabIndex = 249;
......@@ -377,7 +442,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(56, 213);
this.btnOpenDoor.Location = new System.Drawing.Point(17, 214);
this.btnOpenDoor.Name = "btnOpenDoor";
this.btnOpenDoor.Size = new System.Drawing.Size(102, 34);
this.btnOpenDoor.TabIndex = 248;
......@@ -388,7 +453,7 @@
// button1
//
this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.button1.Location = new System.Drawing.Point(683, 531);
this.button1.Location = new System.Drawing.Point(683, 581);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(126, 37);
this.button1.TabIndex = 254;
......@@ -401,7 +466,7 @@
this.chbAutoRead.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.chbAutoRead.AutoSize = true;
this.chbAutoRead.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoRead.Location = new System.Drawing.Point(499, 536);
this.chbAutoRead.Location = new System.Drawing.Point(542, 586);
this.chbAutoRead.Name = "chbAutoRead";
this.chbAutoRead.Size = new System.Drawing.Size(75, 21);
this.chbAutoRead.TabIndex = 244;
......@@ -415,7 +480,7 @@
this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(247, 8);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(229, 562);
this.groupBox4.Size = new System.Drawing.Size(229, 612);
this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表";
......@@ -432,7 +497,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(218, 542);
this.tableLayoutPanel2.Size = new System.Drawing.Size(218, 592);
this.tableLayoutPanel2.TabIndex = 103;
//
// groupBox3
......@@ -442,7 +507,7 @@
this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(12, 8);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(229, 562);
this.groupBox3.Size = new System.Drawing.Size(229, 612);
this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表";
......@@ -459,7 +524,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(218, 542);
this.tableLayoutPanel1.Size = new System.Drawing.Size(218, 592);
this.tableLayoutPanel1.TabIndex = 102;
//
// groupBox2
......@@ -480,11 +545,34 @@
this.groupBox2.Controls.Add(this.label1);
this.groupBox2.Location = new System.Drawing.Point(482, 8);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(332, 150);
this.groupBox2.Size = new System.Drawing.Size(365, 150);
this.groupBox2.TabIndex = 245;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "高度传感器";
//
// txtSize
//
this.txtSize.Enabled = false;
this.txtSize.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSize.Location = new System.Drawing.Point(253, 116);
this.txtSize.MaxLength = 10;
this.txtSize.Name = "txtSize";
this.txtSize.Size = new System.Drawing.Size(71, 23);
this.txtSize.TabIndex = 256;
this.txtSize.Text = "0";
//
// label10
//
this.label10.AutoSize = true;
this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label10.Location = new System.Drawing.Point(179, 119);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(68, 17);
this.label10.TabIndex = 255;
this.label10.Text = "料盘尺寸：";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtHeight
//
this.txtHeight.Enabled = false;
......@@ -622,34 +710,11 @@
this.label1.Text = "1：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtSize
//
this.txtSize.Enabled = false;
this.txtSize.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSize.Location = new System.Drawing.Point(253, 116);
this.txtSize.MaxLength = 10;
this.txtSize.Name = "txtSize";
this.txtSize.Size = new System.Drawing.Size(71, 23);
this.txtSize.TabIndex = 256;
this.txtSize.Text = "0";
//
// label10
//
this.label10.AutoSize = true;
this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label10.Location = new System.Drawing.Point(179, 119);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(68, 17);
this.label10.TabIndex = 255;
this.label10.Text = "料盘尺寸：";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// FrmIOStatus
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(829, 580);
this.ClientSize = new System.Drawing.Size(872, 630);
this.Controls.Add(this.button1);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1);
......@@ -723,6 +788,11 @@
private System.Windows.Forms.TextBox txtHeight;
private System.Windows.Forms.TextBox txtSize;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.Button btnSucker_SuctionSOL;
private System.Windows.Forms.Button btnSuckerUp;
private System.Windows.Forms.Button btnSuckerDown;
private System.Windows.Forms.Button btnOpenGateLock;
private System.Windows.Forms.Button btnCloseGateLock;
}
}
source/ACSingleStore/FrmIOStatus.cs
......@@ -37,6 +37,14 @@ namespace OnlineStore.ACSingleStore
this.boxBean = store;
this.StoreId = store.StoreID;
if (store.Config.Charging_Axis != null)
{
btnSucker_SuctionSOL.Visible = true;
btnSuckerDown.Visible = true;
btnSuckerUp.Visible = true;
btnOpenGateLock.Visible = true;
btnCloseGateLock.Visible = true;
}
LoadIOList();
}
......
source/ACSingleStore/FrmStoreBox.Designer.cs
......@@ -71,6 +71,11 @@
this.label49 = new System.Windows.Forms.Label();
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.txtChargingTarget = new System.Windows.Forms.TextBox();
this.lblCountPulse4 = new System.Windows.Forms.TextBox();
this.lblOutPulse4 = new System.Windows.Forms.TextBox();
this.axis_4_Alarm = new UserFromControl.IOStatusControl();
this.lblCharging = 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();
......@@ -155,6 +160,8 @@
this.打开舱门ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.关闭仓门ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.打开门锁ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.关闭门锁ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.设备调试ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.轴卡点动ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
......@@ -196,6 +203,15 @@
this.btnLineAbsMove = new System.Windows.Forms.Button();
this.label25 = new System.Windows.Forms.Label();
this.comboBoxPortName = new System.Windows.Forms.ComboBox();
this.groupBoxChuck = new System.Windows.Forms.GroupBox();
this.button6 = new System.Windows.Forms.Button();
this.button5 = new System.Windows.Forms.Button();
this.btnChargingP0 = new System.Windows.Forms.Button();
this.btnChargingUp = new System.Windows.Forms.Button();
this.txtStart = new System.Windows.Forms.TextBox();
this.txtEnd = new System.Windows.Forms.TextBox();
this.txtHeight = new System.Windows.Forms.TextBox();
this.btnChargingDown = new System.Windows.Forms.Button();
this.groupBox5.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
......@@ -203,6 +219,7 @@
this.groupBox3.SuspendLayout();
this.contextMenuStrip1.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBoxChuck.SuspendLayout();
this.SuspendLayout();
//
// timer1
......@@ -753,7 +770,7 @@
this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.richTextBox1.Location = new System.Drawing.Point(7, 525);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(496, 229);
this.richTextBox1.Size = new System.Drawing.Size(496, 429);
this.richTextBox1.TabIndex = 256;
this.richTextBox1.Text = "";
//
......@@ -761,6 +778,11 @@
//
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox1.Controls.Add(this.txtChargingTarget);
this.groupBox1.Controls.Add(this.lblCountPulse4);
this.groupBox1.Controls.Add(this.lblOutPulse4);
this.groupBox1.Controls.Add(this.axis_4_Alarm);
this.groupBox1.Controls.Add(this.lblCharging);
this.groupBox1.Controls.Add(this.axis_1_Alarm);
this.groupBox1.Controls.Add(this.axis_3_Alarm);
this.groupBox1.Controls.Add(this.axis_2_Alarm);
......@@ -788,6 +810,50 @@
this.groupBox1.TabStop = false;
this.groupBox1.Text = "伺服状态";
//
// txtChargingTarget
//
this.txtChargingTarget.Location = new System.Drawing.Point(404, 162);
this.txtChargingTarget.Name = "txtChargingTarget";
this.txtChargingTarget.ReadOnly = true;
this.txtChargingTarget.Size = new System.Drawing.Size(87, 23);
this.txtChargingTarget.TabIndex = 276;
//
// lblCountPulse4
//
this.lblCountPulse4.Location = new System.Drawing.Point(404, 130);
this.lblCountPulse4.Name = "lblCountPulse4";
this.lblCountPulse4.ReadOnly = true;
this.lblCountPulse4.Size = new System.Drawing.Size(87, 23);
this.lblCountPulse4.TabIndex = 275;
//
// lblOutPulse4
//
this.lblOutPulse4.Location = new System.Drawing.Point(404, 97);
this.lblOutPulse4.Name = "lblOutPulse4";
this.lblOutPulse4.ReadOnly = true;
this.lblOutPulse4.Size = new System.Drawing.Size(87, 23);
this.lblOutPulse4.TabIndex = 274;
//
// axis_4_Alarm
//
this.axis_4_Alarm.IOName = "";
this.axis_4_Alarm.IOValue = 0;
this.axis_4_Alarm.isCanClick = false;
this.axis_4_Alarm.Location = new System.Drawing.Point(428, 50);
this.axis_4_Alarm.Name = "axis_4_Alarm";
this.axis_4_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_4_Alarm.TabIndex = 273;
//
// lblCharging
//
this.lblCharging.AutoSize = true;
this.lblCharging.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblCharging.Location = new System.Drawing.Point(411, 21);
this.lblCharging.Name = "lblCharging";
this.lblCharging.Size = new System.Drawing.Size(80, 17);
this.lblCharging.TabIndex = 272;
this.lblCharging.Text = "轴五：进料轴";
//
// axis_1_Alarm
//
this.axis_1_Alarm.IOName = "";
......@@ -1690,55 +1756,55 @@
// 启动ToolStripMenuItem
//
this.启动ToolStripMenuItem.Name = "启动ToolStripMenuItem";
this.启动ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.启动ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.启动ToolStripMenuItem.Text = "启动";
this.启动ToolStripMenuItem.Click += new System.EventHandler(this.启动ToolStripMenuItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(141, 6);
this.toolStripSeparator1.Size = new System.Drawing.Size(177, 6);
//
// 停止ToolStripMenuItem
//
this.停止ToolStripMenuItem.Name = "停止ToolStripMenuItem";
this.停止ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.停止ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.停止ToolStripMenuItem.Text = "停止";
this.停止ToolStripMenuItem.Click += new System.EventHandler(this.停止ToolStripMenuItem_Click);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(141, 6);
this.toolStripSeparator2.Size = new System.Drawing.Size(177, 6);
//
// 复位ToolStripMenuItem
//
this.复位ToolStripMenuItem.Name = "复位ToolStripMenuItem";
this.复位ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.复位ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.复位ToolStripMenuItem.Text = "复位";
this.复位ToolStripMenuItem.Click += new System.EventHandler(this.复位ToolStripMenuItem_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(141, 6);
this.toolStripSeparator3.Size = new System.Drawing.Size(177, 6);
//
// 回待机点ToolStripMenuItem
//
this.回待机点ToolStripMenuItem.Name = "回待机点ToolStripMenuItem";
this.回待机点ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.回待机点ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.回待机点ToolStripMenuItem.Text = "回待机点";
this.回待机点ToolStripMenuItem.Click += new System.EventHandler(this.回待机点ToolStripMenuItem_Click);
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(141, 6);
this.toolStripSeparator4.Size = new System.Drawing.Size(177, 6);
//
// 退出ToolStripMenuItem
//
this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.退出ToolStripMenuItem.Text = "退出系统";
this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click);
//
......@@ -1753,66 +1819,83 @@
this.toolStripSeparator7,
this.打开舱门ToolStripMenuItem,
this.toolStripSeparator8,
this.关闭仓门ToolStripMenuItem});
this.关闭仓门ToolStripMenuItem,
this.打开门锁ToolStripMenuItem,
this.关闭门锁ToolStripMenuItem});
this.iO状态查看ToolStripMenuItem.Name = "iO状态查看ToolStripMenuItem";
this.iO状态查看ToolStripMenuItem.Size = new System.Drawing.Size(104, 25);
this.iO状态查看ToolStripMenuItem.Text = "IO状态查看";
this.iO状态查看ToolStripMenuItem.Click += new System.EventHandler(this.iO状态查看ToolStripMenuItem_Click);
//
// 查看IOToolStripMenuItem
//
this.查看IOToolStripMenuItem.Name = "查看IOToolStripMenuItem";
this.查看IOToolStripMenuItem.Size = new System.Drawing.Size(175, 26);
this.查看IOToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.查看IOToolStripMenuItem.Text = "查看IO";
this.查看IOToolStripMenuItem.Click += new System.EventHandler(this.查看IOToolStripMenuItem_Click);
//
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(172, 6);
this.toolStripSeparator5.Size = new System.Drawing.Size(177, 6);
//
// 料仓运转ONToolStripMenuItem
//
this.料仓运转ONToolStripMenuItem.Name = "料仓运转ONToolStripMenuItem";
this.料仓运转ONToolStripMenuItem.Size = new System.Drawing.Size(175, 26);
this.料仓运转ONToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.料仓运转ONToolStripMenuItem.Text = "料仓运转ON";
this.料仓运转ONToolStripMenuItem.Click += new System.EventHandler(this.料仓运转ONToolStripMenuItem_Click);
//
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(172, 6);
this.toolStripSeparator6.Size = new System.Drawing.Size(177, 6);
//
// 料仓运转OFFToolStripMenuItem
//
this.料仓运转OFFToolStripMenuItem.Name = "料仓运转OFFToolStripMenuItem";
this.料仓运转OFFToolStripMenuItem.Size = new System.Drawing.Size(175, 26);
this.料仓运转OFFToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.料仓运转OFFToolStripMenuItem.Text = "料仓运转OFF";
this.料仓运转OFFToolStripMenuItem.Click += new System.EventHandler(this.料仓运转OFFToolStripMenuItem_Click);
//
// toolStripSeparator7
//
this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(172, 6);
this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6);
//
// 打开舱门ToolStripMenuItem
//
this.打开舱门ToolStripMenuItem.Name = "打开舱门ToolStripMenuItem";
this.打开舱门ToolStripMenuItem.Size = new System.Drawing.Size(175, 26);
this.打开舱门ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.打开舱门ToolStripMenuItem.Text = "打开仓门";
this.打开舱门ToolStripMenuItem.Click += new System.EventHandler(this.打开舱门ToolStripMenuItem_Click);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
this.toolStripSeparator8.Size = new System.Drawing.Size(172, 6);
this.toolStripSeparator8.Size = new System.Drawing.Size(177, 6);
//
// 关闭仓门ToolStripMenuItem
//
this.关闭仓门ToolStripMenuItem.Name = "关闭仓门ToolStripMenuItem";
this.关闭仓门ToolStripMenuItem.Size = new System.Drawing.Size(175, 26);
this.关闭仓门ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.关闭仓门ToolStripMenuItem.Text = "关闭仓门";
this.关闭仓门ToolStripMenuItem.Click += new System.EventHandler(this.关闭仓门ToolStripMenuItem_Click);
//
// 打开门锁ToolStripMenuItem
//
this.打开门锁ToolStripMenuItem.Name = "打开门锁ToolStripMenuItem";
this.打开门锁ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.打开门锁ToolStripMenuItem.Text = "打开门锁";
this.打开门锁ToolStripMenuItem.Click += new System.EventHandler(this.打开门锁ToolStripMenuItem_Click);
//
// 关闭门锁ToolStripMenuItem
//
this.关闭门锁ToolStripMenuItem.Name = "关闭门锁ToolStripMenuItem";
this.关闭门锁ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.关闭门锁ToolStripMenuItem.Text = "关闭门锁";
this.关闭门锁ToolStripMenuItem.Click += new System.EventHandler(this.关闭门锁ToolStripMenuItem_Click);
//
// 设备调试ToolStripMenuItem
//
this.设备调试ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
......@@ -1829,26 +1912,26 @@
// 轴卡点动ToolStripMenuItem
//
this.轴卡点动ToolStripMenuItem.Name = "轴卡点动ToolStripMenuItem";
this.轴卡点动ToolStripMenuItem.Size = new System.Drawing.Size(192, 26);
this.轴卡点动ToolStripMenuItem.Size = new System.Drawing.Size(180, 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(189, 6);
this.toolStripSeparator9.Size = new System.Drawing.Size(177, 6);
//
// 扫码测试ToolStripMenuItem
//
this.扫码测试ToolStripMenuItem.Name = "扫码测试ToolStripMenuItem";
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(192, 26);
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(180, 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(189, 6);
this.toolStripSeparator10.Size = new System.Drawing.Size(177, 6);
//
// 摄像机调试ToolStripMenuItem
//
......@@ -1860,7 +1943,7 @@
// toolStripSeparator11
//
this.toolStripSeparator11.Name = "toolStripSeparator11";
this.toolStripSeparator11.Size = new System.Drawing.Size(189, 6);
this.toolStripSeparator11.Size = new System.Drawing.Size(177, 6);
//
// 配置信息ToolStripMenuItem
//
......@@ -1874,7 +1957,7 @@
// 轴运动配置ToolStripMenuItem
//
this.轴运动配置ToolStripMenuItem.Name = "轴运动配置ToolStripMenuItem";
this.轴运动配置ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.轴运动配置ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.轴运动配置ToolStripMenuItem.Text = "轴运动配置";
this.轴运动配置ToolStripMenuItem.Click += new System.EventHandler(this.轴运动配置ToolStripMenuItem_Click);
//
......@@ -1891,19 +1974,19 @@
// 开启DEBUGToolStripMenuItem
//
this.开启DEBUGToolStripMenuItem.Name = "开启DEBUGToolStripMenuItem";
this.开启DEBUGToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.开启DEBUGToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.开启DEBUGToolStripMenuItem.Text = "开启DEBUG";
this.开启DEBUGToolStripMenuItem.Click += new System.EventHandler(this.开启DEBUGToolStripMenuItem_Click);
//
// toolStripSeparator12
//
this.toolStripSeparator12.Name = "toolStripSeparator12";
this.toolStripSeparator12.Size = new System.Drawing.Size(164, 6);
this.toolStripSeparator12.Size = new System.Drawing.Size(177, 6);
//
// 清理日志ToolStripMenuItem
//
this.清理日志ToolStripMenuItem.Name = "清理日志ToolStripMenuItem";
this.清理日志ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.清理日志ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.清理日志ToolStripMenuItem.Text = "清理日志";
this.清理日志ToolStripMenuItem.Click += new System.EventHandler(this.清理日志ToolStripMenuItem_Click);
//
......@@ -2195,11 +2278,100 @@
this.comboBoxPortName.Size = new System.Drawing.Size(103, 25);
this.comboBoxPortName.TabIndex = 0;
//
// groupBoxChuck
//
this.groupBoxChuck.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBoxChuck.Controls.Add(this.btnChargingDown);
this.groupBoxChuck.Controls.Add(this.txtHeight);
this.groupBoxChuck.Controls.Add(this.txtEnd);
this.groupBoxChuck.Controls.Add(this.txtStart);
this.groupBoxChuck.Controls.Add(this.btnChargingUp);
this.groupBoxChuck.Controls.Add(this.btnChargingP0);
this.groupBoxChuck.Controls.Add(this.button6);
this.groupBoxChuck.Controls.Add(this.button5);
this.groupBoxChuck.Location = new System.Drawing.Point(510, 737);
this.groupBoxChuck.Name = "groupBoxChuck";
this.groupBoxChuck.Size = new System.Drawing.Size(512, 149);
this.groupBoxChuck.TabIndex = 273;
this.groupBoxChuck.TabStop = false;
this.groupBoxChuck.Text = "自动上料/吸盘操作";
//
// button6
//
this.button6.Location = new System.Drawing.Point(12, 64);
this.button6.Name = "button6";
this.button6.Size = new System.Drawing.Size(105, 33);
this.button6.TabIndex = 16;
this.button6.Text = "门锁关闭";
this.button6.UseVisualStyleBackColor = true;
//
// button5
//
this.button5.Location = new System.Drawing.Point(12, 25);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(105, 33);
this.button5.TabIndex = 15;
this.button5.Text = "门锁打开";
this.button5.UseVisualStyleBackColor = true;
//
// btnChargingP0
//
this.btnChargingP0.Location = new System.Drawing.Point(127, 25);
this.btnChargingP0.Name = "btnChargingP0";
this.btnChargingP0.Size = new System.Drawing.Size(105, 33);
this.btnChargingP0.TabIndex = 17;
this.btnChargingP0.Text = "进料轴待机点";
this.btnChargingP0.UseVisualStyleBackColor = true;
//
// btnChargingUp
//
this.btnChargingUp.Location = new System.Drawing.Point(127, 64);
this.btnChargingUp.Name = "btnChargingUp";
this.btnChargingUp.Size = new System.Drawing.Size(105, 33);
this.btnChargingUp.TabIndex = 18;
this.btnChargingUp.Text = "进料轴上移";
this.btnChargingUp.UseVisualStyleBackColor = true;
//
// txtStart
//
this.txtStart.Location = new System.Drawing.Point(371, 28);
this.txtStart.Name = "txtStart";
this.txtStart.Size = new System.Drawing.Size(100, 26);
this.txtStart.TabIndex = 19;
this.txtStart.Text = "0";
//
// txtEnd
//
this.txtEnd.Location = new System.Drawing.Point(371, 63);
this.txtEnd.Name = "txtEnd";
this.txtEnd.Size = new System.Drawing.Size(100, 26);
this.txtEnd.TabIndex = 20;
this.txtEnd.Text = "0";
//
// txtHeight
//
this.txtHeight.Location = new System.Drawing.Point(371, 95);
this.txtHeight.Name = "txtHeight";
this.txtHeight.Size = new System.Drawing.Size(100, 26);
this.txtHeight.TabIndex = 21;
this.txtHeight.Text = "0";
//
// btnChargingDown
//
this.btnChargingDown.Location = new System.Drawing.Point(127, 103);
this.btnChargingDown.Name = "btnChargingDown";
this.btnChargingDown.Size = new System.Drawing.Size(105, 33);
this.btnChargingDown.TabIndex = 22;
this.btnChargingDown.Text = "进料轴下移";
this.btnChargingDown.UseVisualStyleBackColor = true;
//
// FrmStoreBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(1029, 749);
this.ClientSize = new System.Drawing.Size(1029, 949);
this.Controls.Add(this.groupBoxChuck);
this.Controls.Add(this.groupBox4);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.groupBox3);
......@@ -2230,6 +2402,8 @@
this.contextMenuStrip1.ResumeLayout(false);
this.groupBox4.ResumeLayout(false);
this.groupBox4.PerformLayout();
this.groupBoxChuck.ResumeLayout(false);
this.groupBoxChuck.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
......@@ -2409,6 +2583,22 @@
private System.Windows.Forms.Button btnLineAbsMove;
private System.Windows.Forms.Label label25;
private System.Windows.Forms.ComboBox comboBoxPortName;
private System.Windows.Forms.TextBox txtChargingTarget;
private System.Windows.Forms.TextBox lblCountPulse4;
private System.Windows.Forms.TextBox lblOutPulse4;
private UserFromControl.IOStatusControl axis_4_Alarm;
private System.Windows.Forms.Label lblCharging;
private System.Windows.Forms.GroupBox groupBoxChuck;
private System.Windows.Forms.Button button6;
private System.Windows.Forms.Button button5;
private System.Windows.Forms.ToolStripMenuItem 打开门锁ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 关闭门锁ToolStripMenuItem;
private System.Windows.Forms.TextBox txtHeight;
private System.Windows.Forms.TextBox txtEnd;
private System.Windows.Forms.TextBox txtStart;
private System.Windows.Forms.Button btnChargingUp;
private System.Windows.Forms.Button btnChargingP0;
private System.Windows.Forms.Button btnChargingDown;
}
}
source/ACSingleStore/FrmStoreBox.cs
......@@ -25,18 +25,49 @@ namespace OnlineStore.ACSingleStore
private AC_SA_BoxBean store;
public static readonly ILog LOGGER = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private bool bolCharging = false; //自动上料标志 =true 自动上料 add by Renym 2018-11-20
public FrmStoreBox()
{
Control.CheckForIllegalCrossThreadCalls = false;
InitializeComponent();
chbAuto.Checked = ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun).Equals(1);
}
// 初始化自动进料轴 界面add by Renym 2018-11-22
private void InitAxis4()
{
if (bolCharging)
{
this.lblCountPulse4.Visible = true;
this.lblOutPulse4.Visible = true;
this.txtChargingTarget.Visible = true;
this.axis_4_Alarm.Visible = true;
this.lblCharging.Visible = true;
groupBoxChuck.Visible = true;
this.打开门锁ToolStripMenuItem.Visible = true;
this.关闭门锁ToolStripMenuItem.Visible = true;
}
else
{
this.lblCountPulse4.Visible = false;
this.lblOutPulse4.Visible = false;
this.txtChargingTarget.Visible = false;
this.axis_4_Alarm.Visible = false;
this.lblCharging.Visible = false;
groupBoxChuck.Visible = false;
this.打开门锁ToolStripMenuItem.Visible = false;
this.关闭门锁ToolStripMenuItem.Visible = false;
}
}
#region "初始化界面数据"
private void initValue()
{
InitStoreValue();
if (store.Config.Charging_Axis == null)
this.bolCharging = false; //add by renym
else
this.bolCharging = true;
InitAxis4(); //addby renym 2018-11-22
}
private void InitStoreValue()
{
......@@ -352,6 +383,24 @@ namespace OnlineStore.ACSingleStore
lblCountPulse.Text = lblCountPulse3.Text;
}
}
//add by renym 2018-11-22
if (bolCharging)
{
if (ACServerManager.ServerOnStatus(store.Config.Charging_Axis.DeviceName, store.Config.Charging_Axis.GetAxisValue()))
{
axis_4_Alarm.IOValue = ACServerManager.GetAlarmStatus(store.Config.Charging_Axis.DeviceName, store.Config.Charging_Axis.GetAxisValue());
int lOutPulse4 = ACServerManager.GetTargetPosition(store.Config.Charging_Axis.DeviceName, store.Config.Charging_Axis.GetAxisValue());
lblOutPulse4.Text = string.Format("{0:d}", lOutPulse4);
int lCountPulse4 = ACServerManager.GetActualtPosition(store.Config.Charging_Axis.DeviceName, store.Config.Charging_Axis.GetAxisValue());
lblCountPulse4.Text = string.Format("{0:d}", lCountPulse4);
txtChargingTarget.Text = store.Config.Charging_Axis.TargetPosition.ToString();
if (deviceName.Equals(store.Config.Charging_Axis.DeviceName))
{
lblOutPulse.Text = lblOutPulse4.Text;
lblCountPulse.Text = lblCountPulse4.Text;
}
}
}
}
private void Bt_ClearCounter_Click(object sender, EventArgs e)
......@@ -1407,5 +1456,22 @@ namespace OnlineStore.ACSingleStore
{
}
private void 打开门锁ToolStripMenuItem_Click(object sender, EventArgs e)
{
//store.KNDIOMove(IO_Type.GateLock_Open, IO_VALUE.HIGH);
//store.KNDIOMove(IO_Type.GateLock_Close, IO_VALUE.LOW);
}
private void 关闭门锁ToolStripMenuItem_Click(object sender, EventArgs e)
{
//store.KNDIOMove(IO_Type.GateLock_Open, IO_VALUE.LOW);
//store.KNDIOMove(IO_Type.GateLock_Close, IO_VALUE.HIGH);
}
private void iO状态查看ToolStripMenuItem_Click(object sender, EventArgs e)
{
}
}
}
source/DeviceLibrary/acSingleStore/ACStoreManager.cs
......@@ -94,6 +94,11 @@ namespace OnlineStore.DeviceLibrary
AC_SA_BoxBean storeBean = new AC_SA_BoxBean((AC_SA_Config)storeConfig);
storeBean.CID = CID;
LogUtil.info(LOGGER, "加载料仓完成！");
//add by renym 2018-11-26 进料轴标志设置
if (storeBean.Config.Charging_Axis != null)
storeBean.IsHasCharging_Axis = false;
else
storeBean.IsHasCharging_Axis = true;
store = storeBean;
return store;
}
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
......@@ -36,6 +36,7 @@ namespace OnlineStore.DeviceLibrary
/// 轴报警信息
/// </summary>
private Dictionary<string , AxisAlarmInfo> AxisAlarmCodeMap = new Dictionary<string , AxisAlarmInfo>();
public bool IsHasCharging_Axis = false;
/// <summary>
/// 是否有压紧轴
......@@ -293,6 +294,9 @@ namespace OnlineStore.DeviceLibrary
ACServerManager.SuddenStop(Config.Middle_Axis.DeviceName, Config.Middle_Axis.GetAxisValue());
ACServerManager.SuddenStop(Config.UpDown_Axis.DeviceName, Config.UpDown_Axis.GetAxisValue());
ACServerManager.SuddenStop(Config.InOut_Axis.DeviceName, Config.InOut_Axis.GetAxisValue());
//add by Renym 2018-11-26
if(Config.Charging_Axis!=null)
ACServerManager.SuddenStop(Config.Charging_Axis.DeviceName, Config.Charging_Axis.GetAxisValue());
isInSuddenDown = false;
isNoAirCheck = false;
alarmType = StoreAlarmType.None;
......
source/DeviceLibrary/store/LineAlarm.cs
......@@ -48,6 +48,12 @@ namespace OnlineStore.DeviceLibrary
/// 夹具检测信号常亮
/// </summary>
public static int FixtureCheckHigh = 17;
//
/// add by renym 2018-11-26
/// /// <summary>
/// 轴四（上料轴）报警
/// </summary>
public static int ChargingAxisAlarm = 18;
}
}
source/DeviceLibrary/store/LineMoveP.cs
......@@ -79,5 +79,10 @@ namespace OnlineStore.DeviceLibrary
/// 轴4（ 压紧轴） 压紧前点P3
/// </summary>
public int ComPress_P3{ get; set; }
/// <summary>
/// 轴4（ 进料轴） 待机原位点P1
/// </summary>
public int Charging_P1 { get; set; } // add by renym 2018-11-26
}
}
source/LoadCVSLibrary/storeConfig/config/AC_SA_Config.cs
......@@ -118,18 +118,18 @@ namespace OnlineStore.LoadCSVLibrary
#region
/// add by renym 2018-11-22
/// <summary>
/// PRO （轴四）进料轴轴原点目标速度 ChargingAxis_TargetSpeed 120000
/// PRO （轴五）进料轴轴原点目标速度 ChargingAxis_TargetSpeed 120000
/// </summary>
[ConfigProAttribute("ChargingAxis_TargetSpeed", false)]
public int ChargingAxis_TargetSpeed { get; set; }
/// <summary>
/// PRO （轴四）进料轴轴加速度 ChargingAxis_AddSpeed 200
/// PRO （轴五）进料轴轴加速度 ChargingAxis_AddSpeed 200
/// </summary>
[ConfigProAttribute("ChargingAxis_AddSpeed", false)]
public short ChargingAxis_AddSpeed { get; set; }
/// <summary>
/// PRO （轴四）进料轴轴减速度 ChargingAxis_DelSpeed 200
/// PRO （轴五）进料轴轴减速度 ChargingAxis_DelSpeed 200
/// </summary>
[ConfigProAttribute("ChargingAxis_DelSpeed", false)]
public short ChargingAxis_DelSpeed { get; set; }
......@@ -301,7 +301,7 @@ namespace OnlineStore.LoadCSVLibrary
///add 2018-11-22 by renym
/// <summary>
/// PRO （轴四）进料轴停止时可误差的脉冲数的最小值 ChargingAxis_ErrorCountMin 200
/// PRO （轴五）进料轴停止时可误差的脉冲数的最小值 ChargingAxis_ErrorCountMin 200
/// </summary>
[ConfigProAttribute("ChargingAxis_ErrorCountMin", false)]
public int ChargingAxis_ErrorCountMin { get; set; }
......@@ -324,7 +324,7 @@ namespace OnlineStore.LoadCSVLibrary
///Add 2018-11-22 by renym
/// <summary>
/// PRO （轴四）进料轴停止时可误差的脉冲数的最大值 ChargingAxis_ErrorCountMax 500
/// PRO （轴五）进料轴停止时可误差的脉冲数的最大值 ChargingAxis_ErrorCountMax 500
/// </summary>
[ConfigProAttribute("ChargingAxis_ErrorCountMax", false)]
public int ChargingAxis_ErrorCountMax { get; set; }
......@@ -420,7 +420,7 @@ namespace OnlineStore.LoadCSVLibrary
public ConfigMoveAxis InOut_Axis { get; set; }
/// <summary>
/// 轴4进料轴（上/下）
/// 轴5进料轴（上/下）
/// add by renym 2018-11-21
/// </summary>
[ConfigProAttribute("Charging_Axis", false)]
......@@ -499,12 +499,12 @@ namespace OnlineStore.LoadCSVLibrary
public int InoutAxis_PositionMin { get; set; }
/// <summary>
/// PRO （轴四）进出轴最小限位 ChargingAxis_PositionMin
/// PRO （轴五）进出轴最小限位 ChargingAxis_PositionMin
/// </summary>
[ConfigProAttribute("ChargingAxis_PositionMin", false)]
public int ChargingAxis_PositionMin { get; set; }
/// <summary>
/// PRO （轴四）进料轴最大限位 ChargingAxis_PositionMax
/// PRO （轴五）进料轴最大限位 ChargingAxis_PositionMax
/// </summary>
[ConfigProAttribute("ChargingAxis_PositionMax", false)]
public int ChargingAxis_PositionMax { get; set; }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!