Skip to content

刘韬 / SO1057_XLC_Store

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 49c6daa7 由 张东亮
选项

基础界面添加扫码光源

1 个父辈 6b1bd22e
内嵌 并排
正在显示 2 个修改的文件 包含 35 行增加 和 17 行删除
DeviceLibrary/theMachine/RobotManage.cs
...@@ -97,8 +97,8 @@ namespace DeviceLibrary ...@@ -97,8 +97,8 @@ namespace DeviceLibrary
//IsLoadOk = false; //IsLoadOk = false;
msg += errmsg+"\r\n"; msg += errmsg+"\r\n";
} }
IOManager.IOMove(IO_Type.Device_Led, IO_VALUE.HIGH); //IOManager.IOMove(IO_Type.Device_Led, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.Camera_Led, IO_VALUE.HIGH); //IOManager.IOMove(IO_Type.Camera_Led, IO_VALUE.HIGH);
LoadFinishEvent?.Invoke(IsConfigMode ? IsConfigMode : IsLoadOk, msg); LoadFinishEvent?.Invoke(IsConfigMode ? IsConfigMode : IsLoadOk, msg);
} }
catch (Exception ex) { catch (Exception ex) {
......
TheMachine/Form1.Designer.cs
...@@ -39,6 +39,8 @@ namespace TheMachine ...@@ -39,6 +39,8 @@ namespace TheMachine
this.关于ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.关于ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
this.cylinderButton2 = new TheMachine.CylinderButton();
this.cylinderButton1 = new TheMachine.CylinderButton();
this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.pictureBox2 = new System.Windows.Forms.PictureBox();
this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.btn_opendoor = new System.Windows.Forms.Button(); this.btn_opendoor = new System.Windows.Forms.Button();
...@@ -52,7 +54,6 @@ namespace TheMachine ...@@ -52,7 +54,6 @@ namespace TheMachine
this.listView1 = new System.Windows.Forms.ListView(); this.listView1 = new System.Windows.Forms.ListView();
this.btn_stop = new System.Windows.Forms.Button(); this.btn_stop = new System.Windows.Forms.Button();
this.btn_run = new System.Windows.Forms.Button(); this.btn_run = new System.Windows.Forms.Button();
this.cylinderButton1 = new TheMachine.CylinderButton();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
...@@ -143,6 +144,7 @@ namespace TheMachine ...@@ -143,6 +144,7 @@ namespace TheMachine
// //
// tabPage1 // tabPage1
// //
this.tabPage1.Controls.Add(this.cylinderButton2);
this.tabPage1.Controls.Add(this.cylinderButton1); this.tabPage1.Controls.Add(this.cylinderButton1);
this.tabPage1.Controls.Add(this.pictureBox2); this.tabPage1.Controls.Add(this.pictureBox2);
this.tabPage1.Controls.Add(this.pictureBox1); this.tabPage1.Controls.Add(this.pictureBox1);
...@@ -160,6 +162,34 @@ namespace TheMachine ...@@ -160,6 +162,34 @@ namespace TheMachine
this.tabPage1.Text = "信息"; this.tabPage1.Text = "信息";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
// //
// cylinderButton2
//
this.cylinderButton2.BackColor = System.Drawing.Color.White;
this.cylinderButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton2.IO_HIGH = "Camera_Led";
this.cylinderButton2.IO_LOW = null;
this.cylinderButton2.Location = new System.Drawing.Point(657, 253);
this.cylinderButton2.Name = "cylinderButton2";
this.cylinderButton2.Size = new System.Drawing.Size(201, 40);
this.cylinderButton2.TabIndex = 273;
this.cylinderButton2.Tag = "not";
this.cylinderButton2.Text = "Camera_Led";
this.cylinderButton2.UseVisualStyleBackColor = false;
//
// cylinderButton1
//
this.cylinderButton1.BackColor = System.Drawing.Color.White;
this.cylinderButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton1.IO_HIGH = "Device_Led";
this.cylinderButton1.IO_LOW = null;
this.cylinderButton1.Location = new System.Drawing.Point(657, 207);
this.cylinderButton1.Name = "cylinderButton1";
this.cylinderButton1.Size = new System.Drawing.Size(201, 40);
this.cylinderButton1.TabIndex = 272;
this.cylinderButton1.Tag = "not";
this.cylinderButton1.Text = "Device_Led";
this.cylinderButton1.UseVisualStyleBackColor = false;
//
// pictureBox2 // pictureBox2
// //
this.pictureBox2.BackColor = System.Drawing.Color.Gainsboro; this.pictureBox2.BackColor = System.Drawing.Color.Gainsboro;
...@@ -189,7 +219,7 @@ namespace TheMachine ...@@ -189,7 +219,7 @@ namespace TheMachine
// btn_opendoor // btn_opendoor
// //
this.btn_opendoor.BackColor = System.Drawing.Color.White; this.btn_opendoor.BackColor = System.Drawing.Color.White;
this.btn_opendoor.Location = new System.Drawing.Point(657, 265); this.btn_opendoor.Location = new System.Drawing.Point(657, 299);
this.btn_opendoor.Name = "btn_opendoor"; this.btn_opendoor.Name = "btn_opendoor";
this.btn_opendoor.Size = new System.Drawing.Size(201, 40); this.btn_opendoor.Size = new System.Drawing.Size(201, 40);
this.btn_opendoor.TabIndex = 6; this.btn_opendoor.TabIndex = 6;
...@@ -315,19 +345,6 @@ namespace TheMachine ...@@ -315,19 +345,6 @@ namespace TheMachine
this.btn_run.UseVisualStyleBackColor = true; this.btn_run.UseVisualStyleBackColor = true;
this.btn_run.Click += new System.EventHandler(this.btn_run_Click); this.btn_run.Click += new System.EventHandler(this.btn_run_Click);
// //
// cylinderButton1
//
this.cylinderButton1.BackColor = System.Drawing.Color.White;
this.cylinderButton1.IO_HIGH = "Device_Led";
this.cylinderButton1.IO_LOW = null;
this.cylinderButton1.Location = new System.Drawing.Point(657, 207);
this.cylinderButton1.Name = "cylinderButton1";
this.cylinderButton1.Size = new System.Drawing.Size(201, 40);
this.cylinderButton1.TabIndex = 272;
this.cylinderButton1.Tag = "not";
this.cylinderButton1.Text = "Device_Led";
this.cylinderButton1.UseVisualStyleBackColor = false;
//
// Form1 // Form1
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 17F);
...@@ -384,6 +401,7 @@ namespace TheMachine ...@@ -384,6 +401,7 @@ namespace TheMachine
private System.Windows.Forms.Button btn_IgnoreX09; private System.Windows.Forms.Button btn_IgnoreX09;
private System.Windows.Forms.Button btn_opendoor; private System.Windows.Forms.Button btn_opendoor;
private CylinderButton cylinderButton1; private CylinderButton cylinderButton1;
private CylinderButton cylinderButton2;
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!