Skip to content

孙克 / ACSingleStore

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

增加设备照明IO

1 个父辈 124cbd6f
内嵌 并排
正在显示 9 个修改的文件 包含 168 行增加 和 169 行删除
source/ACSingleStore/FrmIOStatus.Designer.cs
......@@ -63,6 +63,8 @@
this.label4 = new System.Windows.Forms.Label();
this.txtAI1 = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.btnCDLed = new System.Windows.Forms.Button();
this.btnDevideLed = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout();
......@@ -78,6 +80,8 @@
//
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.btnCDLed);
this.groupBox1.Controls.Add(this.btnDevideLed);
this.groupBox1.Controls.Add(this.btnCloseLed);
this.groupBox1.Controls.Add(this.txtSlaveId);
this.groupBox1.Controls.Add(this.btnOpenLed);
......@@ -100,9 +104,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(518, 197);
this.groupBox1.Location = new System.Drawing.Point(527, 201);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(332, 366);
this.groupBox1.Size = new System.Drawing.Size(343, 402);
this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入";
......@@ -110,11 +114,11 @@
// 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(168, 317);
this.btnCloseLed.Location = new System.Drawing.Point(16, 356);
this.btnCloseLed.Name = "btnCloseLed";
this.btnCloseLed.Size = new System.Drawing.Size(144, 34);
this.btnCloseLed.TabIndex = 256;
this.btnCloseLed.Text = "关闭照明";
this.btnCloseLed.Text = "关闭相机照明";
this.btnCloseLed.UseVisualStyleBackColor = true;
this.btnCloseLed.Click += new System.EventHandler(this.btnCloseLed_Click);
//
......@@ -131,11 +135,11 @@
// 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(19, 317);
this.btnOpenLed.Location = new System.Drawing.Point(16, 316);
this.btnOpenLed.Name = "btnOpenLed";
this.btnOpenLed.Size = new System.Drawing.Size(144, 34);
this.btnOpenLed.TabIndex = 255;
this.btnOpenLed.Text = "打开照明";
this.btnOpenLed.Text = "打开相机照明";
this.btnOpenLed.UseVisualStyleBackColor = true;
this.btnOpenLed.Click += new System.EventHandler(this.btnOpenLed_Click);
//
......@@ -173,7 +177,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(168, 283);
this.btnCloseAxisBreak.Location = new System.Drawing.Point(173, 260);
this.btnCloseAxisBreak.Name = "btnCloseAxisBreak";
this.btnCloseAxisBreak.Size = new System.Drawing.Size(144, 34);
this.btnCloseAxisBreak.TabIndex = 253;
......@@ -195,7 +199,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(19, 133);
this.btnReadIO.Location = new System.Drawing.Point(16, 133);
this.btnReadIO.Name = "btnReadIO";
this.btnReadIO.Size = new System.Drawing.Size(144, 34);
this.btnReadIO.TabIndex = 243;
......@@ -206,7 +210,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(19, 283);
this.btnOpenAxisBreak.Location = new System.Drawing.Point(173, 220);
this.btnOpenAxisBreak.Name = "btnOpenAxisBreak";
this.btnOpenAxisBreak.Size = new System.Drawing.Size(144, 34);
this.btnOpenAxisBreak.TabIndex = 252;
......@@ -228,7 +232,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(168, 133);
this.btnWriteSingleDO.Location = new System.Drawing.Point(173, 133);
this.btnWriteSingleDO.Name = "btnWriteSingleDO";
this.btnWriteSingleDO.Size = new System.Drawing.Size(144, 34);
this.btnWriteSingleDO.TabIndex = 232;
......@@ -260,7 +264,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(19, 168);
this.btnReadAllDi.Location = new System.Drawing.Point(16, 168);
this.btnReadAllDi.Name = "btnReadAllDi";
this.btnReadAllDi.Size = new System.Drawing.Size(144, 34);
this.btnReadAllDi.TabIndex = 244;
......@@ -312,7 +316,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(168, 168);
this.btnReadAllDo.Location = new System.Drawing.Point(173, 168);
this.btnReadAllDo.Name = "btnReadAllDo";
this.btnReadAllDo.Size = new System.Drawing.Size(144, 34);
this.btnReadAllDo.TabIndex = 245;
......@@ -323,7 +327,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(168, 213);
this.btnCloseDoor.Location = new System.Drawing.Point(16, 260);
this.btnCloseDoor.Name = "btnCloseDoor";
this.btnCloseDoor.Size = new System.Drawing.Size(144, 34);
this.btnCloseDoor.TabIndex = 249;
......@@ -334,7 +338,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(19, 213);
this.btnOpenDoor.Location = new System.Drawing.Point(16, 220);
this.btnOpenDoor.Name = "btnOpenDoor";
this.btnOpenDoor.Size = new System.Drawing.Size(144, 34);
this.btnOpenDoor.TabIndex = 248;
......@@ -345,7 +349,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(686, 569);
this.button1.Location = new System.Drawing.Point(694, 607);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(144, 34);
this.button1.TabIndex = 254;
......@@ -360,7 +364,7 @@
this.chbAutoRead.Checked = true;
this.chbAutoRead.CheckState = System.Windows.Forms.CheckState.Checked;
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(588, 577);
this.chbAutoRead.Location = new System.Drawing.Point(588, 613);
this.chbAutoRead.Name = "chbAutoRead";
this.chbAutoRead.Size = new System.Drawing.Size(75, 21);
this.chbAutoRead.TabIndex = 244;
......@@ -374,7 +378,7 @@
this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(269, 8);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(252, 603);
this.groupBox4.Size = new System.Drawing.Size(252, 639);
this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表";
......@@ -391,7 +395,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(241, 583);
this.tableLayoutPanel2.Size = new System.Drawing.Size(241, 619);
this.tableLayoutPanel2.TabIndex = 103;
//
// groupBox3
......@@ -401,7 +405,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(252, 603);
this.groupBox3.Size = new System.Drawing.Size(252, 639);
this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表";
......@@ -418,7 +422,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(241, 583);
this.tableLayoutPanel1.Size = new System.Drawing.Size(241, 619);
this.tableLayoutPanel1.TabIndex = 102;
//
// groupBox2
......@@ -440,9 +444,9 @@
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.txtAI1);
this.groupBox2.Controls.Add(this.label1);
this.groupBox2.Location = new System.Drawing.Point(518, 8);
this.groupBox2.Location = new System.Drawing.Point(527, 12);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(332, 189);
this.groupBox2.Size = new System.Drawing.Size(343, 189);
this.groupBox2.TabIndex = 245;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "高度传感器";
......@@ -639,11 +643,33 @@
this.label1.Text = "1：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnCDLed
//
this.btnCDLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCDLed.Location = new System.Drawing.Point(173, 356);
this.btnCDLed.Name = "btnCDLed";
this.btnCDLed.Size = new System.Drawing.Size(144, 34);
this.btnCDLed.TabIndex = 258;
this.btnCDLed.Text = "关闭设备照明";
this.btnCDLed.UseVisualStyleBackColor = true;
this.btnCDLed.Click += new System.EventHandler(this.btnCDLed_Click);
//
// btnDevideLed
//
this.btnDevideLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDevideLed.Location = new System.Drawing.Point(173, 316);
this.btnDevideLed.Name = "btnDevideLed";
this.btnDevideLed.Size = new System.Drawing.Size(144, 34);
this.btnDevideLed.TabIndex = 257;
this.btnDevideLed.Text = "打开设备照明";
this.btnDevideLed.UseVisualStyleBackColor = true;
this.btnDevideLed.Click += new System.EventHandler(this.btnDevideLed_Click);
//
// FrmIOStatus
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(882, 621);
this.ClientSize = new System.Drawing.Size(882, 657);
this.Controls.Add(this.button1);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1);
......@@ -717,6 +743,8 @@
private System.Windows.Forms.TextBox txtAI4;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.TextBox txtAIResult3;
private System.Windows.Forms.Button btnCDLed;
private System.Windows.Forms.Button btnDevideLed;
}
}
source/ACSingleStore/FrmIOStatus.cs
......@@ -315,5 +315,17 @@ namespace OnlineStore.ACSingleStore
{
IOManager.IOMove(IO_Type.Camera_Led, IO_VALUE.LOW);
}
private void btnDevideLed_Click(object sender, EventArgs e)
{
IOManager.IOMove(IO_Type.Device_Led, IO_VALUE.HIGH);
}
private void btnCDLed_Click(object sender, EventArgs e)
{
IOManager.IOMove(IO_Type.Device_Led, IO_VALUE.LOW);
}
}
}
source/ACSingleStore/FrmStoreBox.Designer.cs
......@@ -54,6 +54,8 @@
this.btnLogDebug = new System.Windows.Forms.Button();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.btnCloseDLed = new System.Windows.Forms.Button();
this.btnOpenDLed = new System.Windows.Forms.Button();
this.btnCloseLed = new System.Windows.Forms.Button();
this.btnClearLog = new System.Windows.Forms.Button();
this.btnOpenLed = new System.Windows.Forms.Button();
......@@ -63,13 +65,6 @@
this.tabPage1 = new System.Windows.Forms.TabPage();
this.axisMoveControl1 = new OnlineStore.ACPackingStore.AxisMoveControl();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.groupCode = new System.Windows.Forms.GroupBox();
this.txtCode = new System.Windows.Forms.TextBox();
this.label32 = new System.Windows.Forms.Label();
this.txtImage = new System.Windows.Forms.TextBox();
this.label31 = new System.Windows.Forms.Label();
this.btnCodeTest = new System.Windows.Forms.Button();
this.btnOpenFile = new System.Windows.Forms.Button();
this.groupBox7 = new System.Windows.Forms.GroupBox();
this.groupHistory = new System.Windows.Forms.GroupBox();
this.txtHistoryTemp = new System.Windows.Forms.TextBox();
......@@ -162,7 +157,7 @@
this.轴卡点动ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.扫码测试ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripSeparator10 = 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();
......@@ -178,7 +173,6 @@
this.tabPage3.SuspendLayout();
this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout();
this.groupCode.SuspendLayout();
this.groupBox7.SuspendLayout();
this.groupHistory.SuspendLayout();
this.groupBox3.SuspendLayout();
......@@ -522,14 +516,16 @@
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Location = new System.Drawing.Point(542, 89);
this.tabControl1.Location = new System.Drawing.Point(542, 85);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(555, 651);
this.tabControl1.Size = new System.Drawing.Size(555, 655);
this.tabControl1.TabIndex = 272;
//
// tabPage3
//
this.tabPage3.Controls.Add(this.btnCloseDLed);
this.tabPage3.Controls.Add(this.btnOpenDLed);
this.tabPage3.Controls.Add(this.btnCloseLed);
this.tabPage3.Controls.Add(this.btnClearLog);
this.tabPage3.Controls.Add(this.btnOpenLed);
......@@ -538,69 +534,100 @@
this.tabPage3.Controls.Add(this.richTextBox1);
this.tabPage3.Location = new System.Drawing.Point(4, 29);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(547, 618);
this.tabPage3.Size = new System.Drawing.Size(547, 622);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = " 操作日志 ";
this.tabPage3.UseVisualStyleBackColor = true;
//
// btnCloseDLed
//
this.btnCloseDLed.BackColor = System.Drawing.Color.White;
this.btnCloseDLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseDLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseDLed.Location = new System.Drawing.Point(272, 50);
this.btnCloseDLed.Name = "btnCloseDLed";
this.btnCloseDLed.Size = new System.Drawing.Size(117, 38);
this.btnCloseDLed.TabIndex = 262;
this.btnCloseDLed.Text = "关闭设备照明";
this.btnCloseDLed.UseVisualStyleBackColor = false;
this.btnCloseDLed.Click += new System.EventHandler(this.btnCloseDLed_Click);
//
// btnOpenDLed
//
this.btnOpenDLed.BackColor = System.Drawing.Color.White;
this.btnOpenDLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDLed.Location = new System.Drawing.Point(272, 9);
this.btnOpenDLed.Name = "btnOpenDLed";
this.btnOpenDLed.Size = new System.Drawing.Size(117, 38);
this.btnOpenDLed.TabIndex = 261;
this.btnOpenDLed.Text = "打开设备照明";
this.btnOpenDLed.UseVisualStyleBackColor = false;
this.btnOpenDLed.Click += new System.EventHandler(this.btnOpenDLed_Click);
//
// btnCloseLed
//
this.btnCloseLed.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnCloseLed.BackColor = System.Drawing.Color.White;
this.btnCloseLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
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(149, 516);
this.btnCloseLed.Location = new System.Drawing.Point(143, 50);
this.btnCloseLed.Name = "btnCloseLed";
this.btnCloseLed.Size = new System.Drawing.Size(117, 38);
this.btnCloseLed.TabIndex = 260;
this.btnCloseLed.Text = "关闭照明";
this.btnCloseLed.UseVisualStyleBackColor = true;
this.btnCloseLed.Text = "关闭相机照明";
this.btnCloseLed.UseVisualStyleBackColor = false;
this.btnCloseLed.Click += new System.EventHandler(this.btnCloseLed_Click);
//
// btnClearLog
//
this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnClearLog.BackColor = System.Drawing.Color.White;
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearLog.Location = new System.Drawing.Point(313, 463);
this.btnClearLog.Location = new System.Drawing.Point(414, 9);
this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(117, 38);
this.btnClearLog.TabIndex = 224;
this.btnClearLog.Text = "清理日志";
this.btnClearLog.UseVisualStyleBackColor = true;
this.btnClearLog.UseVisualStyleBackColor = false;
this.btnClearLog.Click += new System.EventHandler(this.btnClearLog_Click);
//
// btnOpenLed
//
this.btnOpenLed.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnOpenLed.BackColor = System.Drawing.Color.White;
this.btnOpenLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
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(32, 516);
this.btnOpenLed.Location = new System.Drawing.Point(143, 9);
this.btnOpenLed.Name = "btnOpenLed";
this.btnOpenLed.Size = new System.Drawing.Size(117, 38);
this.btnOpenLed.TabIndex = 259;
this.btnOpenLed.Text = "打开照明";
this.btnOpenLed.UseVisualStyleBackColor = true;
this.btnOpenLed.Text = "打开相机照明";
this.btnOpenLed.UseVisualStyleBackColor = false;
this.btnOpenLed.Click += new System.EventHandler(this.btnOpenLed_Click);
//
// btnCloseDoor
//
this.btnCloseDoor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnCloseDoor.BackColor = System.Drawing.Color.White;
this.btnCloseDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
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(149, 463);
this.btnCloseDoor.Location = new System.Drawing.Point(14, 50);
this.btnCloseDoor.Name = "btnCloseDoor";
this.btnCloseDoor.Size = new System.Drawing.Size(117, 38);
this.btnCloseDoor.TabIndex = 258;
this.btnCloseDoor.Text = "关闭仓门";
this.btnCloseDoor.UseVisualStyleBackColor = true;
this.btnCloseDoor.UseVisualStyleBackColor = false;
this.btnCloseDoor.Click += new System.EventHandler(this.btnCloseDoor_Click);
//
// btnOpenDoor
//
this.btnOpenDoor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnOpenDoor.BackColor = System.Drawing.Color.White;
this.btnOpenDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
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(32, 463);
this.btnOpenDoor.Location = new System.Drawing.Point(14, 9);
this.btnOpenDoor.Name = "btnOpenDoor";
this.btnOpenDoor.Size = new System.Drawing.Size(117, 38);
this.btnOpenDoor.TabIndex = 257;
this.btnOpenDoor.Text = "打开仓门";
this.btnOpenDoor.UseVisualStyleBackColor = true;
this.btnOpenDoor.UseVisualStyleBackColor = false;
this.btnOpenDoor.Click += new System.EventHandler(this.btnOpenDoor_Click);
//
// richTextBox1
......@@ -609,9 +636,9 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
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, 9);
this.richTextBox1.Location = new System.Drawing.Point(5, 94);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(553, 429);
this.richTextBox1.Size = new System.Drawing.Size(537, 525);
this.richTextBox1.TabIndex = 256;
this.richTextBox1.Text = "";
//
......@@ -621,7 +648,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(547, 618);
this.tabPage1.Size = new System.Drawing.Size(547, 622);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 伺服调试 ";
this.tabPage1.UseVisualStyleBackColor = true;
......@@ -635,93 +662,15 @@
//
// tabPage2
//
this.tabPage2.Controls.Add(this.groupCode);
this.tabPage2.Controls.Add(this.groupBox7);
this.tabPage2.Location = new System.Drawing.Point(4, 29);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(547, 618);
this.tabPage2.Size = new System.Drawing.Size(547, 622);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 压紧轴/温湿度 ";
this.tabPage2.UseVisualStyleBackColor = true;
//
// groupCode
//
this.groupCode.Controls.Add(this.txtCode);
this.groupCode.Controls.Add(this.label32);
this.groupCode.Controls.Add(this.txtImage);
this.groupCode.Controls.Add(this.label31);
this.groupCode.Controls.Add(this.btnCodeTest);
this.groupCode.Controls.Add(this.btnOpenFile);
this.groupCode.Location = new System.Drawing.Point(10, 135);
this.groupCode.Name = "groupCode";
this.groupCode.Size = new System.Drawing.Size(544, 197);
this.groupCode.TabIndex = 273;
this.groupCode.TabStop = false;
this.groupCode.Text = "扫码测试";
this.groupCode.Visible = false;
//
// txtCode
//
this.txtCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtCode.Location = new System.Drawing.Point(81, 67);
this.txtCode.MaxLength = 10;
this.txtCode.Multiline = true;
this.txtCode.Name = "txtCode";
this.txtCode.Size = new System.Drawing.Size(308, 121);
this.txtCode.TabIndex = 249;
//
// label32
//
this.label32.AutoSize = true;
this.label32.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label32.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label32.Location = new System.Drawing.Point(8, 71);
this.label32.Name = "label32";
this.label32.Size = new System.Drawing.Size(80, 17);
this.label32.TabIndex = 248;
this.label32.Text = "二维码内容：";
this.label32.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtImage
//
this.txtImage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtImage.Location = new System.Drawing.Point(56, 28);
this.txtImage.MaxLength = 10;
this.txtImage.Name = "txtImage";
this.txtImage.Size = new System.Drawing.Size(476, 23);
this.txtImage.TabIndex = 247;
//
// label31
//
this.label31.AutoSize = true;
this.label31.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label31.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label31.Location = new System.Drawing.Point(6, 34);
this.label31.Name = "label31";
this.label31.Size = new System.Drawing.Size(44, 17);
this.label31.TabIndex = 246;
this.label31.Text = "图片：";
this.label31.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnCodeTest
//
this.btnCodeTest.Location = new System.Drawing.Point(395, 110);
this.btnCodeTest.Name = "btnCodeTest";
this.btnCodeTest.Size = new System.Drawing.Size(137, 33);
this.btnCodeTest.TabIndex = 245;
this.btnCodeTest.Text = "扫码测试";
this.btnCodeTest.UseVisualStyleBackColor = true;
//
// btnOpenFile
//
this.btnOpenFile.Location = new System.Drawing.Point(395, 71);
this.btnOpenFile.Name = "btnOpenFile";
this.btnOpenFile.Size = new System.Drawing.Size(137, 33);
this.btnOpenFile.TabIndex = 244;
this.btnOpenFile.Text = "打开本地图片";
this.btnOpenFile.UseVisualStyleBackColor = true;
//
// groupBox7
//
this.groupBox7.Controls.Add(this.groupHistory);
......@@ -885,6 +834,7 @@
//
// btnSelTemp
//
this.btnSelTemp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSelTemp.Location = new System.Drawing.Point(212, 74);
this.btnSelTemp.Name = "btnSelTemp";
this.btnSelTemp.Size = new System.Drawing.Size(157, 33);
......@@ -958,6 +908,7 @@
//
// btnTempClose
//
this.btnTempClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTempClose.Location = new System.Drawing.Point(322, 26);
this.btnTempClose.Name = "btnTempClose";
this.btnTempClose.Size = new System.Drawing.Size(100, 33);
......@@ -968,6 +919,7 @@
//
// btnTempInit
//
this.btnTempInit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTempInit.Location = new System.Drawing.Point(212, 26);
this.btnTempInit.Name = "btnTempInit";
this.btnTempInit.Size = new System.Drawing.Size(100, 33);
......@@ -980,9 +932,9 @@
//
this.groupBox3.Controls.Add(this.lblWarnMsg);
this.groupBox3.Controls.Add(this.lblThisSta);
this.groupBox3.Location = new System.Drawing.Point(7, 90);
this.groupBox3.Location = new System.Drawing.Point(7, 85);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(529, 126);
this.groupBox3.Size = new System.Drawing.Size(529, 131);
this.groupBox3.TabIndex = 268;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "设备状态";
......@@ -1865,8 +1817,7 @@
this.轴卡点动ToolStripMenuItem,
this.toolStripSeparator9,
this.扫码测试ToolStripMenuItem,
this.toolStripSeparator10
});
this.toolStripSeparator10});
this.设备调试ToolStripMenuItem.Name = "设备调试ToolStripMenuItem";
this.设备调试ToolStripMenuItem.Size = new System.Drawing.Size(100, 29);
this.设备调试ToolStripMenuItem.Text = "设备调试";
......@@ -1874,27 +1825,26 @@
// 轴卡点动ToolStripMenuItem
//
this.轴卡点动ToolStripMenuItem.Name = "轴卡点动ToolStripMenuItem";
this.轴卡点动ToolStripMenuItem.Size = new System.Drawing.Size(179, 30);
this.轴卡点动ToolStripMenuItem.Size = new System.Drawing.Size(160, 30);
this.轴卡点动ToolStripMenuItem.Text = "轴卡点动";
this.轴卡点动ToolStripMenuItem.Click += new System.EventHandler(this.轴卡点动ToolStripMenuItem_Click);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(176, 6);
this.toolStripSeparator9.Size = new System.Drawing.Size(157, 6);
//
// 扫码测试ToolStripMenuItem
//
this.扫码测试ToolStripMenuItem.Name = "扫码测试ToolStripMenuItem";
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(179, 30);
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(160, 30);
this.扫码测试ToolStripMenuItem.Text = "扫码测试";
this.扫码测试ToolStripMenuItem.Click += new System.EventHandler(this.扫码测试ToolStripMenuItem_Click);
//
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
this.toolStripSeparator10.Size = new System.Drawing.Size(176, 6);
this.toolStripSeparator10.Size = new System.Drawing.Size(157, 6);
//
// 配置信息ToolStripMenuItem
//
......@@ -1971,8 +1921,6 @@
this.tabPage3.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.tabPage2.ResumeLayout(false);
this.groupCode.ResumeLayout(false);
this.groupCode.PerformLayout();
this.groupBox7.ResumeLayout(false);
this.groupBox7.PerformLayout();
this.groupHistory.ResumeLayout(false);
......@@ -2123,18 +2071,13 @@
private System.Windows.Forms.Label label26;
private System.Windows.Forms.Button btnSelHistory;
private System.Windows.Forms.GroupBox groupHistory;
private System.Windows.Forms.GroupBox groupCode;
private System.Windows.Forms.TextBox txtImage;
private System.Windows.Forms.Label label31;
private System.Windows.Forms.Button btnCodeTest;
private System.Windows.Forms.Button btnOpenFile;
private System.Windows.Forms.TextBox txtCode;
private System.Windows.Forms.Label label32;
private System.Windows.Forms.CheckBox chbBuzzer;
private ACPackingStore.AxisMoveControl axisMoveControl1;
private System.Windows.Forms.Button btnUpdown;
private System.Windows.Forms.Button btnLan;
private System.Windows.Forms.CheckBox chbIsDebug;
private System.Windows.Forms.Button btnCloseDLed;
private System.Windows.Forms.Button btnOpenDLed;
}
}
source/ACSingleStore/FrmStoreBox.cs
......@@ -159,8 +159,8 @@ namespace OnlineStore.ACSingleStore
{
groupHistory.Visible = false;
}
this.tabControl1.TabPages.Remove(tabPage3);
groupCode.Visible = false;
// this.tabControl1.TabPages.Remove(tabPage3);
// groupCode.Visible = false;
}
private string WaitStart = ResourceCulture.GetString("等待启动");
private string dooropen = ResourceCulture.GetString("前门未关");
......@@ -1190,5 +1190,16 @@ namespace OnlineStore.ACSingleStore
StoreManager.UpdateBoxConfig(store.Config);
}
}
private void btnOpenDLed_Click(object sender, EventArgs e)
{
IOManager.IOMove(IO_Type.Device_Led, IO_VALUE.HIGH);
}
private void btnCloseDLed_Click(object sender, EventArgs e)
{
IOManager.IOMove(IO_Type.Device_Led, IO_VALUE.LOW);
}
}
}
source/ACSingleStore/resource/language.resource
......@@ -23,9 +23,9 @@ FrmStoreBox_btnClearL_Text,清理日志,Clean log,
FrmStoreBox_btnLogDebug_Text,开启DEBUG,Open Debug,
FrmStoreBox_tabControl1_Text,FrmStoreBox_tabControl1_Text,FrmStoreBox_tabControl1_Text,
FrmStoreBox_tabPage3_Text,操作日志,Operation Log,
FrmStoreBox_btnCloseLed_Text,关闭照明,Close light,
FrmStoreBox_btnCloseLed_Text,关闭相机照明,Close Camera light,
FrmStoreBox_btnClearLog_Text,清理日志,Clean log,
FrmStoreBox_btnOpenLed_Text,打开照明,Open light,
FrmStoreBox_btnOpenLed_Text,打开相机照明,Open Camera light,
FrmStoreBox_btnCloseDoor_Text,关闭仓门,Close door,
FrmStoreBox_btnOpenDoor_Text,打开仓门,Open door,
FrmStoreBox_tabPage1_Text,伺服调试,Servo debug,
......@@ -130,9 +130,9 @@ FrmIOStatus_label7_Text,3:,3:,
FrmIOStatus_label4_Text,2:,2:,
FrmIOStatus_label1_Text,1:,1:,
FrmIOStatus_groupBox1_Text,DO写入,DO write,
FrmIOStatus_btnCloseLed_Text,关闭照明,Close light,
FrmIOStatus_btnCloseLed_Text,关闭相机照明,Close Camera light,
FrmIOStatus_label3_Text,选择DO:,Select DO:,
FrmIOStatus_btnOpenLed_Text,打开照明,Open light,
FrmIOStatus_btnOpenLed_Text,打开相机照明,Open Camera light,
FrmIOStatus_label2_Text,SlaveId,SlaveId,
FrmIOStatus_btnCloseAxisBreak_Text,关闭刹车,Close brake,
FrmIOStatus_label17_Text,设备IP:,IP:,
......@@ -250,6 +250,7 @@ Y07,轴2刹车电源ON,Brake power of axis2 ON,
Y08,进料口门上升SOL,Portal ascent SOL,
Y09,进料口门下降SOL,Portal descent SOL,
Y10,相机照明开,Camera light ON,
Y10,设备照明开,Device light ON,
是否确定退出？,是否确定退出？,Are you sure you want to quit?,
提示,提示,Remind,
点动速度,点动速度,Inching speed,
......
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
......@@ -29,7 +29,7 @@ DO,轴2刹车电源ON,Axis_Brake,6,192.168.200.21,0,轴2刹车电源ON,Y07,Y07,0,
DO,进料口门上升SOL,Door_Up,7,192.168.200.21,0,进料口门上升SOL,Y08,Y08,0,
DO,进料口门下降SOL,Door_Down,8,192.168.200.21,0,进料口门下降SOL,Y09,Y09,0,
DO,相机照明开,Camera_Led,9,192.168.200.21,0,相机照明开,Y10,Y10,0,
,,,10,192.168.200.21,0,,Y11,Y11,0,
DO,设备照明开,Device_Led,10,192.168.200.21,0,设备照明开,Y11,Y11,0,
,,,11,192.168.200.21,0,,Y12,Y12,0,
,,,12,192.168.200.21,0,,Y13,Y13,0,
,,,13,192.168.200.21,0,,Y14,Y14,0,
......@@ -117,7 +117,7 @@ PRO,每次吹气的时间（分钟）,BlowAir_Time,10,,,,,,,
PRO,两次吹气间隔（分钟）,BlowAir_Interval,10,,,,,,,
PRO,温湿度端口号,Humiture_Port,COM1,,,,,,,
,,,,,,,,, ,
PRO,模拟量IO模块的IP地址,AIDevice_IP,192.168.200.12,,,,,,,
PRO,模拟量IO模块的IP地址,AIDevice_IP,192.168.200.22,,,,,,,
PRO,模拟信号1默认高度,AIDI1_DefaultPosition,2920,,,,,,,
PRO,模拟信号2默认高度,AIDI2_DefaultPosition,2960,,,,,,,
PRO,模拟信号3默认高度,AIDI3_DefaultPosition,2500,,,,,,,
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
......@@ -921,14 +921,14 @@ namespace OnlineStore.DeviceLibrary
doorIsOpen = true;
}
if (doorIsOpen)
{
IOManager.IOMove(IO_Type.Camera_Led, IO_VALUE.HIGH);
}
else
{
IOManager.IOMove(IO_Type.Camera_Led, IO_VALUE.LOW);
}
//if (doorIsOpen)
//{
// IOManager.IOMove(IO_Type.Device_Led, IO_VALUE.HIGH);
//}
//else
//{
// IOManager.IOMove(IO_Type.Device_Led, IO_VALUE.LOW);
//}
}
catch (Exception ex)
......
source/LoadCVSLibrary/storeConfig/config/IO_Type.cs
......@@ -112,7 +112,11 @@ namespace OnlineStore.LoadCSVLibrary
/// <summary>
/// DO 相机照明开 Camera_Led Y10
/// </summary>
public static string Camera_Led = "Camera_Led";
public static string Camera_Led = "Camera_Led";
/// <summary>
/// DO 设备照明开 Device_Led Y11
/// </summary>
public static string Device_Led = "Device_Led";
}
public enum IO_VALUE
{
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!