This commit is contained in:
ChiKyun Kim
2025-12-23 17:25:47 +09:00
parent b3f661969a
commit 649d87cae3
16 changed files with 8484 additions and 746 deletions

View File

@@ -29,10 +29,33 @@ 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.button8 = new System.Windows.Forms.Button();
this.button10 = new System.Windows.Forms.Button();
this.button7 = new System.Windows.Forms.Button();
this.button9 = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.radSpdL = new System.Windows.Forms.RadioButton();
this.radSpdM = new System.Windows.Forms.RadioButton();
this.radSpdH = new System.Windows.Forms.RadioButton();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.panel3 = new System.Windows.Forms.Panel();
this.radLidarOff = new System.Windows.Forms.RadioButton();
this.radLidarOn = new System.Windows.Forms.RadioButton();
this.button6 = new System.Windows.Forms.Button();
this.panel2 = new System.Windows.Forms.Panel();
this.radRight = new System.Windows.Forms.RadioButton();
this.radLeft = new System.Windows.Forms.RadioButton();
this.radStraight = new System.Windows.Forms.RadioButton();
this.panel1 = new System.Windows.Forms.Panel();
this.radForw = new System.Windows.Forms.RadioButton();
this.radBack = new System.Windows.Forms.RadioButton();
this.btAMove = new System.Windows.Forms.Button();
this.grpManual = new System.Windows.Forms.GroupBox();
this.chkMarkStop = new System.Windows.Forms.CheckBox();
this.button5 = new System.Windows.Forms.Button();
this.button4 = new System.Windows.Forms.Button();
this.button3 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.btnMarkStop = new System.Windows.Forms.Button();
this.btnReset = new System.Windows.Forms.Button();
this.btnStop = new System.Windows.Forms.Button();
@@ -76,26 +99,15 @@ 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.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.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.grpConnection.SuspendLayout();
this.grpAGV.SuspendLayout();
this.grpCommands.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox1.SuspendLayout();
this.panel3.SuspendLayout();
this.panel2.SuspendLayout();
this.panel1.SuspendLayout();
this.grpManual.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txtRFID)).BeginInit();
this.grpLift.SuspendLayout();
@@ -106,9 +118,7 @@ namespace Test_ACS
this.tabInfo.SuspendLayout();
this.tabPage1.SuspendLayout();
this.grpAGVStatus.SuspendLayout();
this.groupBox2.SuspendLayout();
this.panel1.SuspendLayout();
this.panel2.SuspendLayout();
this.tableLayoutPanel2.SuspendLayout();
this.SuspendLayout();
//
// grpConnection
@@ -121,7 +131,7 @@ namespace Test_ACS
this.grpConnection.Controls.Add(this.lblPort);
this.grpConnection.Location = new System.Drawing.Point(12, 12);
this.grpConnection.Name = "grpConnection";
this.grpConnection.Size = new System.Drawing.Size(260, 120);
this.grpConnection.Size = new System.Drawing.Size(260, 82);
this.grpConnection.TabIndex = 0;
this.grpConnection.TabStop = false;
this.grpConnection.Text = "연결 설정";
@@ -138,9 +148,9 @@ namespace Test_ACS
//
// btnConnect
//
this.btnConnect.Location = new System.Drawing.Point(15, 81);
this.btnConnect.Location = new System.Drawing.Point(179, 53);
this.btnConnect.Name = "btnConnect";
this.btnConnect.Size = new System.Drawing.Size(234, 30);
this.btnConnect.Size = new System.Drawing.Size(70, 21);
this.btnConnect.TabIndex = 4;
this.btnConnect.Text = "연결";
this.btnConnect.UseVisualStyleBackColor = true;
@@ -150,7 +160,7 @@ namespace Test_ACS
//
this.txtBaudRate.Location = new System.Drawing.Point(85, 53);
this.txtBaudRate.Name = "txtBaudRate";
this.txtBaudRate.Size = new System.Drawing.Size(164, 21);
this.txtBaudRate.Size = new System.Drawing.Size(88, 21);
this.txtBaudRate.TabIndex = 3;
this.txtBaudRate.Text = "9600";
this.txtBaudRate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -190,7 +200,7 @@ namespace Test_ACS
this.grpAGV.Controls.Add(this.rbAGV1);
this.grpAGV.Location = new System.Drawing.Point(278, 12);
this.grpAGV.Name = "grpAGV";
this.grpAGV.Size = new System.Drawing.Size(200, 120);
this.grpAGV.Size = new System.Drawing.Size(167, 82);
this.grpAGV.TabIndex = 1;
this.grpAGV.TabStop = false;
this.grpAGV.Text = "AGV 선택";
@@ -198,7 +208,7 @@ namespace Test_ACS
// rbAGV2
//
this.rbAGV2.AutoSize = true;
this.rbAGV2.Location = new System.Drawing.Point(20, 60);
this.rbAGV2.Location = new System.Drawing.Point(20, 51);
this.rbAGV2.Name = "rbAGV2";
this.rbAGV2.Size = new System.Drawing.Size(95, 16);
this.rbAGV2.TabIndex = 1;
@@ -210,7 +220,7 @@ namespace Test_ACS
//
this.rbAGV1.AutoSize = true;
this.rbAGV1.Checked = true;
this.rbAGV1.Location = new System.Drawing.Point(20, 30);
this.rbAGV1.Location = new System.Drawing.Point(20, 21);
this.rbAGV1.Name = "rbAGV1";
this.rbAGV1.Size = new System.Drawing.Size(95, 16);
this.rbAGV1.TabIndex = 0;
@@ -221,11 +231,13 @@ namespace Test_ACS
//
// grpCommands
//
this.grpCommands.Controls.Add(this.button8);
this.grpCommands.Controls.Add(this.button10);
this.grpCommands.Controls.Add(this.button7);
this.grpCommands.Controls.Add(this.button9);
this.grpCommands.Controls.Add(this.groupBox2);
this.grpCommands.Controls.Add(this.groupBox1);
this.grpCommands.Controls.Add(this.grpManual);
this.grpCommands.Controls.Add(this.chkMarkStop);
this.grpCommands.Controls.Add(this.btnMarkStop);
this.grpCommands.Controls.Add(this.btnReset);
this.grpCommands.Controls.Add(this.btnStop);
this.grpCommands.Controls.Add(this.btnGotoAlias);
@@ -235,30 +247,238 @@ namespace Test_ACS
this.grpCommands.Controls.Add(this.lblAlias);
this.grpCommands.Controls.Add(this.txtRFID);
this.grpCommands.Controls.Add(this.lblRFID);
this.grpCommands.Location = new System.Drawing.Point(12, 138);
this.grpCommands.Location = new System.Drawing.Point(12, 98);
this.grpCommands.Name = "grpCommands";
this.grpCommands.Size = new System.Drawing.Size(466, 312);
this.grpCommands.Size = new System.Drawing.Size(433, 307);
this.grpCommands.TabIndex = 2;
this.grpCommands.TabStop = false;
this.grpCommands.Text = "ACS 명령";
//
// button8
//
this.button8.Location = new System.Drawing.Point(102, 264);
this.button8.Name = "button8";
this.button8.Size = new System.Drawing.Size(93, 35);
this.button8.TabIndex = 14;
this.button8.Text = "RT180";
this.button8.UseVisualStyleBackColor = true;
this.button8.Click += new System.EventHandler(this.button8_Click);
//
// button10
//
this.button10.Location = new System.Drawing.Point(102, 229);
this.button10.Name = "button10";
this.button10.Size = new System.Drawing.Size(93, 35);
this.button10.TabIndex = 16;
this.button10.Text = "R-turn";
this.button10.UseVisualStyleBackColor = true;
this.button10.Click += new System.EventHandler(this.button10_Click);
//
// button7
//
this.button7.Location = new System.Drawing.Point(15, 264);
this.button7.Name = "button7";
this.button7.Size = new System.Drawing.Size(85, 35);
this.button7.TabIndex = 13;
this.button7.Text = "LT180";
this.button7.UseVisualStyleBackColor = true;
this.button7.Click += new System.EventHandler(this.button7_Click);
//
// button9
//
this.button9.Location = new System.Drawing.Point(15, 228);
this.button9.Name = "button9";
this.button9.Size = new System.Drawing.Size(85, 35);
this.button9.TabIndex = 15;
this.button9.Text = "L-Turn";
this.button9.UseVisualStyleBackColor = true;
this.button9.Click += new System.EventHandler(this.button9_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, 117);
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);
//
// radSpdL
//
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;
//
// radSpdM
//
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;
//
// radSpdH
//
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;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.panel3);
this.groupBox1.Controls.Add(this.button6);
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.Controls.Add(this.btnMarkStop);
this.groupBox1.Location = new System.Drawing.Point(201, 117);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(244, 106);
this.groupBox1.Size = new System.Drawing.Size(225, 183);
this.groupBox1.TabIndex = 8;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "자동 이동";
//
// panel3
//
this.panel3.Controls.Add(this.radLidarOff);
this.panel3.Controls.Add(this.radLidarOn);
this.panel3.Location = new System.Drawing.Point(10, 98);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(139, 33);
this.panel3.TabIndex = 12;
//
// radLidarOff
//
this.radLidarOff.AutoSize = true;
this.radLidarOff.Location = new System.Drawing.Point(60, 9);
this.radLidarOff.Name = "radLidarOff";
this.radLidarOff.Size = new System.Drawing.Size(38, 16);
this.radLidarOff.TabIndex = 0;
this.radLidarOff.Text = "Off";
this.radLidarOff.UseVisualStyleBackColor = true;
//
// radLidarOn
//
this.radLidarOn.AutoSize = true;
this.radLidarOn.Checked = true;
this.radLidarOn.Location = new System.Drawing.Point(12, 9);
this.radLidarOn.Name = "radLidarOn";
this.radLidarOn.Size = new System.Drawing.Size(39, 16);
this.radLidarOn.TabIndex = 0;
this.radLidarOn.TabStop = true;
this.radLidarOn.Tag = "On";
this.radLidarOn.Text = "On";
this.radLidarOn.UseVisualStyleBackColor = true;
//
// button6
//
this.button6.Location = new System.Drawing.Point(155, 94);
this.button6.Name = "button6";
this.button6.Size = new System.Drawing.Size(65, 83);
this.button6.TabIndex = 12;
this.button6.Text = "정지";
this.button6.UseVisualStyleBackColor = true;
this.button6.Click += new System.EventHandler(this.button6_Click);
//
// 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;
//
// 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;
//
// 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;
//
// 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;
//
// 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;
//
// 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;
//
// 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.Size = new System.Drawing.Size(65, 76);
this.btAMove.TabIndex = 6;
this.btAMove.Text = "실행";
this.btAMove.UseVisualStyleBackColor = true;
@@ -271,30 +491,75 @@ namespace Test_ACS
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.Location = new System.Drawing.Point(15, 117);
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
// button5
//
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;
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);
//
// button4
//
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);
//
// button3
//
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);
//
// button2
//
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);
//
// button1
//
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);
//
// btnMarkStop
//
this.btnMarkStop.Location = new System.Drawing.Point(10, 117);
this.btnMarkStop.Location = new System.Drawing.Point(10, 137);
this.btnMarkStop.Name = "btnMarkStop";
this.btnMarkStop.Size = new System.Drawing.Size(177, 30);
this.btnMarkStop.Size = new System.Drawing.Size(139, 40);
this.btnMarkStop.TabIndex = 6;
this.btnMarkStop.Text = "마크센서 정지";
this.btnMarkStop.Text = "마크 정지";
this.btnMarkStop.UseVisualStyleBackColor = true;
this.btnMarkStop.Click += new System.EventHandler(this.btnMarkStop_Click);
//
@@ -399,21 +664,20 @@ namespace Test_ACS
//
// grpLift
//
this.grpLift.Controls.Add(this.btnLiftStop);
this.grpLift.Controls.Add(this.btnLiftDown);
this.grpLift.Controls.Add(this.btnLiftUp);
this.grpLift.Location = new System.Drawing.Point(298, 456);
this.grpLift.Controls.Add(this.tableLayoutPanel2);
this.grpLift.Location = new System.Drawing.Point(12, 535);
this.grpLift.Name = "grpLift";
this.grpLift.Size = new System.Drawing.Size(180, 120);
this.grpLift.Size = new System.Drawing.Size(433, 79);
this.grpLift.TabIndex = 9;
this.grpLift.TabStop = false;
this.grpLift.Text = "리프트 제어";
//
// btnLiftStop
//
this.btnLiftStop.Location = new System.Drawing.Point(121, 20);
this.btnLiftStop.Dock = System.Windows.Forms.DockStyle.Fill;
this.btnLiftStop.Location = new System.Drawing.Point(287, 3);
this.btnLiftStop.Name = "btnLiftStop";
this.btnLiftStop.Size = new System.Drawing.Size(48, 90);
this.btnLiftStop.Size = new System.Drawing.Size(137, 53);
this.btnLiftStop.TabIndex = 2;
this.btnLiftStop.Text = "정지";
this.btnLiftStop.UseVisualStyleBackColor = true;
@@ -421,9 +685,10 @@ namespace Test_ACS
//
// btnLiftDown
//
this.btnLiftDown.Location = new System.Drawing.Point(65, 20);
this.btnLiftDown.Dock = System.Windows.Forms.DockStyle.Fill;
this.btnLiftDown.Location = new System.Drawing.Point(145, 3);
this.btnLiftDown.Name = "btnLiftDown";
this.btnLiftDown.Size = new System.Drawing.Size(48, 90);
this.btnLiftDown.Size = new System.Drawing.Size(136, 53);
this.btnLiftDown.TabIndex = 1;
this.btnLiftDown.Text = "하강";
this.btnLiftDown.UseVisualStyleBackColor = true;
@@ -431,9 +696,10 @@ namespace Test_ACS
//
// btnLiftUp
//
this.btnLiftUp.Location = new System.Drawing.Point(9, 20);
this.btnLiftUp.Dock = System.Windows.Forms.DockStyle.Fill;
this.btnLiftUp.Location = new System.Drawing.Point(3, 3);
this.btnLiftUp.Name = "btnLiftUp";
this.btnLiftUp.Size = new System.Drawing.Size(48, 90);
this.btnLiftUp.Size = new System.Drawing.Size(136, 53);
this.btnLiftUp.TabIndex = 0;
this.btnLiftUp.Text = "상승";
this.btnLiftUp.UseVisualStyleBackColor = true;
@@ -451,9 +717,9 @@ namespace Test_ACS
// grpLogs
//
this.grpLogs.Controls.Add(this.tabLogs);
this.grpLogs.Location = new System.Drawing.Point(484, 12);
this.grpLogs.Location = new System.Drawing.Point(451, 12);
this.grpLogs.Name = "grpLogs";
this.grpLogs.Size = new System.Drawing.Size(520, 564);
this.grpLogs.Size = new System.Drawing.Size(520, 602);
this.grpLogs.TabIndex = 3;
this.grpLogs.TabStop = false;
this.grpLogs.Text = "로그";
@@ -467,7 +733,7 @@ namespace Test_ACS
this.tabLogs.Location = new System.Drawing.Point(3, 17);
this.tabLogs.Name = "tabLogs";
this.tabLogs.SelectedIndex = 0;
this.tabLogs.Size = new System.Drawing.Size(514, 544);
this.tabLogs.Size = new System.Drawing.Size(514, 582);
this.tabLogs.TabIndex = 0;
//
// tabRX
@@ -476,7 +742,7 @@ namespace Test_ACS
this.tabRX.Location = new System.Drawing.Point(4, 22);
this.tabRX.Name = "tabRX";
this.tabRX.Padding = new System.Windows.Forms.Padding(3);
this.tabRX.Size = new System.Drawing.Size(506, 518);
this.tabRX.Size = new System.Drawing.Size(506, 556);
this.tabRX.TabIndex = 1;
this.tabRX.Text = "패킷";
this.tabRX.UseVisualStyleBackColor = true;
@@ -497,19 +763,19 @@ namespace Test_ACS
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(500, 512);
this.tableLayoutPanel1.Size = new System.Drawing.Size(500, 550);
this.tableLayoutPanel1.TabIndex = 1;
//
// txtRxLog
//
this.txtRxLog.Dock = System.Windows.Forms.DockStyle.Fill;
this.txtRxLog.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txtRxLog.Location = new System.Drawing.Point(3, 279);
this.txtRxLog.Location = new System.Drawing.Point(3, 298);
this.txtRxLog.Multiline = true;
this.txtRxLog.Name = "txtRxLog";
this.txtRxLog.ReadOnly = true;
this.txtRxLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
this.txtRxLog.Size = new System.Drawing.Size(494, 230);
this.txtRxLog.Size = new System.Drawing.Size(494, 249);
this.txtRxLog.TabIndex = 0;
this.txtRxLog.Text = "1";
//
@@ -522,7 +788,7 @@ namespace Test_ACS
this.txtTxLog.Name = "txtTxLog";
this.txtTxLog.ReadOnly = true;
this.txtTxLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
this.txtTxLog.Size = new System.Drawing.Size(494, 230);
this.txtTxLog.Size = new System.Drawing.Size(494, 249);
this.txtTxLog.TabIndex = 0;
//
// label1
@@ -538,7 +804,7 @@ namespace Test_ACS
// label2
//
this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
this.label2.Location = new System.Drawing.Point(3, 256);
this.label2.Location = new System.Drawing.Point(3, 275);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(494, 20);
this.label2.TabIndex = 1;
@@ -607,9 +873,9 @@ namespace Test_ACS
this.grpAGVStatus.Controls.Add(this.lblRunSt);
this.grpAGVStatus.Controls.Add(this.lblModeValue);
this.grpAGVStatus.Controls.Add(this.lblMode);
this.grpAGVStatus.Location = new System.Drawing.Point(12, 456);
this.grpAGVStatus.Location = new System.Drawing.Point(12, 409);
this.grpAGVStatus.Name = "grpAGVStatus";
this.grpAGVStatus.Size = new System.Drawing.Size(280, 120);
this.grpAGVStatus.Size = new System.Drawing.Size(433, 120);
this.grpAGVStatus.TabIndex = 4;
this.grpAGVStatus.TabStop = false;
this.grpAGVStatus.Text = "AGV 상태";
@@ -757,189 +1023,28 @@ namespace Test_ACS
this.lblMode.TabIndex = 0;
this.lblMode.Text = "모드:";
//
// radSpdL
// tableLayoutPanel2
//
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;
//
// radSpdM
//
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;
//
// radSpdH
//
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;
//
// button1
//
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);
//
// button2
//
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);
//
// button3
//
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);
//
// button4
//
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);
//
// button5
//
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;
this.tableLayoutPanel2.ColumnCount = 3;
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
this.tableLayoutPanel2.Controls.Add(this.btnLiftStop, 2, 0);
this.tableLayoutPanel2.Controls.Add(this.btnLiftUp, 0, 0);
this.tableLayoutPanel2.Controls.Add(this.btnLiftDown, 1, 0);
this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 17);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 1;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(427, 59);
this.tableLayoutPanel2.TabIndex = 0;
//
// MainForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1016, 585);
this.ClientSize = new System.Drawing.Size(979, 621);
this.Controls.Add(this.grpLift);
this.Controls.Add(this.grpAGVStatus);
this.Controls.Add(this.grpLogs);
@@ -957,7 +1062,15 @@ namespace Test_ACS
this.grpAGV.PerformLayout();
this.grpCommands.ResumeLayout(false);
this.grpCommands.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.panel3.ResumeLayout(false);
this.panel3.PerformLayout();
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.grpManual.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txtRFID)).EndInit();
this.grpLift.ResumeLayout(false);
@@ -971,12 +1084,7 @@ namespace Test_ACS
this.tabPage1.ResumeLayout(false);
this.grpAGVStatus.ResumeLayout(false);
this.grpAGVStatus.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
this.tableLayoutPanel2.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -1000,7 +1108,6 @@ namespace Test_ACS
private System.Windows.Forms.Button btnStop;
private System.Windows.Forms.Button btnReset;
private System.Windows.Forms.Button btnMarkStop;
private System.Windows.Forms.CheckBox chkMarkStop;
private System.Windows.Forms.GroupBox grpManual;
private System.Windows.Forms.GroupBox grpLift;
private System.Windows.Forms.Button btnLiftStop;
@@ -1057,5 +1164,14 @@ namespace Test_ACS
private System.Windows.Forms.RadioButton radStraight;
private System.Windows.Forms.RadioButton radForw;
private System.Windows.Forms.RadioButton radBack;
private System.Windows.Forms.Button button6;
private System.Windows.Forms.Button button8;
private System.Windows.Forms.Button button7;
private System.Windows.Forms.Button button9;
private System.Windows.Forms.Button button10;
private System.Windows.Forms.Panel panel3;
private System.Windows.Forms.RadioButton radLidarOff;
private System.Windows.Forms.RadioButton radLidarOn;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
}
}

