diff --git a/INT69DB_2A/Forms/FormDataBackup.Designer.cs b/INT69DB_2A/Forms/FormDataBackup.Designer.cs
index 9cb0672..d9cbb95 100644
--- a/INT69DB_2A/Forms/FormDataBackup.Designer.cs
+++ b/INT69DB_2A/Forms/FormDataBackup.Designer.cs
@@ -115,10 +115,10 @@
//
// listBoxDataList
//
- this.listBoxDataList.Font = new System.Drawing.Font("Arial", 15F, System.Drawing.FontStyle.Bold);
+ this.listBoxDataList.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold);
this.listBoxDataList.Location = new System.Drawing.Point(407, 188);
this.listBoxDataList.Name = "listBoxDataList";
- this.listBoxDataList.Size = new System.Drawing.Size(355, 278);
+ this.listBoxDataList.Size = new System.Drawing.Size(355, 296);
this.listBoxDataList.TabIndex = 137;
//
// labelFileCount
diff --git a/INT69DB_2A/Forms/FormIOTest.Designer.cs b/INT69DB_2A/Forms/FormIOTest.Designer.cs
index 020f6b0..82af14b 100644
--- a/INT69DB_2A/Forms/FormIOTest.Designer.cs
+++ b/INT69DB_2A/Forms/FormIOTest.Designer.cs
@@ -108,6 +108,22 @@
this.buttonPlcOut16 = new SmartX.SmartButton();
this.buttonPlcClose = new SmartX.SmartButton();
this.groupBoxPLC = new SmartX.SmartGroupBox();
+ this.buttonOutput32 = new SmartX.SmartButton();
+ this.buttonOutput17 = new SmartX.SmartButton();
+ this.buttonOutput24 = new SmartX.SmartButton();
+ this.buttonOutput28 = new SmartX.SmartButton();
+ this.buttonOutput31 = new SmartX.SmartButton();
+ this.buttonOutput23 = new SmartX.SmartButton();
+ this.buttonOutput20 = new SmartX.SmartButton();
+ this.buttonOutput27 = new SmartX.SmartButton();
+ this.buttonOutput30 = new SmartX.SmartButton();
+ this.buttonOutput19 = new SmartX.SmartButton();
+ this.buttonOutput22 = new SmartX.SmartButton();
+ this.buttonOutput26 = new SmartX.SmartButton();
+ this.buttonOutput29 = new SmartX.SmartButton();
+ this.buttonOutput18 = new SmartX.SmartButton();
+ this.buttonOutput21 = new SmartX.SmartButton();
+ this.buttonOutput25 = new SmartX.SmartButton();
((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
this.smartGroupBox1.SuspendLayout();
this.smartGroupBox2.SuspendLayout();
@@ -200,7 +216,7 @@
this.buttonOutput16.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.buttonOutput16.GroupID = 0;
this.buttonOutput16.InitVisible = true;
- this.buttonOutput16.Location = new System.Drawing.Point(168, 315);
+ this.buttonOutput16.Location = new System.Drawing.Point(135, 315);
this.buttonOutput16.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonOutput16.Name = "buttonOutput16";
this.buttonOutput16.NestedClickEventPrevent = false;
@@ -234,7 +250,7 @@
this.buttonOutput8.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.buttonOutput8.GroupID = 0;
this.buttonOutput8.InitVisible = true;
- this.buttonOutput8.Location = new System.Drawing.Point(36, 315);
+ this.buttonOutput8.Location = new System.Drawing.Point(29, 315);
this.buttonOutput8.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonOutput8.Name = "buttonOutput8";
this.buttonOutput8.NestedClickEventPrevent = false;
@@ -268,7 +284,7 @@
this.buttonOutput15.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.buttonOutput15.GroupID = 0;
this.buttonOutput15.InitVisible = true;
- this.buttonOutput15.Location = new System.Drawing.Point(168, 274);
+ this.buttonOutput15.Location = new System.Drawing.Point(135, 274);
this.buttonOutput15.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonOutput15.Name = "buttonOutput15";
this.buttonOutput15.NestedClickEventPrevent = false;
@@ -302,7 +318,7 @@
this.buttonOutput7.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.buttonOutput7.GroupID = 0;
this.buttonOutput7.InitVisible = true;
- this.buttonOutput7.Location = new System.Drawing.Point(36, 274);
+ this.buttonOutput7.Location = new System.Drawing.Point(29, 274);
this.buttonOutput7.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonOutput7.Name = "buttonOutput7";
this.buttonOutput7.NestedClickEventPrevent = false;
@@ -336,7 +352,7 @@
this.buttonOutput14.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.buttonOutput14.GroupID = 0;
this.buttonOutput14.InitVisible = true;
- this.buttonOutput14.Location = new System.Drawing.Point(168, 233);
+ this.buttonOutput14.Location = new System.Drawing.Point(135, 233);
this.buttonOutput14.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonOutput14.Name = "buttonOutput14";
this.buttonOutput14.NestedClickEventPrevent = false;
@@ -370,7 +386,7 @@
this.buttonOutput6.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.buttonOutput6.GroupID = 0;
this.buttonOutput6.InitVisible = true;
- this.buttonOutput6.Location = new System.Drawing.Point(36, 233);
+ this.buttonOutput6.Location = new System.Drawing.Point(29, 233);
this.buttonOutput6.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonOutput6.Name = "buttonOutput6";
this.buttonOutput6.NestedClickEventPrevent = false;
@@ -404,7 +420,7 @@
this.buttonOutput13.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.buttonOutput13.GroupID = 0;
this.buttonOutput13.InitVisible = true;
- this.buttonOutput13.Location = new System.Drawing.Point(168, 192);
+ this.buttonOutput13.Location = new System.Drawing.Point(135, 192);
this.buttonOutput13.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonOutput13.Name = "buttonOutput13";
this.buttonOutput13.NestedClickEventPrevent = false;
@@ -438,7 +454,7 @@
this.buttonOutput5.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.buttonOutput5.GroupID = 0;
this.buttonOutput5.InitVisible = true;
- this.buttonOutput5.Location = new System.Drawing.Point(36, 192);
+ this.buttonOutput5.Location = new System.Drawing.Point(29, 192);
this.buttonOutput5.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonOutput5.Name = "buttonOutput5";
this.buttonOutput5.NestedClickEventPrevent = false;
@@ -472,7 +488,7 @@
this.buttonOutput1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.buttonOutput1.GroupID = 0;
this.buttonOutput1.InitVisible = true;
- this.buttonOutput1.Location = new System.Drawing.Point(36, 28);
+ this.buttonOutput1.Location = new System.Drawing.Point(29, 28);
this.buttonOutput1.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonOutput1.Name = "buttonOutput1";
this.buttonOutput1.NestedClickEventPrevent = false;
@@ -515,7 +531,7 @@
this.buttonOutput12.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.buttonOutput12.GroupID = 0;
this.buttonOutput12.InitVisible = true;
- this.buttonOutput12.Location = new System.Drawing.Point(168, 151);
+ this.buttonOutput12.Location = new System.Drawing.Point(135, 151);
this.buttonOutput12.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonOutput12.Name = "buttonOutput12";
this.buttonOutput12.NestedClickEventPrevent = false;
@@ -541,7 +557,7 @@
this.labelInput9.BackColor = System.Drawing.Color.Gray;
this.labelInput9.Font = new System.Drawing.Font("굴림", 10F, System.Drawing.FontStyle.Regular);
this.labelInput9.ForeColor = System.Drawing.SystemColors.ControlDark;
- this.labelInput9.Location = new System.Drawing.Point(207, 60);
+ this.labelInput9.Location = new System.Drawing.Point(148, 60);
this.labelInput9.Name = "labelInput9";
this.labelInput9.Size = new System.Drawing.Size(25, 25);
//
@@ -577,7 +593,7 @@
this.buttonOutput4.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.buttonOutput4.GroupID = 0;
this.buttonOutput4.InitVisible = true;
- this.buttonOutput4.Location = new System.Drawing.Point(36, 151);
+ this.buttonOutput4.Location = new System.Drawing.Point(29, 151);
this.buttonOutput4.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonOutput4.Name = "buttonOutput4";
this.buttonOutput4.NestedClickEventPrevent = false;
@@ -608,7 +624,7 @@
this.labelInputName9.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.labelInputName9.InitVisible = true;
this.labelInputName9.LineSpacing = 0F;
- this.labelInputName9.Location = new System.Drawing.Point(238, 60);
+ this.labelInputName9.Location = new System.Drawing.Point(179, 60);
this.labelInputName9.Name = "labelInputName9";
this.labelInputName9.Size = new System.Drawing.Size(80, 25);
this.labelInputName9.TabIndex = 167;
@@ -630,7 +646,7 @@
this.buttonOutput11.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.buttonOutput11.GroupID = 0;
this.buttonOutput11.InitVisible = true;
- this.buttonOutput11.Location = new System.Drawing.Point(168, 110);
+ this.buttonOutput11.Location = new System.Drawing.Point(135, 110);
this.buttonOutput11.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonOutput11.Name = "buttonOutput11";
this.buttonOutput11.NestedClickEventPrevent = false;
@@ -673,7 +689,7 @@
this.buttonOutput3.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.buttonOutput3.GroupID = 0;
this.buttonOutput3.InitVisible = true;
- this.buttonOutput3.Location = new System.Drawing.Point(36, 110);
+ this.buttonOutput3.Location = new System.Drawing.Point(29, 110);
this.buttonOutput3.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonOutput3.Name = "buttonOutput3";
this.buttonOutput3.NestedClickEventPrevent = false;
@@ -699,7 +715,7 @@
this.labelInput10.BackColor = System.Drawing.Color.Gray;
this.labelInput10.Font = new System.Drawing.Font("굴림", 10F, System.Drawing.FontStyle.Regular);
this.labelInput10.ForeColor = System.Drawing.SystemColors.ControlDark;
- this.labelInput10.Location = new System.Drawing.Point(207, 91);
+ this.labelInput10.Location = new System.Drawing.Point(148, 91);
this.labelInput10.Name = "labelInput10";
this.labelInput10.Size = new System.Drawing.Size(25, 25);
//
@@ -716,7 +732,7 @@
this.buttonOutput10.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.buttonOutput10.GroupID = 0;
this.buttonOutput10.InitVisible = true;
- this.buttonOutput10.Location = new System.Drawing.Point(168, 69);
+ this.buttonOutput10.Location = new System.Drawing.Point(135, 69);
this.buttonOutput10.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonOutput10.Name = "buttonOutput10";
this.buttonOutput10.NestedClickEventPrevent = false;
@@ -766,7 +782,7 @@
this.labelInputName10.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.labelInputName10.InitVisible = true;
this.labelInputName10.LineSpacing = 0F;
- this.labelInputName10.Location = new System.Drawing.Point(238, 91);
+ this.labelInputName10.Location = new System.Drawing.Point(179, 91);
this.labelInputName10.Name = "labelInputName10";
this.labelInputName10.Size = new System.Drawing.Size(80, 25);
this.labelInputName10.TabIndex = 169;
@@ -788,7 +804,7 @@
this.buttonOutput2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.buttonOutput2.GroupID = 0;
this.buttonOutput2.InitVisible = true;
- this.buttonOutput2.Location = new System.Drawing.Point(36, 69);
+ this.buttonOutput2.Location = new System.Drawing.Point(29, 69);
this.buttonOutput2.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonOutput2.Name = "buttonOutput2";
this.buttonOutput2.NestedClickEventPrevent = false;
@@ -831,7 +847,7 @@
this.buttonOutput9.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.buttonOutput9.GroupID = 0;
this.buttonOutput9.InitVisible = true;
- this.buttonOutput9.Location = new System.Drawing.Point(168, 28);
+ this.buttonOutput9.Location = new System.Drawing.Point(135, 28);
this.buttonOutput9.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonOutput9.Name = "buttonOutput9";
this.buttonOutput9.NestedClickEventPrevent = false;
@@ -857,7 +873,7 @@
this.labelInput11.BackColor = System.Drawing.Color.Gray;
this.labelInput11.Font = new System.Drawing.Font("굴림", 10F, System.Drawing.FontStyle.Regular);
this.labelInput11.ForeColor = System.Drawing.SystemColors.ControlDark;
- this.labelInput11.Location = new System.Drawing.Point(207, 122);
+ this.labelInput11.Location = new System.Drawing.Point(148, 122);
this.labelInput11.Name = "labelInput11";
this.labelInput11.Size = new System.Drawing.Size(25, 25);
//
@@ -890,7 +906,7 @@
this.labelInputName11.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.labelInputName11.InitVisible = true;
this.labelInputName11.LineSpacing = 0F;
- this.labelInputName11.Location = new System.Drawing.Point(238, 122);
+ this.labelInputName11.Location = new System.Drawing.Point(179, 122);
this.labelInputName11.Name = "labelInputName11";
this.labelInputName11.Size = new System.Drawing.Size(80, 25);
this.labelInputName11.TabIndex = 172;
@@ -909,7 +925,7 @@
this.labelInputName16.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.labelInputName16.InitVisible = true;
this.labelInputName16.LineSpacing = 0F;
- this.labelInputName16.Location = new System.Drawing.Point(238, 277);
+ this.labelInputName16.Location = new System.Drawing.Point(179, 277);
this.labelInputName16.Name = "labelInputName16";
this.labelInputName16.Size = new System.Drawing.Size(80, 25);
this.labelInputName16.TabIndex = 182;
@@ -951,7 +967,7 @@
this.labelInput12.BackColor = System.Drawing.Color.Gray;
this.labelInput12.Font = new System.Drawing.Font("굴림", 10F, System.Drawing.FontStyle.Regular);
this.labelInput12.ForeColor = System.Drawing.SystemColors.ControlDark;
- this.labelInput12.Location = new System.Drawing.Point(207, 153);
+ this.labelInput12.Location = new System.Drawing.Point(148, 153);
this.labelInput12.Name = "labelInput12";
this.labelInput12.Size = new System.Drawing.Size(25, 25);
//
@@ -960,7 +976,7 @@
this.labelInput16.BackColor = System.Drawing.Color.Gray;
this.labelInput16.Font = new System.Drawing.Font("굴림", 10F, System.Drawing.FontStyle.Regular);
this.labelInput16.ForeColor = System.Drawing.SystemColors.ControlDark;
- this.labelInput16.Location = new System.Drawing.Point(207, 277);
+ this.labelInput16.Location = new System.Drawing.Point(148, 277);
this.labelInput16.Name = "labelInput16";
this.labelInput16.Size = new System.Drawing.Size(25, 25);
//
@@ -1002,7 +1018,7 @@
this.labelInputName12.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.labelInputName12.InitVisible = true;
this.labelInputName12.LineSpacing = 0F;
- this.labelInputName12.Location = new System.Drawing.Point(238, 153);
+ this.labelInputName12.Location = new System.Drawing.Point(179, 153);
this.labelInputName12.Name = "labelInputName12";
this.labelInputName12.Size = new System.Drawing.Size(80, 25);
this.labelInputName12.TabIndex = 173;
@@ -1021,7 +1037,7 @@
this.labelInputName15.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.labelInputName15.InitVisible = true;
this.labelInputName15.LineSpacing = 0F;
- this.labelInputName15.Location = new System.Drawing.Point(238, 246);
+ this.labelInputName15.Location = new System.Drawing.Point(179, 246);
this.labelInputName15.Name = "labelInputName15";
this.labelInputName15.Size = new System.Drawing.Size(80, 25);
this.labelInputName15.TabIndex = 179;
@@ -1063,7 +1079,7 @@
this.labelInput13.BackColor = System.Drawing.Color.Gray;
this.labelInput13.Font = new System.Drawing.Font("굴림", 10F, System.Drawing.FontStyle.Regular);
this.labelInput13.ForeColor = System.Drawing.SystemColors.ControlDark;
- this.labelInput13.Location = new System.Drawing.Point(207, 184);
+ this.labelInput13.Location = new System.Drawing.Point(148, 184);
this.labelInput13.Name = "labelInput13";
this.labelInput13.Size = new System.Drawing.Size(25, 25);
//
@@ -1072,7 +1088,7 @@
this.labelInput15.BackColor = System.Drawing.Color.Gray;
this.labelInput15.Font = new System.Drawing.Font("굴림", 10F, System.Drawing.FontStyle.Regular);
this.labelInput15.ForeColor = System.Drawing.SystemColors.ControlDark;
- this.labelInput15.Location = new System.Drawing.Point(207, 246);
+ this.labelInput15.Location = new System.Drawing.Point(148, 246);
this.labelInput15.Name = "labelInput15";
this.labelInput15.Size = new System.Drawing.Size(25, 25);
//
@@ -1114,7 +1130,7 @@
this.labelInputName13.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.labelInputName13.InitVisible = true;
this.labelInputName13.LineSpacing = 0F;
- this.labelInputName13.Location = new System.Drawing.Point(238, 184);
+ this.labelInputName13.Location = new System.Drawing.Point(179, 184);
this.labelInputName13.Name = "labelInputName13";
this.labelInputName13.Size = new System.Drawing.Size(80, 25);
this.labelInputName13.TabIndex = 176;
@@ -1133,7 +1149,7 @@
this.labelInputName14.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.labelInputName14.InitVisible = true;
this.labelInputName14.LineSpacing = 0F;
- this.labelInputName14.Location = new System.Drawing.Point(238, 215);
+ this.labelInputName14.Location = new System.Drawing.Point(179, 215);
this.labelInputName14.Name = "labelInputName14";
this.labelInputName14.Size = new System.Drawing.Size(80, 25);
this.labelInputName14.TabIndex = 178;
@@ -1175,7 +1191,7 @@
this.labelInput14.BackColor = System.Drawing.Color.Gray;
this.labelInput14.Font = new System.Drawing.Font("굴림", 10F, System.Drawing.FontStyle.Regular);
this.labelInput14.ForeColor = System.Drawing.SystemColors.ControlDark;
- this.labelInput14.Location = new System.Drawing.Point(207, 215);
+ this.labelInput14.Location = new System.Drawing.Point(148, 215);
this.labelInput14.Name = "labelInput14";
this.labelInput14.Size = new System.Drawing.Size(25, 25);
//
@@ -1183,6 +1199,22 @@
//
this.smartGroupBox1.BackPictureBox = this.smartForm1;
this.smartGroupBox1.BackPictureBox1 = null;
+ this.smartGroupBox1.Controls.Add(this.buttonOutput32);
+ this.smartGroupBox1.Controls.Add(this.buttonOutput17);
+ this.smartGroupBox1.Controls.Add(this.buttonOutput24);
+ this.smartGroupBox1.Controls.Add(this.buttonOutput28);
+ this.smartGroupBox1.Controls.Add(this.buttonOutput31);
+ this.smartGroupBox1.Controls.Add(this.buttonOutput23);
+ this.smartGroupBox1.Controls.Add(this.buttonOutput20);
+ this.smartGroupBox1.Controls.Add(this.buttonOutput27);
+ this.smartGroupBox1.Controls.Add(this.buttonOutput30);
+ this.smartGroupBox1.Controls.Add(this.buttonOutput19);
+ this.smartGroupBox1.Controls.Add(this.buttonOutput22);
+ this.smartGroupBox1.Controls.Add(this.buttonOutput26);
+ this.smartGroupBox1.Controls.Add(this.buttonOutput29);
+ this.smartGroupBox1.Controls.Add(this.buttonOutput18);
+ this.smartGroupBox1.Controls.Add(this.buttonOutput21);
+ this.smartGroupBox1.Controls.Add(this.buttonOutput25);
this.smartGroupBox1.Controls.Add(this.buttonOutput16);
this.smartGroupBox1.Controls.Add(this.buttonOutput1);
this.smartGroupBox1.Controls.Add(this.buttonOutput8);
@@ -1206,10 +1238,10 @@
this.smartGroupBox1.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.RoundRectangle;
this.smartGroupBox1.Image = null;
this.smartGroupBox1.InitVisible = true;
- this.smartGroupBox1.Location = new System.Drawing.Point(71, 105);
+ this.smartGroupBox1.Location = new System.Drawing.Point(16, 108);
this.smartGroupBox1.Name = "smartGroupBox1";
this.smartGroupBox1.RoundRadius = 10;
- this.smartGroupBox1.Size = new System.Drawing.Size(300, 375);
+ this.smartGroupBox1.Size = new System.Drawing.Size(483, 375);
this.smartGroupBox1.TabIndex = 207;
this.smartGroupBox1.Text = "OUTPUT";
this.smartGroupBox1.TextColor = System.Drawing.Color.Black;
@@ -1259,10 +1291,10 @@
this.smartGroupBox2.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.RoundRectangle;
this.smartGroupBox2.Image = null;
this.smartGroupBox2.InitVisible = true;
- this.smartGroupBox2.Location = new System.Drawing.Point(407, 105);
+ this.smartGroupBox2.Location = new System.Drawing.Point(505, 108);
this.smartGroupBox2.Name = "smartGroupBox2";
this.smartGroupBox2.RoundRadius = 10;
- this.smartGroupBox2.Size = new System.Drawing.Size(350, 375);
+ this.smartGroupBox2.Size = new System.Drawing.Size(272, 375);
this.smartGroupBox2.TabIndex = 208;
this.smartGroupBox2.Text = "INPUT";
this.smartGroupBox2.TextColor = System.Drawing.Color.Black;
@@ -1280,7 +1312,7 @@
this.buttonInputRead.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.buttonInputRead.GroupID = 0;
this.buttonInputRead.InitVisible = true;
- this.buttonInputRead.Location = new System.Drawing.Point(110, 320);
+ this.buttonInputRead.Location = new System.Drawing.Point(84, 320);
this.buttonInputRead.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonInputRead.Name = "buttonInputRead";
this.buttonInputRead.NestedClickEventPrevent = false;
@@ -1315,10 +1347,10 @@
this.buttonPLC1.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonPLC1.DisableImage = null;
this.buttonPLC1.DownImage = null;
- this.buttonPLC1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.buttonPLC1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
this.buttonPLC1.GroupID = 0;
this.buttonPLC1.InitVisible = true;
- this.buttonPLC1.Location = new System.Drawing.Point(107, 486);
+ this.buttonPLC1.Location = new System.Drawing.Point(16, 525);
this.buttonPLC1.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonPLC1.Name = "buttonPLC1";
this.buttonPLC1.NestedClickEventPrevent = false;
@@ -1326,7 +1358,7 @@
this.buttonPLC1.RepeatInterval = 200;
this.buttonPLC1.RepeatIntervalAccelerate = null;
this.buttonPLC1.SafeInterval = 200;
- this.buttonPLC1.Size = new System.Drawing.Size(100, 30);
+ this.buttonPLC1.Size = new System.Drawing.Size(70, 70);
this.buttonPLC1.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
this.buttonPLC1.TabIndex = 212;
this.buttonPLC1.Text = "PLC1";
@@ -1350,7 +1382,7 @@
this.buttonPlcOut9.DownImage = null;
this.buttonPlcOut9.GroupID = 0;
this.buttonPlcOut9.InitVisible = true;
- this.buttonPlcOut9.Location = new System.Drawing.Point(133, 28);
+ this.buttonPlcOut9.Location = new System.Drawing.Point(218, 31);
this.buttonPlcOut9.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonPlcOut9.Name = "buttonPlcOut9";
this.buttonPlcOut9.NestedClickEventPrevent = false;
@@ -1383,7 +1415,7 @@
this.buttonPlcOut17.DownImage = null;
this.buttonPlcOut17.GroupID = 0;
this.buttonPlcOut17.InitVisible = true;
- this.buttonPlcOut17.Location = new System.Drawing.Point(239, 28);
+ this.buttonPlcOut17.Location = new System.Drawing.Point(324, 31);
this.buttonPlcOut17.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonPlcOut17.Name = "buttonPlcOut17";
this.buttonPlcOut17.NestedClickEventPrevent = false;
@@ -1416,7 +1448,7 @@
this.buttonPlcOut5.DownImage = null;
this.buttonPlcOut5.GroupID = 0;
this.buttonPlcOut5.InitVisible = true;
- this.buttonPlcOut5.Location = new System.Drawing.Point(27, 192);
+ this.buttonPlcOut5.Location = new System.Drawing.Point(112, 195);
this.buttonPlcOut5.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonPlcOut5.Name = "buttonPlcOut5";
this.buttonPlcOut5.NestedClickEventPrevent = false;
@@ -1449,7 +1481,7 @@
this.buttonPlcOut2.DownImage = null;
this.buttonPlcOut2.GroupID = 0;
this.buttonPlcOut2.InitVisible = true;
- this.buttonPlcOut2.Location = new System.Drawing.Point(27, 69);
+ this.buttonPlcOut2.Location = new System.Drawing.Point(112, 72);
this.buttonPlcOut2.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonPlcOut2.Name = "buttonPlcOut2";
this.buttonPlcOut2.NestedClickEventPrevent = false;
@@ -1482,7 +1514,7 @@
this.buttonPlcOut13.DownImage = null;
this.buttonPlcOut13.GroupID = 0;
this.buttonPlcOut13.InitVisible = true;
- this.buttonPlcOut13.Location = new System.Drawing.Point(133, 192);
+ this.buttonPlcOut13.Location = new System.Drawing.Point(218, 195);
this.buttonPlcOut13.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonPlcOut13.Name = "buttonPlcOut13";
this.buttonPlcOut13.NestedClickEventPrevent = false;
@@ -1515,7 +1547,7 @@
this.buttonPlcOut10.DownImage = null;
this.buttonPlcOut10.GroupID = 0;
this.buttonPlcOut10.InitVisible = true;
- this.buttonPlcOut10.Location = new System.Drawing.Point(133, 69);
+ this.buttonPlcOut10.Location = new System.Drawing.Point(218, 72);
this.buttonPlcOut10.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonPlcOut10.Name = "buttonPlcOut10";
this.buttonPlcOut10.NestedClickEventPrevent = false;
@@ -1548,7 +1580,7 @@
this.buttonPlcOut18.DownImage = null;
this.buttonPlcOut18.GroupID = 0;
this.buttonPlcOut18.InitVisible = true;
- this.buttonPlcOut18.Location = new System.Drawing.Point(239, 69);
+ this.buttonPlcOut18.Location = new System.Drawing.Point(324, 72);
this.buttonPlcOut18.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonPlcOut18.Name = "buttonPlcOut18";
this.buttonPlcOut18.NestedClickEventPrevent = false;
@@ -1581,7 +1613,7 @@
this.buttonPlcOut6.DownImage = null;
this.buttonPlcOut6.GroupID = 0;
this.buttonPlcOut6.InitVisible = true;
- this.buttonPlcOut6.Location = new System.Drawing.Point(27, 233);
+ this.buttonPlcOut6.Location = new System.Drawing.Point(112, 236);
this.buttonPlcOut6.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonPlcOut6.Name = "buttonPlcOut6";
this.buttonPlcOut6.NestedClickEventPrevent = false;
@@ -1614,7 +1646,7 @@
this.buttonPlcOut3.DownImage = null;
this.buttonPlcOut3.GroupID = 0;
this.buttonPlcOut3.InitVisible = true;
- this.buttonPlcOut3.Location = new System.Drawing.Point(27, 110);
+ this.buttonPlcOut3.Location = new System.Drawing.Point(112, 113);
this.buttonPlcOut3.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonPlcOut3.Name = "buttonPlcOut3";
this.buttonPlcOut3.NestedClickEventPrevent = false;
@@ -1647,7 +1679,7 @@
this.buttonPlcOut14.DownImage = null;
this.buttonPlcOut14.GroupID = 0;
this.buttonPlcOut14.InitVisible = true;
- this.buttonPlcOut14.Location = new System.Drawing.Point(133, 233);
+ this.buttonPlcOut14.Location = new System.Drawing.Point(218, 236);
this.buttonPlcOut14.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonPlcOut14.Name = "buttonPlcOut14";
this.buttonPlcOut14.NestedClickEventPrevent = false;
@@ -1680,7 +1712,7 @@
this.buttonPlcOut11.DownImage = null;
this.buttonPlcOut11.GroupID = 0;
this.buttonPlcOut11.InitVisible = true;
- this.buttonPlcOut11.Location = new System.Drawing.Point(133, 110);
+ this.buttonPlcOut11.Location = new System.Drawing.Point(218, 113);
this.buttonPlcOut11.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonPlcOut11.Name = "buttonPlcOut11";
this.buttonPlcOut11.NestedClickEventPrevent = false;
@@ -1713,7 +1745,7 @@
this.buttonPlcOut19.DownImage = null;
this.buttonPlcOut19.GroupID = 0;
this.buttonPlcOut19.InitVisible = true;
- this.buttonPlcOut19.Location = new System.Drawing.Point(239, 110);
+ this.buttonPlcOut19.Location = new System.Drawing.Point(324, 113);
this.buttonPlcOut19.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonPlcOut19.Name = "buttonPlcOut19";
this.buttonPlcOut19.NestedClickEventPrevent = false;
@@ -1746,7 +1778,7 @@
this.buttonPlcOut4.DownImage = null;
this.buttonPlcOut4.GroupID = 0;
this.buttonPlcOut4.InitVisible = true;
- this.buttonPlcOut4.Location = new System.Drawing.Point(27, 151);
+ this.buttonPlcOut4.Location = new System.Drawing.Point(112, 154);
this.buttonPlcOut4.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonPlcOut4.Name = "buttonPlcOut4";
this.buttonPlcOut4.NestedClickEventPrevent = false;
@@ -1779,7 +1811,7 @@
this.buttonPlcOut7.DownImage = null;
this.buttonPlcOut7.GroupID = 0;
this.buttonPlcOut7.InitVisible = true;
- this.buttonPlcOut7.Location = new System.Drawing.Point(27, 274);
+ this.buttonPlcOut7.Location = new System.Drawing.Point(112, 277);
this.buttonPlcOut7.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonPlcOut7.Name = "buttonPlcOut7";
this.buttonPlcOut7.NestedClickEventPrevent = false;
@@ -1812,7 +1844,7 @@
this.buttonPlcOut15.DownImage = null;
this.buttonPlcOut15.GroupID = 0;
this.buttonPlcOut15.InitVisible = true;
- this.buttonPlcOut15.Location = new System.Drawing.Point(133, 274);
+ this.buttonPlcOut15.Location = new System.Drawing.Point(218, 277);
this.buttonPlcOut15.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonPlcOut15.Name = "buttonPlcOut15";
this.buttonPlcOut15.NestedClickEventPrevent = false;
@@ -1845,7 +1877,7 @@
this.buttonPlcOut12.DownImage = null;
this.buttonPlcOut12.GroupID = 0;
this.buttonPlcOut12.InitVisible = true;
- this.buttonPlcOut12.Location = new System.Drawing.Point(133, 151);
+ this.buttonPlcOut12.Location = new System.Drawing.Point(218, 154);
this.buttonPlcOut12.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonPlcOut12.Name = "buttonPlcOut12";
this.buttonPlcOut12.NestedClickEventPrevent = false;
@@ -1878,7 +1910,7 @@
this.buttonPlcOut20.DownImage = null;
this.buttonPlcOut20.GroupID = 0;
this.buttonPlcOut20.InitVisible = true;
- this.buttonPlcOut20.Location = new System.Drawing.Point(239, 151);
+ this.buttonPlcOut20.Location = new System.Drawing.Point(324, 154);
this.buttonPlcOut20.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonPlcOut20.Name = "buttonPlcOut20";
this.buttonPlcOut20.NestedClickEventPrevent = false;
@@ -1911,7 +1943,7 @@
this.buttonPlcOut8.DownImage = null;
this.buttonPlcOut8.GroupID = 0;
this.buttonPlcOut8.InitVisible = true;
- this.buttonPlcOut8.Location = new System.Drawing.Point(27, 315);
+ this.buttonPlcOut8.Location = new System.Drawing.Point(112, 318);
this.buttonPlcOut8.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonPlcOut8.Name = "buttonPlcOut8";
this.buttonPlcOut8.NestedClickEventPrevent = false;
@@ -1944,7 +1976,7 @@
this.buttonPlcOut1.DownImage = null;
this.buttonPlcOut1.GroupID = 0;
this.buttonPlcOut1.InitVisible = true;
- this.buttonPlcOut1.Location = new System.Drawing.Point(27, 28);
+ this.buttonPlcOut1.Location = new System.Drawing.Point(112, 31);
this.buttonPlcOut1.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonPlcOut1.Name = "buttonPlcOut1";
this.buttonPlcOut1.NestedClickEventPrevent = false;
@@ -1977,7 +2009,7 @@
this.buttonPlcOut16.DownImage = null;
this.buttonPlcOut16.GroupID = 0;
this.buttonPlcOut16.InitVisible = true;
- this.buttonPlcOut16.Location = new System.Drawing.Point(133, 315);
+ this.buttonPlcOut16.Location = new System.Drawing.Point(218, 318);
this.buttonPlcOut16.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonPlcOut16.Name = "buttonPlcOut16";
this.buttonPlcOut16.NestedClickEventPrevent = false;
@@ -2010,7 +2042,7 @@
this.buttonPlcClose.DownImage = null;
this.buttonPlcClose.GroupID = 0;
this.buttonPlcClose.InitVisible = true;
- this.buttonPlcClose.Location = new System.Drawing.Point(239, 315);
+ this.buttonPlcClose.Location = new System.Drawing.Point(324, 318);
this.buttonPlcClose.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonPlcClose.Name = "buttonPlcClose";
this.buttonPlcClose.NestedClickEventPrevent = false;
@@ -2064,17 +2096,561 @@
this.groupBoxPLC.Location = new System.Drawing.Point(810, 105);
this.groupBoxPLC.Name = "groupBoxPLC";
this.groupBoxPLC.RoundRadius = 10;
- this.groupBoxPLC.Size = new System.Drawing.Size(362, 375);
+ this.groupBoxPLC.Size = new System.Drawing.Size(483, 375);
this.groupBoxPLC.TabIndex = 208;
this.groupBoxPLC.Text = "PLC1";
this.groupBoxPLC.TextColor = System.Drawing.Color.Black;
//
+ // buttonOutput32
+ //
+ this.buttonOutput32.BackPictureBox = null;
+ this.buttonOutput32.BackPictureBox1 = null;
+ this.buttonOutput32.BackPictureBox2 = null;
+ this.buttonOutput32.ButtonColor = System.Drawing.Color.Gray;
+ this.buttonOutput32.ButtonImageAutoSize = true;
+ this.buttonOutput32.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.buttonOutput32.DisableImage = null;
+ this.buttonOutput32.DownImage = null;
+ this.buttonOutput32.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.buttonOutput32.GroupID = 0;
+ this.buttonOutput32.InitVisible = true;
+ this.buttonOutput32.Location = new System.Drawing.Point(358, 315);
+ this.buttonOutput32.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
+ this.buttonOutput32.Name = "buttonOutput32";
+ this.buttonOutput32.NestedClickEventPrevent = false;
+ this.buttonOutput32.OutlinePixel = 1;
+ this.buttonOutput32.RepeatInterval = 200;
+ this.buttonOutput32.RepeatIntervalAccelerate = null;
+ this.buttonOutput32.SafeInterval = 200;
+ this.buttonOutput32.Size = new System.Drawing.Size(100, 35);
+ this.buttonOutput32.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.buttonOutput32.TabIndex = 197;
+ this.buttonOutput32.Tag = "7732";
+ this.buttonOutput32.Text = "smartButton1";
+ this.buttonOutput32.TextColor = System.Drawing.Color.Black;
+ this.buttonOutput32.TextDownColor = System.Drawing.Color.White;
+ this.buttonOutput32.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.buttonOutput32.TextLocation = new System.Drawing.Point(0, 0);
+ this.buttonOutput32.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonOutput32.UpImage = null;
+ this.buttonOutput32.Click += new System.EventHandler(this.buttonOutput_Click);
+ //
+ // buttonOutput17
+ //
+ this.buttonOutput17.BackPictureBox = null;
+ this.buttonOutput17.BackPictureBox1 = null;
+ this.buttonOutput17.BackPictureBox2 = null;
+ this.buttonOutput17.ButtonColor = System.Drawing.Color.Gray;
+ this.buttonOutput17.ButtonImageAutoSize = true;
+ this.buttonOutput17.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.buttonOutput17.DisableImage = null;
+ this.buttonOutput17.DownImage = null;
+ this.buttonOutput17.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.buttonOutput17.GroupID = 0;
+ this.buttonOutput17.InitVisible = true;
+ this.buttonOutput17.Location = new System.Drawing.Point(252, 28);
+ this.buttonOutput17.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
+ this.buttonOutput17.Name = "buttonOutput17";
+ this.buttonOutput17.NestedClickEventPrevent = false;
+ this.buttonOutput17.OutlinePixel = 1;
+ this.buttonOutput17.RepeatInterval = 200;
+ this.buttonOutput17.RepeatIntervalAccelerate = null;
+ this.buttonOutput17.SafeInterval = 200;
+ this.buttonOutput17.Size = new System.Drawing.Size(100, 35);
+ this.buttonOutput17.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.buttonOutput17.TabIndex = 199;
+ this.buttonOutput17.Tag = "7717";
+ this.buttonOutput17.Text = "smartButton1";
+ this.buttonOutput17.TextColor = System.Drawing.Color.Black;
+ this.buttonOutput17.TextDownColor = System.Drawing.Color.White;
+ this.buttonOutput17.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.buttonOutput17.TextLocation = new System.Drawing.Point(0, 0);
+ this.buttonOutput17.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonOutput17.UpImage = null;
+ this.buttonOutput17.Click += new System.EventHandler(this.buttonOutput_Click);
+ //
+ // buttonOutput24
+ //
+ this.buttonOutput24.BackPictureBox = null;
+ this.buttonOutput24.BackPictureBox1 = null;
+ this.buttonOutput24.BackPictureBox2 = null;
+ this.buttonOutput24.ButtonColor = System.Drawing.Color.Gray;
+ this.buttonOutput24.ButtonImageAutoSize = true;
+ this.buttonOutput24.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.buttonOutput24.DisableImage = null;
+ this.buttonOutput24.DownImage = null;
+ this.buttonOutput24.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.buttonOutput24.GroupID = 0;
+ this.buttonOutput24.InitVisible = true;
+ this.buttonOutput24.Location = new System.Drawing.Point(252, 315);
+ this.buttonOutput24.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
+ this.buttonOutput24.Name = "buttonOutput24";
+ this.buttonOutput24.NestedClickEventPrevent = false;
+ this.buttonOutput24.OutlinePixel = 1;
+ this.buttonOutput24.RepeatInterval = 200;
+ this.buttonOutput24.RepeatIntervalAccelerate = null;
+ this.buttonOutput24.SafeInterval = 200;
+ this.buttonOutput24.Size = new System.Drawing.Size(100, 35);
+ this.buttonOutput24.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.buttonOutput24.TabIndex = 196;
+ this.buttonOutput24.Tag = "7724";
+ this.buttonOutput24.Text = "smartButton1";
+ this.buttonOutput24.TextColor = System.Drawing.Color.Black;
+ this.buttonOutput24.TextDownColor = System.Drawing.Color.White;
+ this.buttonOutput24.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.buttonOutput24.TextLocation = new System.Drawing.Point(0, 0);
+ this.buttonOutput24.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonOutput24.UpImage = null;
+ this.buttonOutput24.Click += new System.EventHandler(this.buttonOutput_Click);
+ //
+ // buttonOutput28
+ //
+ this.buttonOutput28.BackPictureBox = null;
+ this.buttonOutput28.BackPictureBox1 = null;
+ this.buttonOutput28.BackPictureBox2 = null;
+ this.buttonOutput28.ButtonColor = System.Drawing.Color.Gray;
+ this.buttonOutput28.ButtonImageAutoSize = true;
+ this.buttonOutput28.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.buttonOutput28.DisableImage = null;
+ this.buttonOutput28.DownImage = null;
+ this.buttonOutput28.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.buttonOutput28.GroupID = 0;
+ this.buttonOutput28.InitVisible = true;
+ this.buttonOutput28.Location = new System.Drawing.Point(358, 151);
+ this.buttonOutput28.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
+ this.buttonOutput28.Name = "buttonOutput28";
+ this.buttonOutput28.NestedClickEventPrevent = false;
+ this.buttonOutput28.OutlinePixel = 1;
+ this.buttonOutput28.RepeatInterval = 200;
+ this.buttonOutput28.RepeatIntervalAccelerate = null;
+ this.buttonOutput28.SafeInterval = 200;
+ this.buttonOutput28.Size = new System.Drawing.Size(100, 35);
+ this.buttonOutput28.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.buttonOutput28.TabIndex = 202;
+ this.buttonOutput28.Tag = "7728";
+ this.buttonOutput28.Text = "smartButton1";
+ this.buttonOutput28.TextColor = System.Drawing.Color.Black;
+ this.buttonOutput28.TextDownColor = System.Drawing.Color.White;
+ this.buttonOutput28.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.buttonOutput28.TextLocation = new System.Drawing.Point(0, 0);
+ this.buttonOutput28.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonOutput28.UpImage = null;
+ this.buttonOutput28.Click += new System.EventHandler(this.buttonOutput_Click);
+ //
+ // buttonOutput31
+ //
+ this.buttonOutput31.BackPictureBox = null;
+ this.buttonOutput31.BackPictureBox1 = null;
+ this.buttonOutput31.BackPictureBox2 = null;
+ this.buttonOutput31.ButtonColor = System.Drawing.Color.Gray;
+ this.buttonOutput31.ButtonImageAutoSize = true;
+ this.buttonOutput31.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.buttonOutput31.DisableImage = null;
+ this.buttonOutput31.DownImage = null;
+ this.buttonOutput31.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.buttonOutput31.GroupID = 0;
+ this.buttonOutput31.InitVisible = true;
+ this.buttonOutput31.Location = new System.Drawing.Point(358, 274);
+ this.buttonOutput31.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
+ this.buttonOutput31.Name = "buttonOutput31";
+ this.buttonOutput31.NestedClickEventPrevent = false;
+ this.buttonOutput31.OutlinePixel = 1;
+ this.buttonOutput31.RepeatInterval = 200;
+ this.buttonOutput31.RepeatIntervalAccelerate = null;
+ this.buttonOutput31.SafeInterval = 200;
+ this.buttonOutput31.Size = new System.Drawing.Size(100, 35);
+ this.buttonOutput31.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.buttonOutput31.TabIndex = 198;
+ this.buttonOutput31.Tag = "7731";
+ this.buttonOutput31.Text = "smartButton1";
+ this.buttonOutput31.TextColor = System.Drawing.Color.Black;
+ this.buttonOutput31.TextDownColor = System.Drawing.Color.White;
+ this.buttonOutput31.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.buttonOutput31.TextLocation = new System.Drawing.Point(0, 0);
+ this.buttonOutput31.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonOutput31.UpImage = null;
+ this.buttonOutput31.Click += new System.EventHandler(this.buttonOutput_Click);
+ //
+ // buttonOutput23
+ //
+ this.buttonOutput23.BackPictureBox = null;
+ this.buttonOutput23.BackPictureBox1 = null;
+ this.buttonOutput23.BackPictureBox2 = null;
+ this.buttonOutput23.ButtonColor = System.Drawing.Color.Gray;
+ this.buttonOutput23.ButtonImageAutoSize = true;
+ this.buttonOutput23.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.buttonOutput23.DisableImage = null;
+ this.buttonOutput23.DownImage = null;
+ this.buttonOutput23.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.buttonOutput23.GroupID = 0;
+ this.buttonOutput23.InitVisible = true;
+ this.buttonOutput23.Location = new System.Drawing.Point(252, 274);
+ this.buttonOutput23.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
+ this.buttonOutput23.Name = "buttonOutput23";
+ this.buttonOutput23.NestedClickEventPrevent = false;
+ this.buttonOutput23.OutlinePixel = 1;
+ this.buttonOutput23.RepeatInterval = 200;
+ this.buttonOutput23.RepeatIntervalAccelerate = null;
+ this.buttonOutput23.SafeInterval = 200;
+ this.buttonOutput23.Size = new System.Drawing.Size(100, 35);
+ this.buttonOutput23.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.buttonOutput23.TabIndex = 192;
+ this.buttonOutput23.Tag = "7723";
+ this.buttonOutput23.Text = "smartButton1";
+ this.buttonOutput23.TextColor = System.Drawing.Color.Black;
+ this.buttonOutput23.TextDownColor = System.Drawing.Color.White;
+ this.buttonOutput23.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.buttonOutput23.TextLocation = new System.Drawing.Point(0, 0);
+ this.buttonOutput23.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonOutput23.UpImage = null;
+ this.buttonOutput23.Click += new System.EventHandler(this.buttonOutput_Click);
+ //
+ // buttonOutput20
+ //
+ this.buttonOutput20.BackPictureBox = null;
+ this.buttonOutput20.BackPictureBox1 = null;
+ this.buttonOutput20.BackPictureBox2 = null;
+ this.buttonOutput20.ButtonColor = System.Drawing.Color.Gray;
+ this.buttonOutput20.ButtonImageAutoSize = true;
+ this.buttonOutput20.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.buttonOutput20.DisableImage = null;
+ this.buttonOutput20.DownImage = null;
+ this.buttonOutput20.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.buttonOutput20.GroupID = 0;
+ this.buttonOutput20.InitVisible = true;
+ this.buttonOutput20.Location = new System.Drawing.Point(252, 151);
+ this.buttonOutput20.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
+ this.buttonOutput20.Name = "buttonOutput20";
+ this.buttonOutput20.NestedClickEventPrevent = false;
+ this.buttonOutput20.OutlinePixel = 1;
+ this.buttonOutput20.RepeatInterval = 200;
+ this.buttonOutput20.RepeatIntervalAccelerate = null;
+ this.buttonOutput20.SafeInterval = 200;
+ this.buttonOutput20.Size = new System.Drawing.Size(100, 35);
+ this.buttonOutput20.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.buttonOutput20.TabIndex = 201;
+ this.buttonOutput20.Tag = "7720";
+ this.buttonOutput20.Text = "smartButton1";
+ this.buttonOutput20.TextColor = System.Drawing.Color.Black;
+ this.buttonOutput20.TextDownColor = System.Drawing.Color.White;
+ this.buttonOutput20.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.buttonOutput20.TextLocation = new System.Drawing.Point(0, 0);
+ this.buttonOutput20.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonOutput20.UpImage = null;
+ this.buttonOutput20.Click += new System.EventHandler(this.buttonOutput_Click);
+ //
+ // buttonOutput27
+ //
+ this.buttonOutput27.BackPictureBox = null;
+ this.buttonOutput27.BackPictureBox1 = null;
+ this.buttonOutput27.BackPictureBox2 = null;
+ this.buttonOutput27.ButtonColor = System.Drawing.Color.Gray;
+ this.buttonOutput27.ButtonImageAutoSize = true;
+ this.buttonOutput27.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.buttonOutput27.DisableImage = null;
+ this.buttonOutput27.DownImage = null;
+ this.buttonOutput27.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.buttonOutput27.GroupID = 0;
+ this.buttonOutput27.InitVisible = true;
+ this.buttonOutput27.Location = new System.Drawing.Point(358, 110);
+ this.buttonOutput27.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
+ this.buttonOutput27.Name = "buttonOutput27";
+ this.buttonOutput27.NestedClickEventPrevent = false;
+ this.buttonOutput27.OutlinePixel = 1;
+ this.buttonOutput27.RepeatInterval = 200;
+ this.buttonOutput27.RepeatIntervalAccelerate = null;
+ this.buttonOutput27.SafeInterval = 200;
+ this.buttonOutput27.Size = new System.Drawing.Size(100, 35);
+ this.buttonOutput27.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.buttonOutput27.TabIndex = 204;
+ this.buttonOutput27.Tag = "7727";
+ this.buttonOutput27.Text = "smartButton1";
+ this.buttonOutput27.TextColor = System.Drawing.Color.Black;
+ this.buttonOutput27.TextDownColor = System.Drawing.Color.White;
+ this.buttonOutput27.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.buttonOutput27.TextLocation = new System.Drawing.Point(0, 0);
+ this.buttonOutput27.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonOutput27.UpImage = null;
+ this.buttonOutput27.Click += new System.EventHandler(this.buttonOutput_Click);
+ //
+ // buttonOutput30
+ //
+ this.buttonOutput30.BackPictureBox = null;
+ this.buttonOutput30.BackPictureBox1 = null;
+ this.buttonOutput30.BackPictureBox2 = null;
+ this.buttonOutput30.ButtonColor = System.Drawing.Color.Gray;
+ this.buttonOutput30.ButtonImageAutoSize = true;
+ this.buttonOutput30.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.buttonOutput30.DisableImage = null;
+ this.buttonOutput30.DownImage = null;
+ this.buttonOutput30.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.buttonOutput30.GroupID = 0;
+ this.buttonOutput30.InitVisible = true;
+ this.buttonOutput30.Location = new System.Drawing.Point(358, 233);
+ this.buttonOutput30.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
+ this.buttonOutput30.Name = "buttonOutput30";
+ this.buttonOutput30.NestedClickEventPrevent = false;
+ this.buttonOutput30.OutlinePixel = 1;
+ this.buttonOutput30.RepeatInterval = 200;
+ this.buttonOutput30.RepeatIntervalAccelerate = null;
+ this.buttonOutput30.SafeInterval = 200;
+ this.buttonOutput30.Size = new System.Drawing.Size(100, 35);
+ this.buttonOutput30.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.buttonOutput30.TabIndex = 195;
+ this.buttonOutput30.Tag = "7730";
+ this.buttonOutput30.Text = "smartButton1";
+ this.buttonOutput30.TextColor = System.Drawing.Color.Black;
+ this.buttonOutput30.TextDownColor = System.Drawing.Color.White;
+ this.buttonOutput30.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.buttonOutput30.TextLocation = new System.Drawing.Point(0, 0);
+ this.buttonOutput30.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonOutput30.UpImage = null;
+ this.buttonOutput30.Click += new System.EventHandler(this.buttonOutput_Click);
+ //
+ // buttonOutput19
+ //
+ this.buttonOutput19.BackPictureBox = null;
+ this.buttonOutput19.BackPictureBox1 = null;
+ this.buttonOutput19.BackPictureBox2 = null;
+ this.buttonOutput19.ButtonColor = System.Drawing.Color.Gray;
+ this.buttonOutput19.ButtonImageAutoSize = true;
+ this.buttonOutput19.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.buttonOutput19.DisableImage = null;
+ this.buttonOutput19.DownImage = null;
+ this.buttonOutput19.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.buttonOutput19.GroupID = 0;
+ this.buttonOutput19.InitVisible = true;
+ this.buttonOutput19.Location = new System.Drawing.Point(252, 110);
+ this.buttonOutput19.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
+ this.buttonOutput19.Name = "buttonOutput19";
+ this.buttonOutput19.NestedClickEventPrevent = false;
+ this.buttonOutput19.OutlinePixel = 1;
+ this.buttonOutput19.RepeatInterval = 200;
+ this.buttonOutput19.RepeatIntervalAccelerate = null;
+ this.buttonOutput19.SafeInterval = 200;
+ this.buttonOutput19.Size = new System.Drawing.Size(100, 35);
+ this.buttonOutput19.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.buttonOutput19.TabIndex = 206;
+ this.buttonOutput19.Tag = "7719";
+ this.buttonOutput19.Text = "smartButton1";
+ this.buttonOutput19.TextColor = System.Drawing.Color.Black;
+ this.buttonOutput19.TextDownColor = System.Drawing.Color.White;
+ this.buttonOutput19.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.buttonOutput19.TextLocation = new System.Drawing.Point(0, 0);
+ this.buttonOutput19.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonOutput19.UpImage = null;
+ this.buttonOutput19.Click += new System.EventHandler(this.buttonOutput_Click);
+ //
+ // buttonOutput22
+ //
+ this.buttonOutput22.BackPictureBox = null;
+ this.buttonOutput22.BackPictureBox1 = null;
+ this.buttonOutput22.BackPictureBox2 = null;
+ this.buttonOutput22.ButtonColor = System.Drawing.Color.Gray;
+ this.buttonOutput22.ButtonImageAutoSize = true;
+ this.buttonOutput22.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.buttonOutput22.DisableImage = null;
+ this.buttonOutput22.DownImage = null;
+ this.buttonOutput22.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.buttonOutput22.GroupID = 0;
+ this.buttonOutput22.InitVisible = true;
+ this.buttonOutput22.Location = new System.Drawing.Point(252, 233);
+ this.buttonOutput22.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
+ this.buttonOutput22.Name = "buttonOutput22";
+ this.buttonOutput22.NestedClickEventPrevent = false;
+ this.buttonOutput22.OutlinePixel = 1;
+ this.buttonOutput22.RepeatInterval = 200;
+ this.buttonOutput22.RepeatIntervalAccelerate = null;
+ this.buttonOutput22.SafeInterval = 200;
+ this.buttonOutput22.Size = new System.Drawing.Size(100, 35);
+ this.buttonOutput22.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.buttonOutput22.TabIndex = 194;
+ this.buttonOutput22.Tag = "7722";
+ this.buttonOutput22.Text = "smartButton1";
+ this.buttonOutput22.TextColor = System.Drawing.Color.Black;
+ this.buttonOutput22.TextDownColor = System.Drawing.Color.White;
+ this.buttonOutput22.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.buttonOutput22.TextLocation = new System.Drawing.Point(0, 0);
+ this.buttonOutput22.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonOutput22.UpImage = null;
+ this.buttonOutput22.Click += new System.EventHandler(this.buttonOutput_Click);
+ //
+ // buttonOutput26
+ //
+ this.buttonOutput26.BackPictureBox = null;
+ this.buttonOutput26.BackPictureBox1 = null;
+ this.buttonOutput26.BackPictureBox2 = null;
+ this.buttonOutput26.ButtonColor = System.Drawing.Color.Gray;
+ this.buttonOutput26.ButtonImageAutoSize = true;
+ this.buttonOutput26.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.buttonOutput26.DisableImage = null;
+ this.buttonOutput26.DownImage = null;
+ this.buttonOutput26.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.buttonOutput26.GroupID = 0;
+ this.buttonOutput26.InitVisible = true;
+ this.buttonOutput26.Location = new System.Drawing.Point(358, 69);
+ this.buttonOutput26.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
+ this.buttonOutput26.Name = "buttonOutput26";
+ this.buttonOutput26.NestedClickEventPrevent = false;
+ this.buttonOutput26.OutlinePixel = 1;
+ this.buttonOutput26.RepeatInterval = 200;
+ this.buttonOutput26.RepeatIntervalAccelerate = null;
+ this.buttonOutput26.SafeInterval = 200;
+ this.buttonOutput26.Size = new System.Drawing.Size(100, 35);
+ this.buttonOutput26.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.buttonOutput26.TabIndex = 200;
+ this.buttonOutput26.Tag = "7726";
+ this.buttonOutput26.Text = "smartButton1";
+ this.buttonOutput26.TextColor = System.Drawing.Color.Black;
+ this.buttonOutput26.TextDownColor = System.Drawing.Color.White;
+ this.buttonOutput26.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.buttonOutput26.TextLocation = new System.Drawing.Point(0, 0);
+ this.buttonOutput26.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonOutput26.UpImage = null;
+ this.buttonOutput26.Click += new System.EventHandler(this.buttonOutput_Click);
+ //
+ // buttonOutput29
+ //
+ this.buttonOutput29.BackPictureBox = null;
+ this.buttonOutput29.BackPictureBox1 = null;
+ this.buttonOutput29.BackPictureBox2 = null;
+ this.buttonOutput29.ButtonColor = System.Drawing.Color.Gray;
+ this.buttonOutput29.ButtonImageAutoSize = true;
+ this.buttonOutput29.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.buttonOutput29.DisableImage = null;
+ this.buttonOutput29.DownImage = null;
+ this.buttonOutput29.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.buttonOutput29.GroupID = 0;
+ this.buttonOutput29.InitVisible = true;
+ this.buttonOutput29.Location = new System.Drawing.Point(358, 192);
+ this.buttonOutput29.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
+ this.buttonOutput29.Name = "buttonOutput29";
+ this.buttonOutput29.NestedClickEventPrevent = false;
+ this.buttonOutput29.OutlinePixel = 1;
+ this.buttonOutput29.RepeatInterval = 200;
+ this.buttonOutput29.RepeatIntervalAccelerate = null;
+ this.buttonOutput29.SafeInterval = 200;
+ this.buttonOutput29.Size = new System.Drawing.Size(100, 35);
+ this.buttonOutput29.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.buttonOutput29.TabIndex = 191;
+ this.buttonOutput29.Tag = "7729";
+ this.buttonOutput29.Text = "smartButton1";
+ this.buttonOutput29.TextColor = System.Drawing.Color.Black;
+ this.buttonOutput29.TextDownColor = System.Drawing.Color.White;
+ this.buttonOutput29.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.buttonOutput29.TextLocation = new System.Drawing.Point(0, 0);
+ this.buttonOutput29.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonOutput29.UpImage = null;
+ this.buttonOutput29.Click += new System.EventHandler(this.buttonOutput_Click);
+ //
+ // buttonOutput18
+ //
+ this.buttonOutput18.BackPictureBox = null;
+ this.buttonOutput18.BackPictureBox1 = null;
+ this.buttonOutput18.BackPictureBox2 = null;
+ this.buttonOutput18.ButtonColor = System.Drawing.Color.Gray;
+ this.buttonOutput18.ButtonImageAutoSize = true;
+ this.buttonOutput18.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.buttonOutput18.DisableImage = null;
+ this.buttonOutput18.DownImage = null;
+ this.buttonOutput18.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.buttonOutput18.GroupID = 0;
+ this.buttonOutput18.InitVisible = true;
+ this.buttonOutput18.Location = new System.Drawing.Point(252, 69);
+ this.buttonOutput18.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
+ this.buttonOutput18.Name = "buttonOutput18";
+ this.buttonOutput18.NestedClickEventPrevent = false;
+ this.buttonOutput18.OutlinePixel = 1;
+ this.buttonOutput18.RepeatInterval = 200;
+ this.buttonOutput18.RepeatIntervalAccelerate = null;
+ this.buttonOutput18.SafeInterval = 200;
+ this.buttonOutput18.Size = new System.Drawing.Size(100, 35);
+ this.buttonOutput18.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.buttonOutput18.TabIndex = 203;
+ this.buttonOutput18.Tag = "7718";
+ this.buttonOutput18.Text = "smartButton1";
+ this.buttonOutput18.TextColor = System.Drawing.Color.Black;
+ this.buttonOutput18.TextDownColor = System.Drawing.Color.White;
+ this.buttonOutput18.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.buttonOutput18.TextLocation = new System.Drawing.Point(0, 0);
+ this.buttonOutput18.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonOutput18.UpImage = null;
+ this.buttonOutput18.Click += new System.EventHandler(this.buttonOutput_Click);
+ //
+ // buttonOutput21
+ //
+ this.buttonOutput21.BackPictureBox = null;
+ this.buttonOutput21.BackPictureBox1 = null;
+ this.buttonOutput21.BackPictureBox2 = null;
+ this.buttonOutput21.ButtonColor = System.Drawing.Color.Gray;
+ this.buttonOutput21.ButtonImageAutoSize = true;
+ this.buttonOutput21.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.buttonOutput21.DisableImage = null;
+ this.buttonOutput21.DownImage = null;
+ this.buttonOutput21.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.buttonOutput21.GroupID = 0;
+ this.buttonOutput21.InitVisible = true;
+ this.buttonOutput21.Location = new System.Drawing.Point(252, 192);
+ this.buttonOutput21.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
+ this.buttonOutput21.Name = "buttonOutput21";
+ this.buttonOutput21.NestedClickEventPrevent = false;
+ this.buttonOutput21.OutlinePixel = 1;
+ this.buttonOutput21.RepeatInterval = 200;
+ this.buttonOutput21.RepeatIntervalAccelerate = null;
+ this.buttonOutput21.SafeInterval = 200;
+ this.buttonOutput21.Size = new System.Drawing.Size(100, 35);
+ this.buttonOutput21.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.buttonOutput21.TabIndex = 193;
+ this.buttonOutput21.Tag = "7721";
+ this.buttonOutput21.Text = "smartButton1";
+ this.buttonOutput21.TextColor = System.Drawing.Color.Black;
+ this.buttonOutput21.TextDownColor = System.Drawing.Color.White;
+ this.buttonOutput21.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.buttonOutput21.TextLocation = new System.Drawing.Point(0, 0);
+ this.buttonOutput21.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonOutput21.UpImage = null;
+ this.buttonOutput21.Click += new System.EventHandler(this.buttonOutput_Click);
+ //
+ // buttonOutput25
+ //
+ this.buttonOutput25.BackPictureBox = null;
+ this.buttonOutput25.BackPictureBox1 = null;
+ this.buttonOutput25.BackPictureBox2 = null;
+ this.buttonOutput25.ButtonColor = System.Drawing.Color.Gray;
+ this.buttonOutput25.ButtonImageAutoSize = true;
+ this.buttonOutput25.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.buttonOutput25.DisableImage = null;
+ this.buttonOutput25.DownImage = null;
+ this.buttonOutput25.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.buttonOutput25.GroupID = 0;
+ this.buttonOutput25.InitVisible = true;
+ this.buttonOutput25.Location = new System.Drawing.Point(358, 28);
+ this.buttonOutput25.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
+ this.buttonOutput25.Name = "buttonOutput25";
+ this.buttonOutput25.NestedClickEventPrevent = false;
+ this.buttonOutput25.OutlinePixel = 1;
+ this.buttonOutput25.RepeatInterval = 200;
+ this.buttonOutput25.RepeatIntervalAccelerate = null;
+ this.buttonOutput25.SafeInterval = 200;
+ this.buttonOutput25.Size = new System.Drawing.Size(100, 35);
+ this.buttonOutput25.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.buttonOutput25.TabIndex = 205;
+ this.buttonOutput25.Tag = "7725";
+ this.buttonOutput25.Text = "smartButton1";
+ this.buttonOutput25.TextColor = System.Drawing.Color.Black;
+ this.buttonOutput25.TextDownColor = System.Drawing.Color.White;
+ this.buttonOutput25.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.buttonOutput25.TextLocation = new System.Drawing.Point(0, 0);
+ this.buttonOutput25.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonOutput25.UpImage = null;
+ this.buttonOutput25.Click += new System.EventHandler(this.buttonOutput_Click);
+ //
// FormIOTest
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.AutoScroll = true;
- this.ClientSize = new System.Drawing.Size(803, 620);
+ this.ClientSize = new System.Drawing.Size(800, 600);
this.Controls.Add(this.groupBoxPLC);
this.Controls.Add(this.buttonPLC1);
this.Controls.Add(this.smartGroupBox2);
@@ -2174,5 +2750,21 @@
private SmartX.SmartButton buttonPlcOut16;
private SmartX.SmartButton buttonPlcClose;
private SmartX.SmartGroupBox groupBoxPLC;
+ private SmartX.SmartButton buttonOutput32;
+ private SmartX.SmartButton buttonOutput17;
+ private SmartX.SmartButton buttonOutput24;
+ private SmartX.SmartButton buttonOutput28;
+ private SmartX.SmartButton buttonOutput31;
+ private SmartX.SmartButton buttonOutput23;
+ private SmartX.SmartButton buttonOutput20;
+ private SmartX.SmartButton buttonOutput27;
+ private SmartX.SmartButton buttonOutput30;
+ private SmartX.SmartButton buttonOutput19;
+ private SmartX.SmartButton buttonOutput22;
+ private SmartX.SmartButton buttonOutput26;
+ private SmartX.SmartButton buttonOutput29;
+ private SmartX.SmartButton buttonOutput18;
+ private SmartX.SmartButton buttonOutput21;
+ private SmartX.SmartButton buttonOutput25;
}
}
\ No newline at end of file
diff --git a/INT69DB_2A/Forms/FormIOTest.cs b/INT69DB_2A/Forms/FormIOTest.cs
index e2c96dd..6bf19da 100644
--- a/INT69DB_2A/Forms/FormIOTest.cs
+++ b/INT69DB_2A/Forms/FormIOTest.cs
@@ -85,7 +85,7 @@ namespace INT69DB_2A.Forms
this.buttonInputRead.ButtonUp();
this.timer.Enabled = false;
- this.groupBoxPLC.Location = new Point(50, 105);
+ this.groupBoxPLC.Location = new Point(16, 108);
this.groupBoxPLC.Visible = false;
}
private void DefaultSetting()
@@ -149,12 +149,28 @@ namespace INT69DB_2A.Forms
this.CollectionOutputButton.Add(this.buttonOutput14);
this.CollectionOutputButton.Add(this.buttonOutput15);
this.CollectionOutputButton.Add(this.buttonOutput16);
+ this.CollectionOutputButton.Add(this.buttonOutput17);
+ this.CollectionOutputButton.Add(this.buttonOutput18);
+ this.CollectionOutputButton.Add(this.buttonOutput19);
+ this.CollectionOutputButton.Add(this.buttonOutput20);
+ this.CollectionOutputButton.Add(this.buttonOutput21);
+ this.CollectionOutputButton.Add(this.buttonOutput22);
+ this.CollectionOutputButton.Add(this.buttonOutput23);
+ this.CollectionOutputButton.Add(this.buttonOutput24);
+ this.CollectionOutputButton.Add(this.buttonOutput25);
+ this.CollectionOutputButton.Add(this.buttonOutput26);
+ this.CollectionOutputButton.Add(this.buttonOutput27);
+ this.CollectionOutputButton.Add(this.buttonOutput28);
+ this.CollectionOutputButton.Add(this.buttonOutput29);
+ this.CollectionOutputButton.Add(this.buttonOutput30);
+ this.CollectionOutputButton.Add(this.buttonOutput31);
+ this.CollectionOutputButton.Add(this.buttonOutput32);
for (int i = 0; i < this.CollectionInputLabelName.Count; i++)
- {
this.CollectionInputLabelName[i].Text = string.Format("IN{0}", i + 1);
+
+ for (int i = 0; i < this.CollectionOutputButton.Count; i++)
this.CollectionOutputButton[i].Text = string.Format("OUT{0}", i + 1);
- }
//if (this.ParentForm.SystemConfig.EquipmentMode == 0)
//{
diff --git a/INT69DB_2A/Forms/FormInformation.cs b/INT69DB_2A/Forms/FormInformation.cs
index 3632e20..40e404c 100644
--- a/INT69DB_2A/Forms/FormInformation.cs
+++ b/INT69DB_2A/Forms/FormInformation.cs
@@ -107,7 +107,7 @@ namespace INT69DB_2A.Forms
}
private void DefaultSetting()
{
- this.labelDisplayVer.Text = "5.2.1";
+ this.labelDisplayVer.Text = "5.3.0";
this.labelUserMgerVer.Text = "";
this.labelAes128Ver.Text = "";
this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber;
diff --git a/INT69DB_2A/Forms/FormMain.cs b/INT69DB_2A/Forms/FormMain.cs
index 633dc68..99a2030 100644
--- a/INT69DB_2A/Forms/FormMain.cs
+++ b/INT69DB_2A/Forms/FormMain.cs
@@ -17,6 +17,7 @@ using INT69DB_2A.DialogForms;
using INT69DB_2A_ImageDll;
using INT69DB_2A.Part11_Encryption;
using INT69DB_2A.Part11_UserManager;
+using INT69DB_2A.SerialManger;
namespace INT69DB_2A.Forms
{
@@ -40,6 +41,9 @@ namespace INT69DB_2A.Forms
private bool IsTimerWaitResponseEnableTrue;
public int FlagAutomaticLogoutWarningTime; //Part11 Auto Logout
public bool IsLogProcessing;
+ public string ComPortMainToLCD; // DllSerial Port
+ public bool FlagSerialDll = false;
+ private string TransferNum;
// Motor Download 통신용 변수
public int LineNum;
@@ -437,6 +441,7 @@ namespace INT69DB_2A.Forms
this.ColorLogOff = Color.Red;
this.ColorLogOn = Color.Yellow;
this.IsLogProcessing = false;
+ this.TransferNum = "-";
this.PathLaunchFolder = "SD Card\\";
this.PathSystemFileFolder1 = this.PathLaunchFolder + "SystemFile1\\";
@@ -545,7 +550,60 @@ namespace INT69DB_2A.Forms
this.EthernetClientDisconnect();
this.CurrentAlarmTotalPassCnt = new Counter(this.SystemConfig.EquipmentColumns, this.SystemConfig.AlarmTotalPassCnt);
+
+ if (this.FlagSerialDll == true)
+ {
+ // SerialDll Initialize
+ this.ComPortMainToLCD = "COM2:";
+ SerialMgrComm.IntializeSerialManager();
+ SerialMgrComm.SerialPortErrMessageReceive += this.SerialPort_MessageReceive;
+ SerialMgrComm.SerialPortErrMessageReceive += this.SerialPort_ErrMessageReceive;
+ }
}
+ private bool UI_Invoke(ThreadStart invoker)
+ {
+ try
+ {
+ if (this.InvokeRequired)
+ {
+ if (this.IsDisposed)
+ return true;
+
+ this.Invoke(invoker);
+ }
+ else
+ {
+ invoker();
+ }
+
+ return true;
+
+ }
+ catch (Exception e)
+ {
+ return false;
+ }
+
+ }
+ private void SerialPort_MessageReceive(object data)
+ {
+ this.UI_Invoke(delegate
+ {
+ this.SerialReceiveData(data.ToString());
+
+ if (this.IsCommunicationLogOpen == true)
+ this.smartFileCommunicationLog.WriteString(string.Format("Receive ({0:yyyy-MM-dd HH:mm:ss}): {1})", DateTime.Now, data.ToString()));
+ });
+ }
+ private void SerialPort_ErrMessageReceive(object data)
+ {
+ this.UI_Invoke(delegate
+ {
+ if (this.IsCommunicationLogOpen == true)
+ this.smartFileCommunicationLog.WriteString(string.Format("Receive ({0:yyyy-MM-dd HH:mm:ss}): {1} : Dll(Err MSG)", DateTime.Now, data));
+ });
+ }
+
private void InitializeUserManager()
{
UserManager.UserListNewDataEvent += this.UserManager_UserListNewDataEvent;
@@ -578,31 +636,6 @@ namespace INT69DB_2A.Forms
Encryption.InitializeEncryption();
}
- private bool UI_Invoke(ThreadStart invoker)
- {
- try
- {
- if (this.InvokeRequired)
- {
- if (this.IsDisposed)
- return true;
-
- this.Invoke(invoker);
- }
- else
- {
- invoker();
- }
-
- return true;
-
- }
- catch (Exception e)
- {
- return false;
- }
-
- }
private void TrasferSystemParameter(SystemConfigurationItem item)
{
@@ -3585,15 +3618,24 @@ namespace INT69DB_2A.Forms
try
{
- if (this.smartSerialPortLink.IsOpen == false)
- this.smartSerialPortLink.Open();
+ if (this.FlagSerialDll == false)
+ {
+ if (this.smartSerialPortLink.IsOpen == false)
+ this.smartSerialPortLink.Open();
+ }
+ else
+ {
+ // Port : COM2
+ // Baudrate : 115200
+ SerialMgrComm.serialPortOpen(this.ComPortMainToLCD, 115200, 0, 0, 8);
+ }
}
catch
{
}
#region Test 용 통신 로그
- fullPath = this.PathDataBackupFolder + "Communicationlog.txt";
+ fullPath = this.PathDataBackupFolder + "INT69DB_2A_Communicationlog.txt";
this.smartFileCommunicationLog.FilePathName = fullPath;
//this.smartFileCommunicationLog.Open();
//this.IsCommunicationLogOpen = true;
@@ -3606,7 +3648,10 @@ namespace INT69DB_2A.Forms
}
public void CloseSmartUartLink()
{
- this.smartSerialPortLink.Close();
+ if (this.FlagSerialDll == false)
+ this.smartSerialPortLink.Close();
+ else
+ SerialMgrComm.serialPortClose(this.ComPortMainToLCD);
}
private bool SizeCheck(string cmd, string strTemp)
@@ -3812,8 +3857,13 @@ namespace INT69DB_2A.Forms
sb.Append(chkSum);
- if (this.smartSerialPortLink.IsOpen == true)
- this.smartSerialPortLink.WriteFrame(sb.ToString(), SmartSerialPort.CODETYPES.ASCIICODE);
+ if (this.FlagSerialDll == false)
+ {
+ if (this.smartSerialPortLink.IsOpen == true)
+ this.smartSerialPortLink.WriteFrame(sb.ToString(), SmartSerialPort.CODETYPES.ASCIICODE);
+ }
+ else
+ SerialMgrComm.serialPortMessage(this.ComPortMainToLCD, sb.ToString());
// 통신 확인 로그
if (this.IsCommunicationLogOpen == true)
@@ -3886,9 +3936,14 @@ namespace INT69DB_2A.Forms
byteData = new byte[byteCollection.Count];
for (int i = 0; i < byteCollection.Count; i++)
byteData[i] = byteCollection[i];
-
- if (this.smartSerialPortLink.IsOpen == true)
- this.smartSerialPortLink.WriteFrame(byteData);
+
+ if (this.FlagSerialDll == false)
+ {
+ if (this.smartSerialPortLink.IsOpen == true)
+ this.smartSerialPortLink.WriteFrame(byteData);
+ }
+ else
+ SerialMgrComm.serialPortMessageByte(this.ComPortMainToLCD, byteData, byteData.Length);
// 통신 확인 로그
if (this.IsCommunicationLogOpen == true)
@@ -3918,9 +3973,14 @@ namespace INT69DB_2A.Forms
chkSum = this.Checksumcalculator(sb.ToString());
sb.Append(chkSum);
-
- if (this.smartSerialPortLink.IsOpen == true)
- this.smartSerialPortLink.WriteFrame(sb.ToString(), SmartSerialPort.CODETYPES.ASCIICODE);
+
+ if (this.FlagSerialDll == false)
+ {
+ if (this.smartSerialPortLink.IsOpen == true)
+ this.smartSerialPortLink.WriteFrame(sb.ToString(), SmartSerialPort.CODETYPES.ASCIICODE);
+ }
+ else
+ SerialMgrComm.serialPortMessage(this.ComPortMainToLCD, sb.ToString());
// 통신 확인 로그
if (this.IsCommunicationLogOpen == true)
@@ -3928,6 +3988,9 @@ namespace INT69DB_2A.Forms
return ret;
}
+ ///
+ /// 재전송 기능 미사용 시 사용
+ ///
private void ReceiveData()
{
int ret = 0;
@@ -3975,6 +4038,39 @@ namespace INT69DB_2A.Forms
{
}
}
+ ///
+ /// 재전송 기능 사용 시 사용
+ ///
+ /// 수신 데이터
+ private void ReceiveData(string strTemp)
+ {
+ int ret = 0;
+ byte[] readByte;
+
+ try
+ {
+ switch (strTemp[0])
+ {
+ case 'C':
+ if ((ret = this.ReceiveCommandC(strTemp)) != 0)
+ return;
+ break;
+ case 'P':
+ if ((ret = this.ReceiveCommandP(strTemp)) != 0)
+ return;
+ break;
+ case 'S':
+ if ((ret = this.ReceiveCommandS(strTemp)) != 0)
+ return;
+ break;
+ default:
+ break;
+ }
+ }
+ catch
+ {
+ }
+ }
private int ReceiveCommandC(string strTemp)
{
@@ -4112,6 +4208,7 @@ namespace INT69DB_2A.Forms
{
int ret = 0;
string cmd = "", lane = "", receiveData = "";
+ string transferNum = "";
// SIZE 확인
if (this.SizeCheck("S", strTemp) == false)
@@ -4134,7 +4231,8 @@ namespace INT69DB_2A.Forms
if (this.IsCommunicationLogOpen == true)
this.smartFileCommunicationLog.WriteString(string.Format("Receive ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, strTemp));
- cmd = strTemp.Substring(0, 3);
+ cmd = strTemp.Substring(0, 3);
+ transferNum = strTemp.Substring(3, 1);
lane = strTemp.Substring(5, 1);
receiveData = strTemp.Substring(10, strTemp.Length - 12);
@@ -4145,6 +4243,11 @@ namespace INT69DB_2A.Forms
return ret;
break;
case "SR0":
+ if (this.TransferNum != transferNum)
+ this.TransferNum = transferNum;
+ else
+ return ret = -1;
+
if ((ret = this.ReceiveCommandSR0(lane, receiveData)) != 0)
return ret;
break;
@@ -8374,6 +8477,22 @@ namespace INT69DB_2A.Forms
this.CommunicationCheckCount += 1;
}
}
+ private void SerialReceiveData(string data)
+ {
+ this.ReceiveData(data);
+
+ // 통신 확인
+ if (this.CommunicationCheckCount / 3 == 1)
+ {
+ this.ChildFormMainDisplay.pictureBoxCommunicationStatus.Visible = true;
+ this.CommunicationCheckCount = 0;
+ }
+ else
+ {
+ this.ChildFormMainDisplay.pictureBoxCommunicationStatus.Visible = false;
+ this.CommunicationCheckCount += 1;
+ }
+ }
private void timerWaitResponse_Tick(object sender, EventArgs e)
{
diff --git a/INT69DB_2A/Forms/FormMotorSetting.Designer.cs b/INT69DB_2A/Forms/FormMotorSetting.Designer.cs
index c649b31..24a17f4 100644
--- a/INT69DB_2A/Forms/FormMotorSetting.Designer.cs
+++ b/INT69DB_2A/Forms/FormMotorSetting.Designer.cs
@@ -126,6 +126,7 @@
this.buttonCom1TestForward = new SmartX.SmartButton();
this.buttonCom1TestReverse = new SmartX.SmartButton();
this.panel1 = new System.Windows.Forms.Panel();
+ this.radioButtonImpellerMotorAngle360 = new SmartX.SmartRadioButton();
((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
this.groupBoxSelectImpeller.SuspendLayout();
this.groupBoxEach.SuspendLayout();
@@ -1023,6 +1024,7 @@
//
this.groupBoxAngle.BackPictureBox = this.smartForm1;
this.groupBoxAngle.BackPictureBox1 = null;
+ this.groupBoxAngle.Controls.Add(this.radioButtonImpellerMotorAngle360);
this.groupBoxAngle.Controls.Add(this.labelTitleStep2);
this.groupBoxAngle.Controls.Add(this.labelTitleStep1);
this.groupBoxAngle.Controls.Add(this.radioButtonImpellerMotorAngle60);
@@ -1104,7 +1106,7 @@
this.radioButtonImpellerMotorAngle60.ImageCheckRadioButton = null;
this.radioButtonImpellerMotorAngle60.ImageUnCheckRadioButton = null;
this.radioButtonImpellerMotorAngle60.InitVisible = true;
- this.radioButtonImpellerMotorAngle60.Location = new System.Drawing.Point(102, 42);
+ this.radioButtonImpellerMotorAngle60.Location = new System.Drawing.Point(102, 37);
this.radioButtonImpellerMotorAngle60.Name = "radioButtonImpellerMotorAngle60";
this.radioButtonImpellerMotorAngle60.OutputOnly = false;
this.radioButtonImpellerMotorAngle60.RadioBackColor = System.Drawing.Color.White;
@@ -1130,7 +1132,7 @@
this.radioButtonImpellerMotorAngle180.ImageCheckRadioButton = null;
this.radioButtonImpellerMotorAngle180.ImageUnCheckRadioButton = null;
this.radioButtonImpellerMotorAngle180.InitVisible = true;
- this.radioButtonImpellerMotorAngle180.Location = new System.Drawing.Point(360, 42);
+ this.radioButtonImpellerMotorAngle180.Location = new System.Drawing.Point(102, 69);
this.radioButtonImpellerMotorAngle180.Name = "radioButtonImpellerMotorAngle180";
this.radioButtonImpellerMotorAngle180.OutputOnly = false;
this.radioButtonImpellerMotorAngle180.RadioBackColor = System.Drawing.Color.White;
@@ -1156,7 +1158,7 @@
this.radioButtonImpellerMotorAngle120.ImageCheckRadioButton = null;
this.radioButtonImpellerMotorAngle120.ImageUnCheckRadioButton = null;
this.radioButtonImpellerMotorAngle120.InitVisible = true;
- this.radioButtonImpellerMotorAngle120.Location = new System.Drawing.Point(274, 42);
+ this.radioButtonImpellerMotorAngle120.Location = new System.Drawing.Point(274, 37);
this.radioButtonImpellerMotorAngle120.Name = "radioButtonImpellerMotorAngle120";
this.radioButtonImpellerMotorAngle120.OutputOnly = false;
this.radioButtonImpellerMotorAngle120.RadioBackColor = System.Drawing.Color.White;
@@ -1182,7 +1184,7 @@
this.radioButtonImpellerMotorAngle90.ImageCheckRadioButton = null;
this.radioButtonImpellerMotorAngle90.ImageUnCheckRadioButton = null;
this.radioButtonImpellerMotorAngle90.InitVisible = true;
- this.radioButtonImpellerMotorAngle90.Location = new System.Drawing.Point(188, 42);
+ this.radioButtonImpellerMotorAngle90.Location = new System.Drawing.Point(188, 37);
this.radioButtonImpellerMotorAngle90.Name = "radioButtonImpellerMotorAngle90";
this.radioButtonImpellerMotorAngle90.OutputOnly = false;
this.radioButtonImpellerMotorAngle90.RadioBackColor = System.Drawing.Color.White;
@@ -2512,6 +2514,32 @@
this.panel1.Size = new System.Drawing.Size(800, 348);
this.panel1.Visible = false;
//
+ // radioButtonImpellerMotorAngle360
+ //
+ this.radioButtonImpellerMotorAngle360.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(228)))), ((int)(((byte)(180)))));
+ this.radioButtonImpellerMotorAngle360.BackPictureBox = null;
+ this.radioButtonImpellerMotorAngle360.BackPictureBox1 = null;
+ this.radioButtonImpellerMotorAngle360.BackPictureBox2 = null;
+ this.radioButtonImpellerMotorAngle360.Checked = false;
+ this.radioButtonImpellerMotorAngle360.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold);
+ this.radioButtonImpellerMotorAngle360.GroupID = 0;
+ this.radioButtonImpellerMotorAngle360.ImageCheckRadioButton = null;
+ this.radioButtonImpellerMotorAngle360.ImageUnCheckRadioButton = null;
+ this.radioButtonImpellerMotorAngle360.InitVisible = true;
+ this.radioButtonImpellerMotorAngle360.Location = new System.Drawing.Point(188, 69);
+ this.radioButtonImpellerMotorAngle360.Name = "radioButtonImpellerMotorAngle360";
+ this.radioButtonImpellerMotorAngle360.OutputOnly = false;
+ this.radioButtonImpellerMotorAngle360.RadioBackColor = System.Drawing.Color.White;
+ this.radioButtonImpellerMotorAngle360.RadioCheckColor = System.Drawing.Color.Green;
+ this.radioButtonImpellerMotorAngle360.RadioForeColor = System.Drawing.Color.Black;
+ this.radioButtonImpellerMotorAngle360.RadioSymbolSize = 14;
+ this.radioButtonImpellerMotorAngle360.Shadow = false;
+ this.radioButtonImpellerMotorAngle360.Size = new System.Drawing.Size(80, 26);
+ this.radioButtonImpellerMotorAngle360.TabIndex = 274;
+ this.radioButtonImpellerMotorAngle360.Text = "360";
+ this.radioButtonImpellerMotorAngle360.TextVAlign = SmartX.SmartRadioButton.TextVerAlign.Middle;
+ this.radioButtonImpellerMotorAngle360.Click += new System.EventHandler(this.radioButtonImpellerMotorAngle_Click);
+ //
// FormMotorSetting
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -2645,5 +2673,6 @@
private SmartX.SmartButton buttonCom1TestForward;
private SmartX.SmartButton buttonCom1TestReverse;
private System.Windows.Forms.Panel panel1;
+ private SmartX.SmartRadioButton radioButtonImpellerMotorAngle360;
}
}
\ No newline at end of file
diff --git a/INT69DB_2A/Forms/FormMotorSetting.cs b/INT69DB_2A/Forms/FormMotorSetting.cs
index 5b27189..445992c 100644
--- a/INT69DB_2A/Forms/FormMotorSetting.cs
+++ b/INT69DB_2A/Forms/FormMotorSetting.cs
@@ -970,6 +970,7 @@ namespace INT69DB_2A.Forms
this.radioButtonImpellerMotorAngle90.Click -= new EventHandler(this.radioButtonImpellerMotorAngle_Click);
this.radioButtonImpellerMotorAngle120.Click -= new EventHandler(this.radioButtonImpellerMotorAngle_Click);
this.radioButtonImpellerMotorAngle180.Click -= new EventHandler(this.radioButtonImpellerMotorAngle_Click);
+ this.radioButtonImpellerMotorAngle360.Click -= new EventHandler(this.radioButtonImpellerMotorAngle_Click);
this.comboBoxTwoStepPassAngle.SelectedIndexChanged -= new EventHandler(this.comboBoxTwoStepPassAngle_SelectedIndexChanged);
this.comboBoxTwoStepNGAngle.SelectedIndexChanged -= new EventHandler(this.comboBoxTwoStepNGAngle_SelectedIndexChanged);
@@ -992,6 +993,8 @@ namespace INT69DB_2A.Forms
this.radioButtonImpellerMotorAngle90.Checked = true;
else if (this.ParentForm.SystemConfig.ImpellerMotorAnglePass == 3)
this.radioButtonImpellerMotorAngle120.Checked = true;
+ else if (this.ParentForm.SystemConfig.ImpellerMotorAnglePass == 13)
+ this.radioButtonImpellerMotorAngle360.Checked = true;
else
{
this.radioButtonImpellerMotorAngle180.Checked = true;
@@ -1019,6 +1022,7 @@ namespace INT69DB_2A.Forms
this.radioButtonImpellerMotorAngle90.Click += new EventHandler(this.radioButtonImpellerMotorAngle_Click);
this.radioButtonImpellerMotorAngle120.Click += new EventHandler(this.radioButtonImpellerMotorAngle_Click);
this.radioButtonImpellerMotorAngle180.Click += new EventHandler(this.radioButtonImpellerMotorAngle_Click);
+ this.radioButtonImpellerMotorAngle360.Click += new EventHandler(this.radioButtonImpellerMotorAngle_Click);
this.comboBoxTwoStepPassAngle.SelectedIndexChanged += new EventHandler(this.comboBoxTwoStepPassAngle_SelectedIndexChanged);
this.comboBoxTwoStepNGAngle.SelectedIndexChanged += new EventHandler(this.comboBoxTwoStepNGAngle_SelectedIndexChanged);
@@ -2327,6 +2331,11 @@ namespace INT69DB_2A.Forms
else
this.ParentForm.SystemConfig.ImpellerMotorAngleNG = this.comboBoxTwoStepNGAngle.SelectedIndex + 5;
}
+ else if (this.radioButtonImpellerMotorAngle360.Checked == true)
+ {
+ this.ParentForm.SystemConfig.ImpellerMotorAnglePass = 13;
+ this.ParentForm.SystemConfig.ImpellerMotorAngleNG = 13;
+ }
afterAnglePass = this.ReturnAngle(this.ParentForm.SystemConfig.ImpellerMotorAnglePass);
afterAngleNG = this.ReturnAngle(this.ParentForm.SystemConfig.ImpellerMotorAngleNG);
diff --git a/INT69DB_2A/Forms/FormUserEditor.cs b/INT69DB_2A/Forms/FormUserEditor.cs
index 4a24cdf..4b81e1d 100644
--- a/INT69DB_2A/Forms/FormUserEditor.cs
+++ b/INT69DB_2A/Forms/FormUserEditor.cs
@@ -290,8 +290,7 @@ namespace INT69DB_2A.Forms
if (this.SelectedUserItem.Group == DataStore.UserGroup.Admin)
{
- if (this.ParentForm.SystemConfig.IsPart11 == true)
- item.ActiveLevel = 9;
+ item.ActiveLevel = 9;
}
else
{
diff --git a/INT69DB_2A/INT69DB_2A.csproj b/INT69DB_2A/INT69DB_2A.csproj
index 8fb064a..6d38dd1 100644
--- a/INT69DB_2A/INT69DB_2A.csproj
+++ b/INT69DB_2A/INT69DB_2A.csproj
@@ -766,6 +766,9 @@
Resources.resx
True
+
+
+
diff --git a/INT69DB_2A/SerialManager/SerialManager.Define.cs b/INT69DB_2A/SerialManager/SerialManager.Define.cs
new file mode 100644
index 0000000..73f1bd7
--- /dev/null
+++ b/INT69DB_2A/SerialManager/SerialManager.Define.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
+
+
+namespace INT69DB_2A.SerialManger
+{
+ public partial class SerialMgrComm
+ {
+ private const string PathDll = "SD Card\\Run\\DllSerialMgr.dll";
+
+ public delegate void fnSerialVersionCB(StringBuilder pVersion);
+ public static fnSerialVersionCB fnSerialVersionCallback;
+
+ public delegate void fnSerialMgrDebugCB(int level, StringBuilder pMessage);
+ public static fnSerialMgrDebugCB fnSerialMgrDebugCallback;
+
+ public delegate void fnSerialMgrPortConnectCB(StringBuilder commPort, int status, int errDetail);
+ public static fnSerialMgrPortConnectCB fnSerialMgrPortConnectCallback;
+
+ public delegate void fnSerialMgrRcvPacketCB(StringBuilder commPort, IntPtr pData, int length);
+ public static fnSerialMgrRcvPacketCB fnSerialMgrRcvPacketCallback;
+
+ public delegate void fnSerialMgrRcvErrPacketCB(StringBuilder commPort, IntPtr pData, int length);
+ public static fnSerialMgrRcvErrPacketCB fnSerialMgrRcvErrPacketCallback;
+
+ [DllImport(PathDll, CallingConvention = CallingConvention.Winapi)]
+ public static extern void DLL_SerialMgr_Register_DebugCB(fnSerialMgrDebugCB func);
+
+ [DllImport(PathDll, CallingConvention = CallingConvention.Winapi)]
+ public static extern void DLL_SerialMgr_Register_ConnectCB(fnSerialMgrPortConnectCB func);
+
+ [DllImport(PathDll, CallingConvention = CallingConvention.Winapi)]
+ public static extern void DLL_SerialMgr_Register_VersionCB(fnSerialVersionCB func);
+
+ [DllImport(PathDll, CallingConvention = CallingConvention.Winapi)]
+ public static extern void DLL_SerialMgr_Register_RcvPacketCB(fnSerialMgrRcvPacketCB func);
+
+ [DllImport(PathDll, CallingConvention = CallingConvention.Winapi)]
+ public static extern void DLL_SerialMgr_Register_RcvErrPacketCB(fnSerialMgrRcvErrPacketCB func);
+
+ [DllImport(PathDll, CallingConvention = CallingConvention.Winapi)]
+ public static extern void DLL_SerialMgr_HelloWorld();
+
+ [DllImport(PathDll, CallingConvention = CallingConvention.Winapi)]
+ public static extern void DLL_SerialMgr_Getversion();
+
+ [DllImport(PathDll, CallingConvention = CallingConvention.Winapi)]
+ public static extern void DLL_SerialMgr_Activation();
+
+ [DllImport(PathDll, CallingConvention = CallingConvention.Winapi)]
+ public static extern void DLL_SerialMgr_Deactivation();
+
+ [DllImport(PathDll, CallingConvention = CallingConvention.Winapi)]
+ public static extern int DLL_SerialMgr_PortOpen(IntPtr commPort, int BaudRate, int StopBit, int Parity, int DataBit);
+
+ [DllImport(PathDll, CallingConvention = CallingConvention.Winapi)]
+ public static extern int DLL_SerialMgr_PortClose(IntPtr commPort);
+
+ [DllImport(PathDll, CallingConvention = CallingConvention.Winapi)]
+ public static extern int DLL_SerialMgr_PortSendMsg(IntPtr commPort, IntPtr pData, int Length);
+
+ }
+}
diff --git a/INT69DB_2A/SerialManager/SerialManager.Structure.cs b/INT69DB_2A/SerialManager/SerialManager.Structure.cs
new file mode 100644
index 0000000..a2b29b2
--- /dev/null
+++ b/INT69DB_2A/SerialManager/SerialManager.Structure.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading;
+
+namespace INT69DB_2A.SerialManger
+{
+ public partial class SerialMgrComm
+ {
+ //fnSerialMgrDebugCB
+ public const int SERIALMGR_DBG_NORMAL = 0x0001;
+ public const int SERIALMGR_DBG_THREAD = 0x0002;
+ public const int SERIALMGR_DBG_LIST = 0x0004;
+ public const int SERIALMGR_DBG_PORT = 0x0008;
+
+
+ // fnSerialMgrConnectCB : status
+ public const int SERIAL_STATUS_DISCONNECT = 0x00;
+ public const int SERIAL_STATUS_CONNECT = 0x01;
+ public const int SERIAL_STATUS_ERROR = 0x02;
+
+ public const int MAX_COMMPORT_SIZE = 10;
+
+ // fnSerialMgrConnectCB : errDetail
+ public enum serial_error_detail_e
+ {
+ SERIAL_ERR_NONE = 0x00,
+ SERIAL_ERR_CREATE,
+ SERIAL_ERR_PARAMETER,
+ SERIAL_ERR_TIMEOUT,
+ SERIAL_ERR_WRITE,
+ SERIAL_ERR_READ,
+ SERIAL_ERR_MAX
+ };
+
+
+
+ }
+}
diff --git a/INT69DB_2A/SerialManager/SerialManager.cs b/INT69DB_2A/SerialManager/SerialManager.cs
new file mode 100644
index 0000000..5188f3a
--- /dev/null
+++ b/INT69DB_2A/SerialManager/SerialManager.cs
@@ -0,0 +1,259 @@
+#define CONSOLE_DBUGGING
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading;
+using System.Collections;
+
+namespace INT69DB_2A.SerialManger
+{
+ public partial class SerialMgrComm
+ {
+ public delegate void ObjectEventHandler(object data);
+ public static event ObjectEventHandler SerialPortMessageReceive;
+ public static event ObjectEventHandler SerialPortErrMessageReceive;
+
+ public static void IntializeSerialManager()
+ {
+ //Console.Write("Initialize Serial Manager \n");
+
+ // Register Callback
+ fnSerialMgrDebugCallback = serialDebugCallback;
+ DLL_SerialMgr_Register_DebugCB(fnSerialMgrDebugCallback);
+
+ fnSerialMgrPortConnectCallback = serialPortConnectCallback;
+ DLL_SerialMgr_Register_ConnectCB(fnSerialMgrPortConnectCallback);
+
+ fnSerialVersionCallback = serialVersionCallback;
+ DLL_SerialMgr_Register_VersionCB(fnSerialVersionCallback);
+
+ fnSerialMgrRcvPacketCallback = serialRcvPacketMsgCallback;
+ DLL_SerialMgr_Register_RcvPacketCB(fnSerialMgrRcvPacketCallback);
+
+ fnSerialMgrRcvErrPacketCallback = serialRcvErrPacketMsgCallback;
+ DLL_SerialMgr_Register_RcvErrPacketCB(fnSerialMgrRcvErrPacketCallback);
+
+ // test
+ //DLL_SerialMgr_HelloWorld();
+
+ // get the lib version
+ DLL_SerialMgr_Getversion();
+
+ // activate the dll thread
+ DLL_SerialMgr_Activation();
+
+ }
+
+ #region DLL_CALLBACK
+ private static void serialVersionCallback(StringBuilder versionInfo)
+ {
+ try
+ {
+ //Console.Write("\n-------------------------------\n");
+ //Console.Write("lib version = " + versionInfo + "\n");
+ //Console.Write("-------------------------------\n");
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
+ private static void serialPortConnectCallback(StringBuilder commPort, int status, int errDetail)
+ {
+ try
+ {
+ //Console.Write(commPort + ": status = " + status.ToString() +" , detail = " + errDetail.ToString() + "\n");
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
+ private static void serialDebugCallback(int type, StringBuilder pMessage)
+ {
+ try
+ {
+ //Console.Write(pMessage);
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
+ // https://stackoverflow.com/questions/22938756/how-to-marshal-c-array-to-c-sharp-via-intptr
+ public static void serialRcvPacketMsgCallback(StringBuilder commPort, IntPtr pData, int length)
+ {
+ try
+ {
+ if (commPort.Length == 0)
+ return;
+
+ if ( (pData == IntPtr.Zero) || (length == 0) )
+ return;
+
+ byte[] data = new byte[length];
+ Marshal.Copy(pData, data, 0, (int)length);
+
+ string sdata = Encoding.Default.GetString(data, 0, data.Length);
+
+ if (SerialPortMessageReceive != null)
+ SerialPortMessageReceive(sdata);
+
+#if TEST_CB
+ String commPortStr = commPort.ToString();
+
+ serialPortMessageByte(commPortStr, data, length);
+#endif
+
+
+ //Console.Write("comm port : " + commPort + ", length = " + length.ToString() + "\n");
+#if TEST_DEBUG
+ // https://stackoverflow.com/questions/1342922/console-writeline-as-hexadecimal
+ int index = 0;
+ foreach (byte temp in data)
+ {
+ Console.Write(temp.ToString("X2") + " ");
+ index++;
+
+ if (index % 16 == 0) Console.Write("\n");
+ }
+
+ Console.Write("\n");
+#endif
+
+ //data = null;
+
+ //GC.Collect();
+ //GC.WaitForPendingFinalizers();
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
+ public static void serialRcvErrPacketMsgCallback(StringBuilder commPort, IntPtr pData, int length)
+ {
+ try
+ {
+ if (commPort.Length == 0)
+ return;
+
+ if ((pData == IntPtr.Zero) || (length == 0))
+ return;
+
+ byte[] data = new byte[length];
+ Marshal.Copy(pData, data, 0, (int)length);
+
+ string sdata = Encoding.Default.GetString(data, 0, data.Length);
+
+ if (SerialPortErrMessageReceive != null)
+ SerialPortErrMessageReceive(sdata);
+
+ //String commPortStr = commPort.ToString();
+ //serialPortMessageByte(commPortStr, data, length);
+
+ //Console.Write("Err : comm port : " + commPort + ", length = " + length.ToString() + "\n");
+
+#if (TEST_DEBUG1)
+ // https://stackoverflow.com/questions/1342922/console-writeline-as-hexadecimal
+ int index = 0;
+ foreach (byte temp in data)
+ {
+ Console.Write(temp.ToString("X2") + " ");
+ index++;
+
+ if (index == 5) break;
+
+ if (index % 16 == 0) Console.Write("\n");
+ }
+
+ Console.Write("\n");
+#endif
+
+ // https://dhshin94.tistory.com/135
+ //data = null;
+
+ //GC.Collect();
+ //GC.WaitForPendingFinalizers();
+
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
+ #endregion // DLL_CALLBACK
+
+ #region DLL_COMMAND
+
+ public static void serialPortOpen(String commPort, int BaudRate, int stopBit, int parity, int dataBit)
+ {
+ IntPtr pCommPort = Marshal.StringToBSTR(commPort.ToString());
+
+ DLL_SerialMgr_PortOpen(pCommPort, BaudRate, stopBit, parity, dataBit);
+ }
+
+ public static void serialPortClose(String commPort)
+ {
+ IntPtr pCommPort = Marshal.StringToBSTR(commPort.ToString());
+
+ DLL_SerialMgr_PortClose(pCommPort);
+ }
+
+
+ public static void serialPortMessageByte(String commport, byte[] data, int length)
+ {
+ IntPtr pCommPort = Marshal.StringToBSTR(commport.ToString());
+
+ IntPtr ptr = Marshal.AllocHGlobal(length);
+ Marshal.Copy(data, 0, ptr, length);
+
+ DLL_SerialMgr_PortSendMsg(pCommPort, ptr, length);
+
+ //string sdata = Encoding.Default.GetString(data, 0, data.Length);
+
+ Marshal.FreeHGlobal(ptr);
+
+ // if (SerialPortMessageReceive != null)
+ // SerialPortMessageReceive(sdata);
+ }
+
+
+ //https://stackoverflow.com/questions/13418795/convert-byte-array-to-structure-in-the-compact-framework
+ public static void serialPortMessage(String commPort, String Message)
+ {
+ IntPtr pCommPort = Marshal.StringToBSTR(commPort.ToString());
+
+ StringBuilder sb = new StringBuilder();
+ sb.Append((char)0x02);
+ sb.Append(Message);
+ sb.Append((char)0x03);
+
+ Message = sb.ToString();
+
+ byte[] buffer = Encoding.ASCII.GetBytes(Message);
+ int count = Encoding.ASCII.GetByteCount(Message);
+ //byte[] buffer = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
+ //int count = 10;
+
+
+ IntPtr ptr = Marshal.AllocHGlobal(count);
+ Marshal.Copy(buffer, 0, ptr, count);
+
+ DLL_SerialMgr_PortSendMsg(pCommPort, ptr, count);
+
+ Marshal.FreeHGlobal(ptr);
+ }
+
+ #endregion
+
+ }
+}
diff --git a/INT69DB_2A/Version.txt b/INT69DB_2A/Version.txt
index a31d20d..dcdb9fc 100644
--- a/INT69DB_2A/Version.txt
+++ b/INT69DB_2A/Version.txt
@@ -14,6 +14,17 @@
Ƽ 2~6 ƽ 跮
*/
+@ Ver 5.3.0 by CJY
+ - 2024.11.19
+ - Ver 5.2.1 Modify
+ - ۱ ߰ - Serial Dll (SerialManager)
+ ۱ ʰ, ι° ۵Ǵ
+ - ()ܼ α , admin ϸ Level1 ϴ
+ - I/O Test
+ Ȯ I/O Ʈ κ ߰( 17~32)
+ - 緯 ȸ 360 ߰
+ , 180 + 180 two step ȸ
+
@ Ver 5.2.1 by CJY
- 2024.08.21
- Ver 5.2.0 Modify