diff --git a/Cs_HMI/TestProject/Test_ACS/MainForm.Designer.cs b/Cs_HMI/TestProject/Test_ACS/MainForm.Designer.cs index 10095fa..25ae884 100644 --- a/Cs_HMI/TestProject/Test_ACS/MainForm.Designer.cs +++ b/Cs_HMI/TestProject/Test_ACS/MainForm.Designer.cs @@ -29,17 +29,9 @@ namespace Test_ACS this.rbAGV2 = new System.Windows.Forms.RadioButton(); this.rbAGV1 = new System.Windows.Forms.RadioButton(); this.grpCommands = new System.Windows.Forms.GroupBox(); - this.grpLift = new System.Windows.Forms.GroupBox(); - this.btnLiftStop = new System.Windows.Forms.Button(); - this.btnLiftDown = new System.Windows.Forms.Button(); - this.btnLiftUp = new System.Windows.Forms.Button(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.btAMove = new System.Windows.Forms.Button(); this.grpManual = new System.Windows.Forms.GroupBox(); - this.btMMove = new System.Windows.Forms.Button(); - this.numRuntime = new System.Windows.Forms.NumericUpDown(); - this.lblRuntime = new System.Windows.Forms.Label(); - this.cmbSpeed = new System.Windows.Forms.ComboBox(); - this.lblSpeed = new System.Windows.Forms.Label(); - this.cmbDirection = new System.Windows.Forms.ComboBox(); this.chkMarkStop = new System.Windows.Forms.CheckBox(); this.btnMarkStop = new System.Windows.Forms.Button(); this.btnReset = new System.Windows.Forms.Button(); @@ -51,6 +43,10 @@ namespace Test_ACS this.lblAlias = new System.Windows.Forms.Label(); this.txtRFID = new System.Windows.Forms.NumericUpDown(); this.lblRFID = new System.Windows.Forms.Label(); + this.grpLift = new System.Windows.Forms.GroupBox(); + this.btnLiftStop = new System.Windows.Forms.Button(); + this.btnLiftDown = new System.Windows.Forms.Button(); + this.btnLiftUp = new System.Windows.Forms.Button(); this.lblDirection = new System.Windows.Forms.Label(); this.grpLogs = new System.Windows.Forms.GroupBox(); this.tabLogs = new System.Windows.Forms.TabControl(); @@ -80,21 +76,29 @@ namespace Test_ACS this.lblRunSt = new System.Windows.Forms.Label(); this.lblModeValue = new System.Windows.Forms.Label(); this.lblMode = new System.Windows.Forms.Label(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.btAMove = new System.Windows.Forms.Button(); - this.cmbAutoSpeed = new System.Windows.Forms.ComboBox(); - this.label4 = new System.Windows.Forms.Label(); - this.cmbMotDirection = new System.Windows.Forms.ComboBox(); - this.label5 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.cmbMagDirection = new System.Windows.Forms.ComboBox(); + this.radSpdL = new System.Windows.Forms.RadioButton(); + this.radSpdM = new System.Windows.Forms.RadioButton(); + this.radSpdH = new System.Windows.Forms.RadioButton(); + this.button1 = new System.Windows.Forms.Button(); + this.button2 = new System.Windows.Forms.Button(); + this.button3 = new System.Windows.Forms.Button(); + this.button4 = new System.Windows.Forms.Button(); + this.button5 = new System.Windows.Forms.Button(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.radBack = new System.Windows.Forms.RadioButton(); + this.radForw = new System.Windows.Forms.RadioButton(); + this.panel2 = new System.Windows.Forms.Panel(); + this.radLeft = new System.Windows.Forms.RadioButton(); + this.radStraight = new System.Windows.Forms.RadioButton(); + this.radRight = new System.Windows.Forms.RadioButton(); this.grpConnection.SuspendLayout(); this.grpAGV.SuspendLayout(); this.grpCommands.SuspendLayout(); - this.grpLift.SuspendLayout(); + this.groupBox1.SuspendLayout(); this.grpManual.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numRuntime)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtRFID)).BeginInit(); + this.grpLift.SuspendLayout(); this.grpLogs.SuspendLayout(); this.tabLogs.SuspendLayout(); this.tabRX.SuspendLayout(); @@ -102,7 +106,9 @@ namespace Test_ACS this.tabInfo.SuspendLayout(); this.tabPage1.SuspendLayout(); this.grpAGVStatus.SuspendLayout(); - this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.panel1.SuspendLayout(); + this.panel2.SuspendLayout(); this.SuspendLayout(); // // grpConnection @@ -215,6 +221,7 @@ namespace Test_ACS // // grpCommands // + this.grpCommands.Controls.Add(this.groupBox2); this.grpCommands.Controls.Add(this.groupBox1); this.grpCommands.Controls.Add(this.grpManual); this.grpCommands.Controls.Add(this.chkMarkStop); @@ -235,6 +242,161 @@ namespace Test_ACS this.grpCommands.TabStop = false; this.grpCommands.Text = "ACS 명령"; // + // groupBox1 + // + this.groupBox1.Controls.Add(this.panel2); + this.groupBox1.Controls.Add(this.panel1); + this.groupBox1.Controls.Add(this.btAMove); + this.groupBox1.Location = new System.Drawing.Point(201, 153); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(244, 106); + this.groupBox1.TabIndex = 8; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "자동 이동"; + // + // btAMove + // + this.btAMove.Location = new System.Drawing.Point(155, 16); + this.btAMove.Name = "btAMove"; + this.btAMove.Size = new System.Drawing.Size(81, 76); + this.btAMove.TabIndex = 6; + this.btAMove.Text = "실행"; + this.btAMove.UseVisualStyleBackColor = true; + this.btAMove.Click += new System.EventHandler(this.btAMove_Click); + // + // grpManual + // + this.grpManual.Controls.Add(this.button5); + this.grpManual.Controls.Add(this.button4); + this.grpManual.Controls.Add(this.button3); + this.grpManual.Controls.Add(this.button2); + this.grpManual.Controls.Add(this.button1); + this.grpManual.Location = new System.Drawing.Point(15, 153); + this.grpManual.Name = "grpManual"; + this.grpManual.Size = new System.Drawing.Size(125, 106); + this.grpManual.TabIndex = 8; + this.grpManual.TabStop = false; + this.grpManual.Text = "수동 이동"; + // + // chkMarkStop + // + this.chkMarkStop.AutoSize = true; + this.chkMarkStop.Location = new System.Drawing.Point(193, 125); + this.chkMarkStop.Name = "chkMarkStop"; + this.chkMarkStop.Size = new System.Drawing.Size(76, 16); + this.chkMarkStop.TabIndex = 7; + this.chkMarkStop.Text = "정지 설정"; + this.chkMarkStop.UseVisualStyleBackColor = true; + // + // btnMarkStop + // + this.btnMarkStop.Location = new System.Drawing.Point(10, 117); + this.btnMarkStop.Name = "btnMarkStop"; + this.btnMarkStop.Size = new System.Drawing.Size(177, 30); + this.btnMarkStop.TabIndex = 6; + this.btnMarkStop.Text = "마크센서 정지"; + this.btnMarkStop.UseVisualStyleBackColor = true; + this.btnMarkStop.Click += new System.EventHandler(this.btnMarkStop_Click); + // + // btnReset + // + this.btnReset.Location = new System.Drawing.Point(193, 81); + this.btnReset.Name = "btnReset"; + this.btnReset.Size = new System.Drawing.Size(228, 30); + this.btnReset.TabIndex = 5; + this.btnReset.Text = "에러 리셋"; + this.btnReset.UseVisualStyleBackColor = true; + this.btnReset.Click += new System.EventHandler(this.btnReset_Click); + // + // btnStop + // + this.btnStop.Location = new System.Drawing.Point(10, 81); + this.btnStop.Name = "btnStop"; + this.btnStop.Size = new System.Drawing.Size(177, 30); + this.btnStop.TabIndex = 4; + this.btnStop.Text = "정지"; + this.btnStop.UseVisualStyleBackColor = true; + this.btnStop.Click += new System.EventHandler(this.btnStop_Click); + // + // btnGotoAlias + // + this.btnGotoAlias.Location = new System.Drawing.Point(193, 47); + this.btnGotoAlias.Name = "btnGotoAlias"; + this.btnGotoAlias.Size = new System.Drawing.Size(228, 30); + this.btnGotoAlias.TabIndex = 11; + this.btnGotoAlias.Text = "별칭 이동 (GotoAlias)"; + this.btnGotoAlias.UseVisualStyleBackColor = true; + this.btnGotoAlias.Click += new System.EventHandler(this.btnGotoAlias_Click); + // + // btnGoto + // + this.btnGoto.Location = new System.Drawing.Point(193, 15); + this.btnGoto.Name = "btnGoto"; + this.btnGoto.Size = new System.Drawing.Size(154, 30); + this.btnGoto.TabIndex = 3; + this.btnGoto.Text = "RFID 이동 (Goto)"; + this.btnGoto.UseVisualStyleBackColor = true; + this.btnGoto.Click += new System.EventHandler(this.btnGoto_Click); + // + // btnSetCurrent + // + this.btnSetCurrent.Location = new System.Drawing.Point(351, 15); + this.btnSetCurrent.Name = "btnSetCurrent"; + this.btnSetCurrent.Size = new System.Drawing.Size(70, 30); + this.btnSetCurrent.TabIndex = 2; + this.btnSetCurrent.Text = "위치설정"; + this.btnSetCurrent.UseVisualStyleBackColor = true; + this.btnSetCurrent.Click += new System.EventHandler(this.btnSetCurrent_Click); + // + // txtAlias + // + this.txtAlias.Font = new System.Drawing.Font("Consolas", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txtAlias.Location = new System.Drawing.Point(86, 49); + this.txtAlias.Name = "txtAlias"; + this.txtAlias.Size = new System.Drawing.Size(101, 26); + this.txtAlias.TabIndex = 10; + this.txtAlias.Text = "CHARGER1"; + this.txtAlias.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.txtAlias.TextChanged += new System.EventHandler(this.txtAlias_TextChanged); + // + // lblAlias + // + this.lblAlias.AutoSize = true; + this.lblAlias.Location = new System.Drawing.Point(8, 56); + this.lblAlias.Name = "lblAlias"; + this.lblAlias.Size = new System.Drawing.Size(71, 12); + this.lblAlias.TabIndex = 9; + this.lblAlias.Text = "별칭(Alias):"; + // + // txtRFID + // + this.txtRFID.Font = new System.Drawing.Font("Consolas", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txtRFID.Location = new System.Drawing.Point(86, 17); + this.txtRFID.Maximum = new decimal(new int[] { + 999999, + 0, + 0, + 0}); + this.txtRFID.Name = "txtRFID"; + this.txtRFID.Size = new System.Drawing.Size(101, 26); + this.txtRFID.TabIndex = 1; + this.txtRFID.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.txtRFID.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.txtRFID.TextChanged += new System.EventHandler(this.txtRFID_TextChanged); + // + // lblRFID + // + this.lblRFID.AutoSize = true; + this.lblRFID.Location = new System.Drawing.Point(16, 24); + this.lblRFID.Name = "lblRFID"; + this.lblRFID.Size = new System.Drawing.Size(63, 12); + this.lblRFID.TabIndex = 0; + this.lblRFID.Text = "RFID 번호:"; + // // grpLift // this.grpLift.Controls.Add(this.btnLiftStop); @@ -277,213 +439,6 @@ namespace Test_ACS this.btnLiftUp.UseVisualStyleBackColor = true; this.btnLiftUp.Click += new System.EventHandler(this.btnLiftUp_Click); // - // grpManual - // - this.grpManual.Controls.Add(this.btMMove); - this.grpManual.Controls.Add(this.numRuntime); - this.grpManual.Controls.Add(this.lblRuntime); - this.grpManual.Controls.Add(this.cmbSpeed); - this.grpManual.Controls.Add(this.lblSpeed); - this.grpManual.Controls.Add(this.cmbDirection); - this.grpManual.Location = new System.Drawing.Point(15, 202); - this.grpManual.Name = "grpManual"; - this.grpManual.Size = new System.Drawing.Size(215, 100); - this.grpManual.TabIndex = 8; - this.grpManual.TabStop = false; - this.grpManual.Text = "수동 이동"; - // - // btMMove - // - this.btMMove.Location = new System.Drawing.Point(136, 16); - this.btMMove.Name = "btMMove"; - this.btMMove.Size = new System.Drawing.Size(73, 74); - this.btMMove.TabIndex = 6; - this.btMMove.Text = "실행"; - this.btMMove.UseVisualStyleBackColor = true; - this.btMMove.Click += new System.EventHandler(this.btnManual_Click); - // - // numRuntime - // - this.numRuntime.Location = new System.Drawing.Point(60, 66); - this.numRuntime.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.numRuntime.Name = "numRuntime"; - this.numRuntime.Size = new System.Drawing.Size(70, 21); - this.numRuntime.TabIndex = 5; - this.numRuntime.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.numRuntime.Value = new decimal(new int[] { - 5, - 0, - 0, - 0}); - // - // lblRuntime - // - this.lblRuntime.AutoSize = true; - this.lblRuntime.Location = new System.Drawing.Point(3, 70); - this.lblRuntime.Name = "lblRuntime"; - this.lblRuntime.Size = new System.Drawing.Size(51, 12); - this.lblRuntime.TabIndex = 4; - this.lblRuntime.Text = "시간(초)"; - // - // cmbSpeed - // - this.cmbSpeed.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbSpeed.FormattingEnabled = true; - this.cmbSpeed.Items.AddRange(new object[] { - "느림", - "보통", - "빠름"}); - this.cmbSpeed.Location = new System.Drawing.Point(60, 41); - this.cmbSpeed.Name = "cmbSpeed"; - this.cmbSpeed.Size = new System.Drawing.Size(70, 20); - this.cmbSpeed.TabIndex = 3; - // - // lblSpeed - // - this.lblSpeed.AutoSize = true; - this.lblSpeed.Location = new System.Drawing.Point(14, 45); - this.lblSpeed.Name = "lblSpeed"; - this.lblSpeed.Size = new System.Drawing.Size(29, 12); - this.lblSpeed.TabIndex = 2; - this.lblSpeed.Text = "속도"; - // - // cmbDirection - // - this.cmbDirection.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbDirection.FormattingEnabled = true; - this.cmbDirection.Items.AddRange(new object[] { - "후진", - "전진", - "좌", - "우"}); - this.cmbDirection.Location = new System.Drawing.Point(60, 16); - this.cmbDirection.Name = "cmbDirection"; - this.cmbDirection.Size = new System.Drawing.Size(70, 20); - this.cmbDirection.TabIndex = 1; - // - // chkMarkStop - // - this.chkMarkStop.AutoSize = true; - this.chkMarkStop.Location = new System.Drawing.Point(240, 174); - this.chkMarkStop.Name = "chkMarkStop"; - this.chkMarkStop.Size = new System.Drawing.Size(76, 16); - this.chkMarkStop.TabIndex = 7; - this.chkMarkStop.Text = "정지 설정"; - this.chkMarkStop.UseVisualStyleBackColor = true; - // - // btnMarkStop - // - this.btnMarkStop.Location = new System.Drawing.Point(15, 167); - this.btnMarkStop.Name = "btnMarkStop"; - this.btnMarkStop.Size = new System.Drawing.Size(215, 30); - this.btnMarkStop.TabIndex = 6; - this.btnMarkStop.Text = "마크센서 정지"; - this.btnMarkStop.UseVisualStyleBackColor = true; - this.btnMarkStop.Click += new System.EventHandler(this.btnMarkStop_Click); - // - // btnReset - // - this.btnReset.Location = new System.Drawing.Point(240, 132); - this.btnReset.Name = "btnReset"; - this.btnReset.Size = new System.Drawing.Size(210, 30); - this.btnReset.TabIndex = 5; - this.btnReset.Text = "에러 리셋"; - this.btnReset.UseVisualStyleBackColor = true; - this.btnReset.Click += new System.EventHandler(this.btnReset_Click); - // - // btnStop - // - this.btnStop.Location = new System.Drawing.Point(15, 132); - this.btnStop.Name = "btnStop"; - this.btnStop.Size = new System.Drawing.Size(215, 30); - this.btnStop.TabIndex = 4; - this.btnStop.Text = "정지"; - this.btnStop.UseVisualStyleBackColor = true; - this.btnStop.Click += new System.EventHandler(this.btnStop_Click); - // - // btnGotoAlias - // - this.btnGotoAlias.Location = new System.Drawing.Point(286, 94); - this.btnGotoAlias.Name = "btnGotoAlias"; - this.btnGotoAlias.Size = new System.Drawing.Size(174, 30); - this.btnGotoAlias.TabIndex = 11; - this.btnGotoAlias.Text = "별칭 이동 (GotoAlias)"; - this.btnGotoAlias.UseVisualStyleBackColor = true; - this.btnGotoAlias.Click += new System.EventHandler(this.btnGotoAlias_Click); - // - // btnGoto - // - this.btnGoto.Location = new System.Drawing.Point(286, 23); - this.btnGoto.Name = "btnGoto"; - this.btnGoto.Size = new System.Drawing.Size(174, 30); - this.btnGoto.TabIndex = 3; - this.btnGoto.Text = "RFID 이동 (Goto)"; - this.btnGoto.UseVisualStyleBackColor = true; - this.btnGoto.Click += new System.EventHandler(this.btnGoto_Click); - // - // btnSetCurrent - // - this.btnSetCurrent.Location = new System.Drawing.Point(85, 57); - this.btnSetCurrent.Name = "btnSetCurrent"; - this.btnSetCurrent.Size = new System.Drawing.Size(195, 30); - this.btnSetCurrent.TabIndex = 2; - this.btnSetCurrent.Text = "현재 위치 설정 (SetCurrent)"; - this.btnSetCurrent.UseVisualStyleBackColor = true; - this.btnSetCurrent.Click += new System.EventHandler(this.btnSetCurrent_Click); - // - // txtAlias - // - this.txtAlias.Font = new System.Drawing.Font("Consolas", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtAlias.Location = new System.Drawing.Point(85, 96); - this.txtAlias.Name = "txtAlias"; - this.txtAlias.Size = new System.Drawing.Size(195, 26); - this.txtAlias.TabIndex = 10; - this.txtAlias.Text = "CHARGER1"; - this.txtAlias.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.txtAlias.TextChanged += new System.EventHandler(this.txtAlias_TextChanged); - // - // lblAlias - // - this.lblAlias.AutoSize = true; - this.lblAlias.Location = new System.Drawing.Point(15, 103); - this.lblAlias.Name = "lblAlias"; - this.lblAlias.Size = new System.Drawing.Size(71, 12); - this.lblAlias.TabIndex = 9; - this.lblAlias.Text = "별칭(Alias):"; - // - // txtRFID - // - this.txtRFID.Font = new System.Drawing.Font("Consolas", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtRFID.Location = new System.Drawing.Point(85, 25); - this.txtRFID.Maximum = new decimal(new int[] { - 999999, - 0, - 0, - 0}); - this.txtRFID.Name = "txtRFID"; - this.txtRFID.Size = new System.Drawing.Size(195, 26); - this.txtRFID.TabIndex = 1; - this.txtRFID.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.txtRFID.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.txtRFID.TextChanged += new System.EventHandler(this.txtRFID_TextChanged); - // - // lblRFID - // - this.lblRFID.AutoSize = true; - this.lblRFID.Location = new System.Drawing.Point(15, 32); - this.lblRFID.Name = "lblRFID"; - this.lblRFID.Size = new System.Drawing.Size(63, 12); - this.lblRFID.TabIndex = 0; - this.lblRFID.Text = "RFID 번호:"; - // // lblDirection // this.lblDirection.AutoSize = true; @@ -802,102 +757,189 @@ namespace Test_ACS this.lblMode.TabIndex = 0; this.lblMode.Text = "모드:"; // - // groupBox1 + // radSpdL // - this.groupBox1.Controls.Add(this.label3); - this.groupBox1.Controls.Add(this.cmbMagDirection); - this.groupBox1.Controls.Add(this.label5); - this.groupBox1.Controls.Add(this.btAMove); - this.groupBox1.Controls.Add(this.cmbAutoSpeed); - this.groupBox1.Controls.Add(this.label4); - this.groupBox1.Controls.Add(this.cmbMotDirection); - this.groupBox1.Location = new System.Drawing.Point(240, 202); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(215, 100); - this.groupBox1.TabIndex = 8; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "자동 이동"; + this.radSpdL.AutoSize = true; + this.radSpdL.Location = new System.Drawing.Point(9, 20); + this.radSpdL.Name = "radSpdL"; + this.radSpdL.Size = new System.Drawing.Size(30, 16); + this.radSpdL.TabIndex = 7; + this.radSpdL.TabStop = true; + this.radSpdL.Tag = "0"; + this.radSpdL.Text = "L"; + this.radSpdL.UseVisualStyleBackColor = true; // - // btAMove + // radSpdM // - this.btAMove.Location = new System.Drawing.Point(128, 16); - this.btAMove.Name = "btAMove"; - this.btAMove.Size = new System.Drawing.Size(81, 74); - this.btAMove.TabIndex = 6; - this.btAMove.Text = "이동"; - this.btAMove.UseVisualStyleBackColor = true; - this.btAMove.Click += new System.EventHandler(this.btAMove_Click); + this.radSpdM.AutoSize = true; + this.radSpdM.Location = new System.Drawing.Point(9, 47); + this.radSpdM.Name = "radSpdM"; + this.radSpdM.Size = new System.Drawing.Size(34, 16); + this.radSpdM.TabIndex = 7; + this.radSpdM.TabStop = true; + this.radSpdM.Tag = "1"; + this.radSpdM.Text = "M"; + this.radSpdM.UseVisualStyleBackColor = true; // - // cmbAutoSpeed + // radSpdH // - this.cmbAutoSpeed.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbAutoSpeed.FormattingEnabled = true; - this.cmbAutoSpeed.Items.AddRange(new object[] { - "느림", - "보통", - "빠름"}); - this.cmbAutoSpeed.Location = new System.Drawing.Point(52, 69); - this.cmbAutoSpeed.Name = "cmbAutoSpeed"; - this.cmbAutoSpeed.Size = new System.Drawing.Size(70, 20); - this.cmbAutoSpeed.TabIndex = 3; + this.radSpdH.AutoSize = true; + this.radSpdH.Location = new System.Drawing.Point(9, 74); + this.radSpdH.Name = "radSpdH"; + this.radSpdH.Size = new System.Drawing.Size(31, 16); + this.radSpdH.TabIndex = 7; + this.radSpdH.TabStop = true; + this.radSpdH.Tag = "2"; + this.radSpdH.Text = "H"; + this.radSpdH.UseVisualStyleBackColor = true; // - // label4 + // button1 // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(14, 73); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(29, 12); - this.label4.TabIndex = 2; - this.label4.Text = "속도"; + this.button1.Location = new System.Drawing.Point(43, 14); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(34, 27); + this.button1.TabIndex = 8; + this.button1.Tag = "0"; + this.button1.Text = "B"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.btnManual_Click); // - // cmbMotDirection + // button2 // - this.cmbMotDirection.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbMotDirection.FormattingEnabled = true; - this.cmbMotDirection.Items.AddRange(new object[] { - "후진", - "전진"}); - this.cmbMotDirection.Location = new System.Drawing.Point(52, 16); - this.cmbMotDirection.Name = "cmbMotDirection"; - this.cmbMotDirection.Size = new System.Drawing.Size(70, 20); - this.cmbMotDirection.TabIndex = 1; + this.button2.Location = new System.Drawing.Point(43, 44); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(34, 27); + this.button2.TabIndex = 9; + this.button2.Tag = "S"; + this.button2.Text = "S"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); // - // label5 + // button3 // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(13, 21); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(29, 12); - this.label5.TabIndex = 7; - this.label5.Text = "모터"; + this.button3.Location = new System.Drawing.Point(8, 44); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(34, 27); + this.button3.TabIndex = 10; + this.button3.Tag = "2"; + this.button3.Text = "L"; + this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.btnManual_Click); // - // label3 + // button4 // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(13, 47); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(29, 12); - this.label3.TabIndex = 9; - this.label3.Text = "방향"; + this.button4.Location = new System.Drawing.Point(81, 44); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(34, 27); + this.button4.TabIndex = 11; + this.button4.Tag = "3"; + this.button4.Text = "R"; + this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.btnManual_Click); // - // cmbMagDirection + // button5 // - this.cmbMagDirection.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbMagDirection.FormattingEnabled = true; - this.cmbMagDirection.Items.AddRange(new object[] { - "직진", - "좌", - "우"}); - this.cmbMagDirection.Location = new System.Drawing.Point(52, 42); - this.cmbMagDirection.Name = "cmbMagDirection"; - this.cmbMagDirection.Size = new System.Drawing.Size(70, 20); - this.cmbMagDirection.TabIndex = 8; + this.button5.Location = new System.Drawing.Point(43, 72); + this.button5.Name = "button5"; + this.button5.Size = new System.Drawing.Size(34, 27); + this.button5.TabIndex = 12; + this.button5.Tag = "1"; + this.button5.Text = "F"; + this.button5.UseVisualStyleBackColor = true; + this.button5.Click += new System.EventHandler(this.btnManual_Click); + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.radSpdL); + this.groupBox2.Controls.Add(this.radSpdM); + this.groupBox2.Controls.Add(this.radSpdH); + this.groupBox2.Location = new System.Drawing.Point(146, 153); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(49, 106); + this.groupBox2.TabIndex = 12; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "속도"; + this.groupBox2.Enter += new System.EventHandler(this.groupBox2_Enter); + // + // panel1 + // + this.panel1.Controls.Add(this.radForw); + this.panel1.Controls.Add(this.radBack); + this.panel1.Location = new System.Drawing.Point(10, 20); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(139, 33); + this.panel1.TabIndex = 10; + // + // radBack + // + this.radBack.AutoSize = true; + this.radBack.Location = new System.Drawing.Point(12, 9); + this.radBack.Name = "radBack"; + this.radBack.Size = new System.Drawing.Size(31, 16); + this.radBack.TabIndex = 0; + this.radBack.TabStop = true; + this.radBack.Text = "B"; + this.radBack.UseVisualStyleBackColor = true; + // + // radForw + // + this.radForw.AutoSize = true; + this.radForw.Location = new System.Drawing.Point(51, 9); + this.radForw.Name = "radForw"; + this.radForw.Size = new System.Drawing.Size(30, 16); + this.radForw.TabIndex = 0; + this.radForw.TabStop = true; + this.radForw.Text = "F"; + this.radForw.UseVisualStyleBackColor = true; + // + // panel2 + // + this.panel2.Controls.Add(this.radRight); + this.panel2.Controls.Add(this.radLeft); + this.panel2.Controls.Add(this.radStraight); + this.panel2.Location = new System.Drawing.Point(10, 59); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(139, 33); + this.panel2.TabIndex = 11; + // + // radLeft + // + this.radLeft.AutoSize = true; + this.radLeft.Location = new System.Drawing.Point(51, 9); + this.radLeft.Name = "radLeft"; + this.radLeft.Size = new System.Drawing.Size(30, 16); + this.radLeft.TabIndex = 0; + this.radLeft.TabStop = true; + this.radLeft.Text = "L"; + this.radLeft.UseVisualStyleBackColor = true; + // + // radStraight + // + this.radStraight.AutoSize = true; + this.radStraight.Location = new System.Drawing.Point(12, 9); + this.radStraight.Name = "radStraight"; + this.radStraight.Size = new System.Drawing.Size(31, 16); + this.radStraight.TabIndex = 0; + this.radStraight.TabStop = true; + this.radStraight.Text = "S"; + this.radStraight.UseVisualStyleBackColor = true; + // + // radRight + // + this.radRight.AutoSize = true; + this.radRight.Location = new System.Drawing.Point(93, 9); + this.radRight.Name = "radRight"; + this.radRight.Size = new System.Drawing.Size(31, 16); + this.radRight.TabIndex = 1; + this.radRight.TabStop = true; + this.radRight.Text = "R"; + this.radRight.UseVisualStyleBackColor = true; // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1016, 588); + this.ClientSize = new System.Drawing.Size(1016, 585); this.Controls.Add(this.grpLift); this.Controls.Add(this.grpAGVStatus); this.Controls.Add(this.grpLogs); @@ -915,11 +957,10 @@ namespace Test_ACS this.grpAGV.PerformLayout(); this.grpCommands.ResumeLayout(false); this.grpCommands.PerformLayout(); - this.grpLift.ResumeLayout(false); + this.groupBox1.ResumeLayout(false); this.grpManual.ResumeLayout(false); - this.grpManual.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numRuntime)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtRFID)).EndInit(); + this.grpLift.ResumeLayout(false); this.grpLogs.ResumeLayout(false); this.tabLogs.ResumeLayout(false); this.tabRX.ResumeLayout(false); @@ -930,8 +971,12 @@ namespace Test_ACS this.tabPage1.ResumeLayout(false); this.grpAGVStatus.ResumeLayout(false); this.grpAGVStatus.PerformLayout(); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); this.ResumeLayout(false); } @@ -957,12 +1002,6 @@ namespace Test_ACS private System.Windows.Forms.Button btnMarkStop; private System.Windows.Forms.CheckBox chkMarkStop; private System.Windows.Forms.GroupBox grpManual; - private System.Windows.Forms.Button btMMove; - private System.Windows.Forms.NumericUpDown numRuntime; - private System.Windows.Forms.Label lblRuntime; - private System.Windows.Forms.ComboBox cmbSpeed; - private System.Windows.Forms.Label lblSpeed; - private System.Windows.Forms.ComboBox cmbDirection; private System.Windows.Forms.GroupBox grpLift; private System.Windows.Forms.Button btnLiftStop; private System.Windows.Forms.Button btnLiftDown; @@ -1002,11 +1041,21 @@ namespace Test_ACS private System.Windows.Forms.RichTextBox richTextBox1; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.Button btAMove; - private System.Windows.Forms.ComboBox cmbAutoSpeed; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.ComboBox cmbMotDirection; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.ComboBox cmbMagDirection; + private System.Windows.Forms.RadioButton radSpdH; + private System.Windows.Forms.RadioButton radSpdM; + private System.Windows.Forms.RadioButton radSpdL; + private System.Windows.Forms.Button button2; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.Button button5; + private System.Windows.Forms.Button button4; + private System.Windows.Forms.Button button3; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.RadioButton radRight; + private System.Windows.Forms.RadioButton radLeft; + private System.Windows.Forms.RadioButton radStraight; + private System.Windows.Forms.RadioButton radForw; + private System.Windows.Forms.RadioButton radBack; } } diff --git a/Cs_HMI/TestProject/Test_ACS/MainForm.cs b/Cs_HMI/TestProject/Test_ACS/MainForm.cs index 67b8239..9785733 100644 --- a/Cs_HMI/TestProject/Test_ACS/MainForm.cs +++ b/Cs_HMI/TestProject/Test_ACS/MainForm.cs @@ -21,22 +21,9 @@ namespace Test_ACS InitializeComponent(); InitializeProtocol(); LoadPortList(); - InitializeComboBoxes(); } - private void InitializeComboBoxes() - { - // Direction combobox default - if (cmbDirection.Items.Count > 0) cmbDirection.SelectedIndex = 1; // 전진 - - // Speed combobox default - if (cmbSpeed.Items.Count > 0) cmbSpeed.SelectedIndex = 1; // 보통 - - cmbMotDirection.SelectedIndex = 0; - cmbMagDirection.SelectedIndex = 0; - cmbAutoSpeed.SelectedIndex = 0; - - } + private void InitializeProtocol() { @@ -281,13 +268,18 @@ namespace Test_ACS private void btnManual_Click(object sender, EventArgs e) { - // Manual: data = TargetID(2 hex) + Direction(1 byte) + Speed(1 byte) + Runtime(1 byte) - var targetID = selectedAGV.ToString("X2"); - var direction = (byte)cmbDirection.SelectedIndex; - var speed = (byte)cmbSpeed.SelectedIndex; - var runtime = (byte)numRuntime.Value; + var but = sender as Button; + if (but.Tag == null) return; + var tagstr = but.Tag.ToString(); - var dataBytes = new byte[] { direction, speed, runtime }; + var targetID = selectedAGV.ToString("X2"); + var direction = byte.Parse(tagstr);// //back + var speed = (byte)0;// cmbSpeed.SelectedIndex; + if (radSpdM.Checked) speed = 1; + else if (radSpdH.Checked) speed = 2; + + + var dataBytes = new byte[] { direction, speed }; var dataStr = targetID + string.Join("", dataBytes.Select(b => b.ToString("X2"))); SendCommand(AGVCommandHE.Manual, dataStr); } @@ -544,15 +536,33 @@ namespace Test_ACS private void btAMove_Click(object sender, EventArgs e) { - // Manual: data = TargetID(2 hex) + Direction(1 byte) + Speed(1 byte) + Runtime(1 byte) var targetID = selectedAGV.ToString("X2"); - var Motdirection = (byte)cmbMotDirection.SelectedIndex; - var Magdirection = (byte)cmbMagDirection.SelectedIndex; - var speed = (byte)cmbAutoSpeed.SelectedIndex; + byte Motdirection = 0;// (byte)cmbMotDirection.SelectedIndex; + if (radForw.Checked) Motdirection = 1; + + byte Magdirection = 0; + if (radLeft.Checked) Magdirection = 1; + else if (radRight.Checked) Magdirection = 2; + + byte speed = 0;// (byte)cmbAutoSpeed.SelectedIndex; + if (radSpdM.Checked) speed = 1; + else if (radSpdH.Checked) speed = 2; var dataBytes = new byte[] { Motdirection, Magdirection, speed }; var dataStr = targetID + string.Join("", dataBytes.Select(b => b.ToString("X2"))); SendCommand(AGVCommandHE.AutoMove, dataStr); } + + private void button2_Click(object sender, EventArgs e) + { + // Stop: data = TargetID(2 hex) + var targetID = selectedAGV.ToString("X2"); + SendCommand(AGVCommandHE.Stop, targetID); + } + + private void groupBox2_Enter(object sender, EventArgs e) + { + + } } }