View File

@@ -299,7 +299,7 @@ namespace Test_ACS
{
// MarkStop: data = TargetID(2 hex) + MarkStop(1 byte)
var targetID = selectedAGV.ToString("X2");
var markStop = chkMarkStop.Checked ? "01" : "00";
var markStop = "01";// chkMarkStop.Checked ? "01" : "00";
SendCommand(AGVCommandHE.MarkStop, targetID + markStop);
}
@@ -556,7 +556,10 @@ namespace Test_ACS
if (radSpdM.Checked) speed = 1;
else if (radSpdH.Checked) speed = 2;
var dataBytes = new byte[] { Motdirection, Magdirection, speed };
byte lidar = 2;
if (radLidarOff.Checked) lidar = 0;
var dataBytes = new byte[] { Motdirection, Magdirection, speed ,lidar};
var dataStr = targetID + string.Join("", dataBytes.Select(b => b.ToString("X2")));
SendCommand(AGVCommandHE.AutoMove, dataStr);
}
@@ -572,5 +575,39 @@ namespace Test_ACS
{
}
private void button6_Click(object sender, EventArgs e)
{
var targetID = selectedAGV.ToString("X2");
SendCommand(AGVCommandHE.Stop, targetID);
}
private void button7_Click(object sender, EventArgs e)
{
//lt180
var targetID = selectedAGV.ToString("X2");
SendCommand(AGVCommandHE.LTurn180, targetID);
}
private void button8_Click(object sender, EventArgs e)
{
//rt180
var targetID = selectedAGV.ToString("X2");
SendCommand(AGVCommandHE.RTurn180, targetID);
}
private void button9_Click(object sender, EventArgs e)
{
//l turn
var targetID = selectedAGV.ToString("X2");
SendCommand(AGVCommandHE.LTurn, targetID);
}
private void button10_Click(object sender, EventArgs e)
{
///r-turn
var targetID = selectedAGV.ToString("X2");
SendCommand(AGVCommandHE.RTurn, targetID);
}
}
}

