From b83a01eec16b236d099dcea3e7a5051c8cae9c6c Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期五, 03 七月 2020 10:48:37 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

---
 src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.Designer.cs |  496 ++----------------------------------------------------
 1 files changed, 20 insertions(+), 476 deletions(-)

diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.Designer.cs
index e61e4f4..99ab3ff 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.Designer.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.Designer.cs
@@ -31,8 +31,6 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CtrlMotionCardOperationBase));
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
-            this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.listBoxMsg = new System.Windows.Forms.ListBox();
             this.groupBoxPara = new System.Windows.Forms.GroupBox();
             this.propGrid = new System.Windows.Forms.PropertyGrid();
             this.groupBoxMoveModel = new System.Windows.Forms.GroupBox();
@@ -47,50 +45,11 @@
             this.buttonSmoothStop = new System.Windows.Forms.Button();
             this.buttonPositionReset = new System.Windows.Forms.Button();
             this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
-            this.groupBox5 = new System.Windows.Forms.GroupBox();
-            this.ioIndicatorCtrl14 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl13 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl12 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl26 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl25 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl24 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl17 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl16 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl20 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl19 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl23 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl22 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl21 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl18 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl15 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl11 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.groupBox6 = new System.Windows.Forms.GroupBox();
-            this.ioIndicatorCtrl27 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl28 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl29 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl30 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl31 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl32 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl33 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl34 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl35 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl36 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl37 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl38 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl39 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl40 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl41 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.ioIndicatorCtrl42 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
-            this.flowLayoutPanelRunStatus = new System.Windows.Forms.FlowLayoutPanel();
             this.tableLayoutPanel1.SuspendLayout();
             this.tableLayoutPanel2.SuspendLayout();
-            this.groupBox2.SuspendLayout();
             this.groupBoxPara.SuspendLayout();
             this.groupBoxMoveModel.SuspendLayout();
             this.groupBoxCommBtn.SuspendLayout();
-            this.tableLayoutPanel3.SuspendLayout();
-            this.groupBox5.SuspendLayout();
-            this.groupBox6.SuspendLayout();
             this.SuspendLayout();
             // 
             // tableLayoutPanel1
@@ -112,50 +71,27 @@
             // 
             this.tableLayoutPanel2.ColumnCount = 1;
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel2.Controls.Add(this.groupBox2, 0, 3);
             this.tableLayoutPanel2.Controls.Add(this.groupBoxPara, 0, 2);
             this.tableLayoutPanel2.Controls.Add(this.groupBoxMoveModel, 0, 1);
             this.tableLayoutPanel2.Controls.Add(this.groupBoxCommBtn, 0, 0);
             this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 3);
             this.tableLayoutPanel2.Name = "tableLayoutPanel2";
-            this.tableLayoutPanel2.RowCount = 4;
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 90F));
+            this.tableLayoutPanel2.RowCount = 3;
+            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 100F));
             this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 50F));
             this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 110F));
+            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
             this.tableLayoutPanel2.Size = new System.Drawing.Size(386, 714);
             this.tableLayoutPanel2.TabIndex = 0;
-            // 
-            // groupBox2
-            // 
-            this.groupBox2.Controls.Add(this.listBoxMsg);
-            this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.groupBox2.Location = new System.Drawing.Point(3, 607);
-            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(380, 104);
-            this.groupBox2.TabIndex = 7;
-            this.groupBox2.TabStop = false;
-            this.groupBox2.Text = "娑堟伅妗�";
-            // 
-            // listBoxMsg
-            // 
-            this.listBoxMsg.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.listBoxMsg.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
-            this.listBoxMsg.FormattingEnabled = true;
-            this.listBoxMsg.ItemHeight = 15;
-            this.listBoxMsg.Location = new System.Drawing.Point(3, 17);
-            this.listBoxMsg.Name = "listBoxMsg";
-            this.listBoxMsg.Size = new System.Drawing.Size(374, 84);
-            this.listBoxMsg.TabIndex = 1;
             // 
             // groupBoxPara
             // 
             this.groupBoxPara.Controls.Add(this.propGrid);
             this.groupBoxPara.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.groupBoxPara.Location = new System.Drawing.Point(3, 143);