View File

@@ -18,7 +18,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\..\..\..\..\Amkor\AGV4\Test\</OutputPath>
<OutputPath>..\..\..\..\..\..\Amkor\AGV4\Test\ACS\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>

View File

@@ -38,7 +38,7 @@ namespace Test_BMS
private void Bms_Message(object sender, arDev.arRS232.MessageEventArgs e)
private void Bms_Message(object sender, arDev.BMSSerialComm.MessageEventArgs e)
{
var sb = new System.Text.StringBuilder();
if (e.Data != null)
@@ -48,13 +48,13 @@ namespace Test_BMS
}
else sb.Append(e.Message);
if (e.MsgType == arDev.arRS232.MessageType.Error)
if (e.MsgType == arDev.BMSSerialComm.MessageType.Error)
addmsg(e.Message);
else if(e.MsgType == arDev.arRS232.MessageType.Send)
else if(e.MsgType == arDev.BMSSerialComm.MessageType.Send)
{
addmsg($"Tx:{sb}");
}
else if(e.MsgType == arDev.arRS232.MessageType.Recv)
else if(e.MsgType == arDev.BMSSerialComm.MessageType.Recv)
{
addmsg($"Rx:{sb}");
}

View File

@@ -56,6 +56,9 @@
<Compile Include="..\..\Project\Device\BMSInformationEventArgs.cs">
<Link>BMSInformationEventArgs.cs</Link>
</Compile>
<Compile Include="..\..\Project\Device\BMSSerialComm.cs">
<Link>BMSSerialComm.cs</Link>
</Compile>
<Compile Include="Form1.cs">
<SubType>Form</SubType>
</Compile>

View File

@@ -31,7 +31,7 @@ namespace Test_BMS
log2.Flush();
}
private void Dev_Message(object sender, arDev.arRS232.MessageEventArgs e)
private void Dev_Message(object sender, arDev.NarumiSerialComm.MessageEventArgs e)
{
addmsg(e.MsgType.ToString(), e.Message);// $"{e.MsgType}:{e.Message}");
}
@@ -53,7 +53,7 @@ namespace Test_BMS
this.rt0.Text = $"system0-{dev.system0.Value:X2}\n" + dev.system0.ToString();
this.rt1.Text = $"system1-{dev.system1.Value:X2}\n" + dev.system1.ToString();
this.rt2.Text = $"error-{dev.error.Value:X2}\n" + dev.error.ToString();
this.rt3.Text = $"iosignal-{dev.signal.Value:X2}\n" + dev.signal.ToString() + "data\n" + dev.data.ToString();
this.rt3.Text = $"iosignal-{dev.signal1.Value:X2}\n" + dev.signal1.ToString() + "data\n" + dev.data.ToString();
//this.rt4.Text = "data\n" + dev.data.ToString();

View File

@@ -18,7 +18,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\..\..\..\..\Amkor\AGV4\Test\</OutputPath>
<OutputPath>..\..\..\..\..\..\Amkor\AGV4\Test\AGV\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -36,7 +36,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="arControl.Net4">
<HintPath>..\Sub\arCtl\obj\Debug\arControl.Net4.dll</HintPath>
<HintPath>..\..\DLL\arControl.Net4.dll</HintPath>
</Reference>
<Reference Include="ArLog.Net4">
<HintPath>..\..\DLL\ArLog.Net4.dll</HintPath>

View File

@@ -18,7 +18,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\..\..\..\..\Amkor\AGV4\Test\</OutputPath>
<OutputPath>..\..\..\..\..\..\Amkor\AGV4\Test\PortScan\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>