+            this.groupBoxPara.Location = new System.Drawing.Point(3, 153);
             this.groupBoxPara.Name = "groupBoxPara";
-            this.groupBoxPara.Size = new System.Drawing.Size(380, 458);
+            this.groupBoxPara.Size = new System.Drawing.Size(380, 558);
             this.groupBoxPara.TabIndex = 6;
             this.groupBoxPara.TabStop = false;
             this.groupBoxPara.Text = "鍙傛暟";
@@ -166,7 +102,7 @@
             this.propGrid.Location = new System.Drawing.Point(3, 17);
             this.propGrid.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.propGrid.Name = "propGrid";
-            this.propGrid.Size = new System.Drawing.Size(374, 438);
+            this.propGrid.Size = new System.Drawing.Size(374, 538);
             this.propGrid.TabIndex = 1;
             // 
             // groupBoxMoveModel
@@ -175,7 +111,7 @@
             this.groupBoxMoveModel.Controls.Add(this.radioJog);
             this.groupBoxMoveModel.Controls.Add(this.radioP2P);
             this.groupBoxMoveModel.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.groupBoxMoveModel.Location = new System.Drawing.Point(3, 93);
+            this.groupBoxMoveModel.Location = new System.Drawing.Point(3, 103);
             this.groupBoxMoveModel.Name = "groupBoxMoveModel";
             this.groupBoxMoveModel.Size = new System.Drawing.Size(380, 44);
             this.groupBoxMoveModel.TabIndex = 5;
@@ -228,7 +164,7 @@
             this.groupBoxCommBtn.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBoxCommBtn.Location = new System.Drawing.Point(3, 3);
             this.groupBoxCommBtn.Name = "groupBoxCommBtn";
-            this.groupBoxCommBtn.Size = new System.Drawing.Size(380, 84);
+            this.groupBoxCommBtn.Size = new System.Drawing.Size(380, 94);
             this.groupBoxCommBtn.TabIndex = 0;
             this.groupBoxCommBtn.TabStop = false;
             this.groupBoxCommBtn.Text = "鍏叡鎿嶄綔";
@@ -242,7 +178,7 @@
             this.btnStart.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnStart.Image = ((System.Drawing.Image)(resources.GetObject("btnStart.Image")));
             this.btnStart.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.btnStart.Location = new System.Drawing.Point(248, 20);
+            this.btnStart.Location = new System.Drawing.Point(248, 23);
             this.btnStart.Name = "btnStart";
             this.btnStart.Size = new System.Drawing.Size(126, 54);
             this.btnStart.TabIndex = 5;
@@ -253,7 +189,7 @@
             // 
             // buttonClearStatus
             // 
-            this.buttonClearStatus.Location = new System.Drawing.Point(6, 18);
+            this.buttonClearStatus.Location = new System.Drawing.Point(6, 21);
             this.buttonClearStatus.Name = "buttonClearStatus";
             this.buttonClearStatus.Size = new System.Drawing.Size(70, 25);
             this.buttonClearStatus.TabIndex = 4;
@@ -263,7 +199,7 @@
             // 
             // buttonEmergencyStop
             // 
-            this.buttonEmergencyStop.Location = new System.Drawing.Point(86, 53);
+            this.buttonEmergencyStop.Location = new System.Drawing.Point(86, 56);
             this.buttonEmergencyStop.Name = "buttonEmergencyStop";
             this.buttonEmergencyStop.Size = new System.Drawing.Size(70, 25);
             this.buttonEmergencyStop.TabIndex = 4;
@@ -273,7 +209,7 @@
             // 
             // buttonServoEnable
             // 
-            this.buttonServoEnable.Location = new System.Drawing.Point(86, 18);
+            this.buttonServoEnable.Location = new System.Drawing.Point(86, 21);
             this.buttonServoEnable.Name = "buttonServoEnable";
             this.buttonServoEnable.Size = new System.Drawing.Size(70, 25);
             this.buttonServoEnable.TabIndex = 4;
@@ -283,7 +219,7 @@
             // 
             // buttonSmoothStop
             // 
-            this.buttonSmoothStop.Location = new System.Drawing.Point(6, 53);
+            this.buttonSmoothStop.Location = new System.Drawing.Point(6, 56);
             this.buttonSmoothStop.Name = "buttonSmoothStop";
             this.buttonSmoothStop.Size = new System.Drawing.Size(70, 25);
             this.buttonSmoothStop.TabIndex = 4;
@@ -293,7 +229,7 @@
             // 
             // buttonPositionReset
             // 
-            this.buttonPositionReset.Location = new System.Drawing.Point(168, 18);
+            this.buttonPositionReset.Location = new System.Drawing.Point(168, 21);
             this.buttonPositionReset.Name = "buttonPositionReset";
             this.buttonPositionReset.Size = new System.Drawing.Size(70, 25);
             this.buttonPositionReset.TabIndex = 4;
@@ -305,385 +241,30 @@
             // 
             this.tableLayoutPanel3.ColumnCount = 1;
             this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel3.Controls.Add(this.groupBox5, 0, 1);
-            this.tableLayoutPanel3.Controls.Add(this.groupBox6, 0, 2);
-            this.tableLayoutPanel3.Controls.Add(this.flowLayoutPanelRunStatus, 0, 0);
             this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tableLayoutPanel3.Location = new System.Drawing.Point(395, 3);
             this.tableLayoutPanel3.Name = "tableLayoutPanel3";
-            this.tableLayoutPanel3.RowCount = 3;
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 60F));
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
+            this.tableLayoutPanel3.RowCount = 1;
+            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
             this.tableLayoutPanel3.Size = new System.Drawing.Size(584, 714);
             this.tableLayoutPanel3.TabIndex = 1;
             // 
-            // groupBox5
-            // 
-            this.groupBox5.Controls.Add(this.ioIndicatorCtrl14);
-            this.groupBox5.Controls.Add(this.ioIndicatorCtrl13);
-            this.groupBox5.Controls.Add(this.ioIndicatorCtrl12);
-            this.groupBox5.Controls.Add(this.ioIndicatorCtrl26);
-            this.groupBox5.Controls.Add(this.ioIndicatorCtrl25);
-            this.groupBox5.Controls.Add(this.ioIndicatorCtrl24);
-            this.groupBox5.Controls.Add(this.ioIndicatorCtrl17);
-            this.groupBox5.Controls.Add(this.ioIndicatorCtrl16);
-            this.groupBox5.Controls.Add(this.ioIndicatorCtrl20);
-            this.groupBox5.Controls.Add(this.ioIndicatorCtrl19);
-            this.groupBox5.Controls.Add(this.ioIndicatorCtrl23);
-            this.groupBox5.Controls.Add(this.ioIndicatorCtrl22);
-            this.groupBox5.Controls.Add(this.ioIndicatorCtrl21);
-            this.groupBox5.Controls.Add(this.ioIndicatorCtrl18);
-            this.groupBox5.Controls.Add(this.ioIndicatorCtrl15);
-            this.groupBox5.Controls.Add(this.ioIndicatorCtrl11);
-            this.groupBox5.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.groupBox5.Location = new System.Drawing.Point(3, 431);
-            this.groupBox5.Name = "groupBox5";
-            this.groupBox5.Size = new System.Drawing.Size(578, 136);
-            this.groupBox5.TabIndex = 6;
-            this.groupBox5.TabStop = false;
-            this.groupBox5.Text = "鏁板瓧閲忚緭鍏�";
-            // 
-            // ioIndicatorCtrl14
-            // 
-            this.ioIndicatorCtrl14.Desc = "IN 4";
-            this.ioIndicatorCtrl14.IsOn = null;
-            this.ioIndicatorCtrl14.Location = new System.Drawing.Point(477, 18);
-            this.ioIndicatorCtrl14.Name = "ioIndicatorCtrl14";
-            this.ioIndicatorCtrl14.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl14.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl13
-            // 
-            this.ioIndicatorCtrl13.Desc = "IN 3";
-            this.ioIndicatorCtrl13.IsOn = null;
-            this.ioIndicatorCtrl13.Location = new System.Drawing.Point(306, 18);
-            this.ioIndicatorCtrl13.Name = "ioIndicatorCtrl13";
-            this.ioIndicatorCtrl13.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl13.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl12
-            // 
-            this.ioIndicatorCtrl12.Desc = "IN 2";
-            this.ioIndicatorCtrl12.IsOn = null;
-            this.ioIndicatorCtrl12.Location = new System.Drawing.Point(145, 18);
-            this.ioIndicatorCtrl12.Name = "ioIndicatorCtrl12";
-            this.ioIndicatorCtrl12.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl12.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl26
-            // 
-            this.ioIndicatorCtrl26.Desc = "IN 16";
-            this.ioIndicatorCtrl26.IsOn = null;
-            this.ioIndicatorCtrl26.Location = new System.Drawing.Point(477, 107);
-            this.ioIndicatorCtrl26.Name = "ioIndicatorCtrl26";
-            this.ioIndicatorCtrl26.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl26.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl25
-            // 
-            this.ioIndicatorCtrl25.Desc = "IN 15";
-            this.ioIndicatorCtrl25.IsOn = null;
-            this.ioIndicatorCtrl25.Location = new System.Drawing.Point(306, 107);
-            this.ioIndicatorCtrl25.Name = "ioIndicatorCtrl25";
-            this.ioIndicatorCtrl25.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl25.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl24
-            // 
-            this.ioIndicatorCtrl24.Desc = "IN 14";
-            this.ioIndicatorCtrl24.IsOn = null;
-            this.ioIndicatorCtrl24.Location = new System.Drawing.Point(145, 107);
-            this.ioIndicatorCtrl24.Name = "ioIndicatorCtrl24";
-            this.ioIndicatorCtrl24.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl24.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl17
-            // 
-            this.ioIndicatorCtrl17.Desc = "IN 13";
-            this.ioIndicatorCtrl17.IsOn = null;
-            this.ioIndicatorCtrl17.Location = new System.Drawing.Point(9, 106);
-            this.ioIndicatorCtrl17.Name = "ioIndicatorCtrl17";
-            this.ioIndicatorCtrl17.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl17.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl16
-            // 
-            this.ioIndicatorCtrl16.Desc = "IN 9";
-            this.ioIndicatorCtrl16.IsOn = null;
-            this.ioIndicatorCtrl16.Location = new System.Drawing.Point(9, 77);
-            this.ioIndicatorCtrl16.Name = "ioIndicatorCtrl16";
-            this.ioIndicatorCtrl16.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl16.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl20
-            // 
-            this.ioIndicatorCtrl20.Desc = "IN 8";
-            this.ioIndicatorCtrl20.IsOn = null;
-            this.ioIndicatorCtrl20.Location = new System.Drawing.Point(477, 48);
-            this.ioIndicatorCtrl20.Name = "ioIndicatorCtrl20";
-            this.ioIndicatorCtrl20.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl20.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl19
-            // 
-            this.ioIndicatorCtrl19.Desc = "IN 7";
-            this.ioIndicatorCtrl19.IsOn = null;
-            this.ioIndicatorCtrl19.Location = new System.Drawing.Point(306, 48);
-            this.ioIndicatorCtrl19.Name = "ioIndicatorCtrl19";
-            this.ioIndicatorCtrl19.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl19.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl23
-            // 
-            this.ioIndicatorCtrl23.Desc = "IN 12";
-            this.ioIndicatorCtrl23.IsOn = null;
-            this.ioIndicatorCtrl23.Location = new System.Drawing.Point(477, 77);
-            this.ioIndicatorCtrl23.Name = "ioIndicatorCtrl23";
-            this.ioIndicatorCtrl23.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl23.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl22
-            // 
-            this.ioIndicatorCtrl22.Desc = "IN 11";
-            this.ioIndicatorCtrl22.IsOn = null;
-            this.ioIndicatorCtrl22.Location = new System.Drawing.Point(306, 77);
-            this.ioIndicatorCtrl22.Name = "ioIndicatorCtrl22";
-            this.ioIndicatorCtrl22.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl22.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl21
-            // 
-            this.ioIndicatorCtrl21.Desc = "IN 10";
-            this.ioIndicatorCtrl21.IsOn = null;
-            this.ioIndicatorCtrl21.Location = new System.Drawing.Point(145, 77);
-            this.ioIndicatorCtrl21.Name = "ioIndicatorCtrl21";
-            this.ioIndicatorCtrl21.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl21.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl18
-            // 
-            this.ioIndicatorCtrl18.Desc = "IN 6";
-            this.ioIndicatorCtrl18.IsOn = null;
-            this.ioIndicatorCtrl18.Location = new System.Drawing.Point(145, 48);
-            this.ioIndicatorCtrl18.Name = "ioIndicatorCtrl18";
-            this.ioIndicatorCtrl18.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl18.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl15
-            // 
-            this.ioIndicatorCtrl15.Desc = "IN 5";
-            this.ioIndicatorCtrl15.IsOn = null;
-            this.ioIndicatorCtrl15.Location = new System.Drawing.Point(9, 48);
-            this.ioIndicatorCtrl15.Name = "ioIndicatorCtrl15";
-            this.ioIndicatorCtrl15.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl15.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl11
-            // 
-            this.ioIndicatorCtrl11.Desc = "IN 1";
-            this.ioIndicatorCtrl11.IsOn = null;
-            this.ioIndicatorCtrl11.Location = new System.Drawing.Point(9, 18);
-            this.ioIndicatorCtrl11.Name = "ioIndicatorCtrl11";
-            this.ioIndicatorCtrl11.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl11.TabIndex = 4;
-            // 
-            // groupBox6
-            // 
-            this.groupBox6.Controls.Add(this.ioIndicatorCtrl27);
-            this.groupBox6.Controls.Add(this.ioIndicatorCtrl28);
-            this.groupBox6.Controls.Add(this.ioIndicatorCtrl29);
-            this.groupBox6.Controls.Add(this.ioIndicatorCtrl30);
-            this.groupBox6.Controls.Add(this.ioIndicatorCtrl31);
-            this.groupBox6.Controls.Add(this.ioIndicatorCtrl32);
-            this.groupBox6.Controls.Add(this.ioIndicatorCtrl33);
-            this.groupBox6.Controls.Add(this.ioIndicatorCtrl34);
-            this.groupBox6.Controls.Add(this.ioIndicatorCtrl35);
-            this.groupBox6.Controls.Add(this.ioIndicatorCtrl36);
-            this.groupBox6.Controls.Add(this.ioIndicatorCtrl37);
-            this.groupBox6.Controls.Add(this.ioIndicatorCtrl38);
-            this.groupBox6.Controls.Add(this.ioIndicatorCtrl39);
-            this.groupBox6.Controls.Add(this.ioIndicatorCtrl40);
-            this.groupBox6.Controls.Add(this.ioIndicatorCtrl41);
-            this.groupBox6.Controls.Add(this.ioIndicatorCtrl42);
-            this.groupBox6.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.groupBox6.Location = new System.Drawing.Point(3, 573);
-            this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Size = new System.Drawing.Size(578, 138);
-            this.groupBox6.TabIndex = 7;
-            this.groupBox6.TabStop = false;
-            this.groupBox6.Text = "鏁板瓧閲忚緭鍑�";
-            // 
-            // ioIndicatorCtrl27
-            // 
-            this.ioIndicatorCtrl27.Desc = "OUT 4";
-            this.ioIndicatorCtrl27.IsOn = null;
-            this.ioIndicatorCtrl27.Location = new System.Drawing.Point(477, 18);
-            this.ioIndicatorCtrl27.Name = "ioIndicatorCtrl27";
-            this.ioIndicatorCtrl27.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl27.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl28
-            // 
-            this.ioIndicatorCtrl28.Desc = "OUT 3";
-            this.ioIndicatorCtrl28.IsOn = null;
-            this.ioIndicatorCtrl28.Location = new System.Drawing.Point(306, 18);
-            this.ioIndicatorCtrl28.Name = "ioIndicatorCtrl28";
-            this.ioIndicatorCtrl28.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl28.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl29
-            // 
-            this.ioIndicatorCtrl29.Desc = "OUT 2";
-            this.ioIndicatorCtrl29.IsOn = null;
-            this.ioIndicatorCtrl29.Location = new System.Drawing.Point(145, 18);
-            this.ioIndicatorCtrl29.Name = "ioIndicatorCtrl29";
-            this.ioIndicatorCtrl29.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl29.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl30
-            // 
-            this.ioIndicatorCtrl30.Desc = "OUT 16";
-            this.ioIndicatorCtrl30.IsOn = null;
-            this.ioIndicatorCtrl30.Location = new System.Drawing.Point(477, 107);
-            this.ioIndicatorCtrl30.Name = "ioIndicatorCtrl30";
-            this.ioIndicatorCtrl30.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl30.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl31
-            // 
-            this.ioIndicatorCtrl31.Desc = "OUT 15";
-            this.ioIndicatorCtrl31.IsOn = null;
-            this.ioIndicatorCtrl31.Location = new System.Drawing.Point(306, 107);
-            this.ioIndicatorCtrl31.Name = "ioIndicatorCtrl31";
-            this.ioIndicatorCtrl31.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl31.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl32
-            // 
-            this.ioIndicatorCtrl32.Desc = "OUT 14";
-            this.ioIndicatorCtrl32.IsOn = null;
-            this.ioIndicatorCtrl32.Location = new System.Drawing.Point(145, 107);
-            this.ioIndicatorCtrl32.Name = "ioIndicatorCtrl32";
-            this.ioIndicatorCtrl32.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl32.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl33
-            // 
-            this.ioIndicatorCtrl33.Desc = "OUT 13";
-            this.ioIndicatorCtrl33.IsOn = null;
-            this.ioIndicatorCtrl33.Location = new System.Drawing.Point(9, 106);
-            this.ioIndicatorCtrl33.Name = "ioIndicatorCtrl33";
-            this.ioIndicatorCtrl33.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl33.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl34
-            // 
-            this.ioIndicatorCtrl34.Desc = "OUT 9";
-            this.ioIndicatorCtrl34.IsOn = null;
-            this.ioIndicatorCtrl34.Location = new System.Drawing.Point(9, 77);
-            this.ioIndicatorCtrl34.Name = "ioIndicatorCtrl34";
-            this.ioIndicatorCtrl34.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl34.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl35
-            // 
-            this.ioIndicatorCtrl35.Desc = "OUT 8";
-            this.ioIndicatorCtrl35.IsOn = null;
-            this.ioIndicatorCtrl35.Location = new System.Drawing.Point(477, 48);
-            this.ioIndicatorCtrl35.Name = "ioIndicatorCtrl35";
-            this.ioIndicatorCtrl35.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl35.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl36
-            // 
-            this.ioIndicatorCtrl36.Desc = "OUT 7";
-            this.ioIndicatorCtrl36.IsOn = null;
-            this.ioIndicatorCtrl36.Location = new System.Drawing.Point(306, 48);
-            this.ioIndicatorCtrl36.Name = "ioIndicatorCtrl36";
-            this.ioIndicatorCtrl36.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl36.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl37
-            // 
-            this.ioIndicatorCtrl37.Desc = "OUT 12";
-            this.ioIndicatorCtrl37.IsOn = null;
-            this.ioIndicatorCtrl37.Location = new System.Drawing.Point(477, 77);
-            this.ioIndicatorCtrl37.Name = "ioIndicatorCtrl37";
-            this.ioIndicatorCtrl37.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl37.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl38
-            // 
-            this.ioIndicatorCtrl38.Desc = "OUT 11";
-            this.ioIndicatorCtrl38.IsOn = null;
-            this.ioIndicatorCtrl38.Location = new System.Drawing.Point(306, 77);
-            this.ioIndicatorCtrl38.Name = "ioIndicatorCtrl38";
-            this.ioIndicatorCtrl38.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl38.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl39
-            // 
-            this.ioIndicatorCtrl39.Desc = "OUT 10";
-            this.ioIndicatorCtrl39.IsOn = null;
-            this.ioIndicatorCtrl39.Location = new System.Drawing.Point(145, 77);
-            this.ioIndicatorCtrl39.Name = "ioIndicatorCtrl39";
-            this.ioIndicatorCtrl39.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl39.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl40
-            // 
-            this.ioIndicatorCtrl40.Desc = "OUT 6";
-            this.ioIndicatorCtrl40.IsOn = null;
-            this.ioIndicatorCtrl40.Location = new System.Drawing.Point(145, 48);
-            this.ioIndicatorCtrl40.Name = "ioIndicatorCtrl40";
-            this.ioIndicatorCtrl40.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl40.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl41
-            // 
-            this.ioIndicatorCtrl41.Desc = "OUT 5";
-            this.ioIndicatorCtrl41.IsOn = null;
-            this.ioIndicatorCtrl41.Location = new System.Drawing.Point(9, 48);
-            this.ioIndicatorCtrl41.Name = "ioIndicatorCtrl41";
-            this.ioIndicatorCtrl41.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl41.TabIndex = 4;
-            // 
-            // ioIndicatorCtrl42
-            // 
-            this.ioIndicatorCtrl42.Desc = "OUT 1";
-            this.ioIndicatorCtrl42.IsOn = null;
-            this.ioIndicatorCtrl42.Location = new System.Drawing.Point(9, 18);
-            this.ioIndicatorCtrl42.Name = "ioIndicatorCtrl42";
-            this.ioIndicatorCtrl42.Size = new System.Drawing.Size(90, 24);
-            this.ioIndicatorCtrl42.TabIndex = 4;
-            // 
-            // flowLayoutPanelRunStatus
-            // 
-            this.flowLayoutPanelRunStatus.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.flowLayoutPanelRunStatus.Location = new System.Drawing.Point(3, 3);
-            this.flowLayoutPanelRunStatus.Name = "flowLayoutPanelRunStatus";
-            this.flowLayoutPanelRunStatus.Size = new System.Drawing.Size(578, 422);
-            this.flowLayoutPanelRunStatus.TabIndex = 8;
-            // 
-            // CtrlMotionCardOperation
+            // CtrlMotionCardOperationBase
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.tableLayoutPanel1);
-            this.Name = "CtrlMotionCardOperation";
+            this.Name = "CtrlMotionCardOperationBase";
             this.Size = new System.Drawing.Size(982, 720);
             this.tableLayoutPanel1.ResumeLayout(false);
             this.tableLayoutPanel2.ResumeLayout(false);
-            this.groupBox2.ResumeLayout(false);
             this.groupBoxPara.ResumeLayout(false);
             this.groupBoxMoveModel.ResumeLayout(false);
             this.groupBoxMoveModel.PerformLayout();
             this.groupBoxCommBtn.ResumeLayout(false);
             this.groupBoxCommBtn.PerformLayout();
-            this.tableLayoutPanel3.ResumeLayout(false);
-            this.groupBox5.ResumeLayout(false);
-            this.groupBox6.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -700,48 +281,11 @@
         private System.Windows.Forms.Button buttonServoEnable;
         private System.Windows.Forms.Button buttonSmoothStop;
         private System.Windows.Forms.Button buttonPositionReset;
-        private System.Windows.Forms.GroupBox groupBox2;
-        private System.Windows.Forms.ListBox listBoxMsg;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
-        private System.Windows.Forms.GroupBox groupBox5;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl14;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl13;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl12;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl26;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl25;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl24;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl17;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl16;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl20;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl19;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl23;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl22;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl21;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl18;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl15;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl11;
-        private System.Windows.Forms.GroupBox groupBox6;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl27;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl28;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl29;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl30;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl31;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl32;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl33;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl34;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl35;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl36;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl37;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl38;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl39;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl40;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl41;
-        private Model.Winform.IOIndicatorCtrl ioIndicatorCtrl42;
         private System.Windows.Forms.RadioButton radioGoHome;
         private System.Windows.Forms.RadioButton radioJog;
         private System.Windows.Forms.RadioButton radioP2P;
         private System.Windows.Forms.PropertyGrid propGrid;
         private System.Windows.Forms.Button btnStart;
-        private System.Windows.Forms.FlowLayoutPanel flowLayoutPanelRunStatus;
     }
 }

--
Gitblit v1.8.0