chojy
/
INT69DB_2A
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: chojy:V6.0.0
Branches Tags
chojy:master
chojy:Ver_522
chojy:V6.3.1
chojy:V5.3.0
chojy:V6.2.0
chojy:V6.0.0
chojy:V5.2.1
chojy:V5.2.0
chojy:V5.1.0
chojy:V5.0.1
...
compare: chojy:master
Branches Tags
chojy:master
chojy:Ver_522
chojy:V6.3.1
chojy:V5.3.0
chojy:V6.2.0
chojy:V6.0.0
chojy:V5.2.1
chojy:V5.2.0
chojy:V5.1.0
chojy:V5.0.1

12 Commits
V6.0.0 ... master

Author SHA1 Message Date
sj84 2563ce76de @ Ver 6.3.1 by LSJ 
- 2025.04.02
 - Ver 6.3.0 Modify
 - Framework : SmartX Framework V3.2.4(update: 2021.01.20)
 - FormDataStatistics.cs
   FormDataViewer.cs
   메시지 버그 수정
   DataRead() : Message 13->19
 2025-04-02 17:19:21 +09:00
DESKTOP-999R8N3\CJY 397f3242ac - 프로토콜 OPT5 추가 
- (버그수정) 보레이트 설정 시 SelectedIndex로 변경
 2025-04-02 11:17:30 +09:00
DESKTOP-999R8N3\CJY 65f9fe06ea - 프로토콜 OPT5 삭제 
- (버그수정) 보레이트 설정 시 SelectedIndex로 변경
 2025-03-24 16:17:02 +09:00
sj84 455c980959 Merge branch 'master' of http://192.168.11.65:3000/chojy/INT69DB_2A 2025-03-14 10:01:58 +09:00
sj84 488ae8a8c2 예외처리 2025-02-26 17:02:51 +09:00
DESKTOP-999R8N3\CJY 2bbe2fe17f 버그 수정 2025-02-21 10:12:31 +09:00
DESKTOP-999R8N3\CJY fcc3f2c9cc - OPT5 추가(Count - Pass, NG, All 추가한 프로토콜) 2025-02-07 15:09:32 +09:00
DESKTOP-999R8N3\CJY 9026f00678 - 모터설정 180+180 회전 추가 2025-02-06 15:18:21 +09:00
DESKTOP-999R8N3\CJY cb1251518a Merge branch 'master' of http://192.168.11.65:3000/chojy/INT69DB_2A 2025-01-07 15:22:01 +09:00
sj84 e80d5a78d9 @ Ver 6.1.1 by LSJ 
- 2025.01.02
 - Ver 6.1.0 Modify
 - Framework : SmartX Framework V3.2.4(update: 2021.01.20)
 - 시스템설정
   판정 그래프 안그려지는 버그 수정
    // 판정설정 그래프
        private int ReceiveCommandSG0(string lane, string receiveData)
         temp = 12 -> 20 수정
   속도 데이터가 추가 되어있다고함(실제로는 -99990000 이거만 수신됨..)
 2025-01-02 16:15:26 +09:00
sj84 875d61fb27 @ Ver 6.1.0 by LSJ 
- 2024.12.05
 - Ver 6.0.0 Modify
 - Framework : SmartX Framework V3.2.4(update: 2021.01.20)
 - SerialDll 미사용
   SmartSerialPort 사용
 - 환경설정 소수점 저장안되는 버그 수정
 - XY 그래프 화면 데이터 갯수 수정
      draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
        -> draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
      627/2 = 313
      627/16 = 39
 2024-12-20 08:57:19 +09:00
DESKTOP-999R8N3\CJY 7631dd29bc Merge branch 'master' of http://192.168.11.65:3000/chojy/INT69DB_2A 2024-12-06 09:31:25 +09:00
42 changed files with 786 additions and 555 deletions
Show Stats Expand all files Collapse all files

12
INT69DB_2A/Controls/ControlEquipmentTest.cs
View File

@ -183,13 +183,13 @@ namespace INT69DB_2A.Controls
{
string value = "";
if (item.Serial3BaudRate == 9600)
if (item.Serial3BaudRate == 0)
this.labelCH3Baudrate.Text = "9600";
else if (item.Serial3BaudRate == 19200)
else if (item.Serial3BaudRate == 1)
this.labelCH3Baudrate.Text = "19200";
else if (item.Serial3BaudRate == 38400)
else if (item.Serial3BaudRate == 2)
this.labelCH3Baudrate.Text = "38400";
else if (item.Serial3BaudRate == 115200)
else if (item.Serial3BaudRate == 3)
this.labelCH3Baudrate.Text = "115200";
else
this.labelCH3Baudrate.Text = "9600";
@ -204,6 +204,10 @@ namespace INT69DB_2A.Controls
this.labelCH3Mode.Text = "OPT3";
else if (item.Serial3Mode == 4)
this.labelCH3Mode.Text = "Printer";
else if (item.Serial3Mode == 5)
this.labelCH3Mode.Text = "OPT4";
else if (item.Serial3Mode == 6)
this.labelCH3Mode.Text = "OPT5";
else
this.labelCH3Mode.Text = "None";
}

18
INT69DB_2A/Controls/ControlMainDisplayDotGraph10.Designer.cs generated
View File

@ -568,7 +568,7 @@
this.draw6.SetBackImageAutoSize = true;
this.draw6.Size = new System.Drawing.Size(750, 330);
this.draw6.TabIndex = 1095;
this.draw6.Text = "Line6";
this.draw6.Text = "Lane6";
//
// draw5
//
@ -585,7 +585,7 @@
this.draw5.SetBackImageAutoSize = true;
this.draw5.Size = new System.Drawing.Size(750, 330);
this.draw5.TabIndex = 1094;
this.draw5.Text = "Line5";
this.draw5.Text = "Lane5";
//
// draw4
//
@ -602,7 +602,7 @@
this.draw4.SetBackImageAutoSize = true;
this.draw4.Size = new System.Drawing.Size(750, 330);
this.draw4.TabIndex = 1093;
this.draw4.Text = "Line4";
this.draw4.Text = "Lane4";
//
// draw3
//
@ -619,7 +619,7 @@
this.draw3.SetBackImageAutoSize = true;
this.draw3.Size = new System.Drawing.Size(750, 330);
this.draw3.TabIndex = 1092;
this.draw3.Text = "Line3";
this.draw3.Text = "Lane3";
//
// draw2
//
@ -636,7 +636,7 @@
this.draw2.SetBackImageAutoSize = true;
this.draw2.Size = new System.Drawing.Size(750, 330);
this.draw2.TabIndex = 1091;
this.draw2.Text = "Line2";
this.draw2.Text = "Lane2";
//
// draw1
//
@ -670,7 +670,7 @@
this.draw7.SetBackImageAutoSize = true;
this.draw7.Size = new System.Drawing.Size(750, 330);
this.draw7.TabIndex = 1096;
this.draw7.Text = "Line7";
this.draw7.Text = "Lane7";
//
// draw8
//
@ -687,7 +687,7 @@
this.draw8.SetBackImageAutoSize = true;
this.draw8.Size = new System.Drawing.Size(750, 330);
this.draw8.TabIndex = 1097;
this.draw8.Text = "Line8";
this.draw8.Text = "Lane8";
//
// draw9
//
@ -704,7 +704,7 @@
this.draw9.SetBackImageAutoSize = true;
this.draw9.Size = new System.Drawing.Size(750, 330);
this.draw9.TabIndex = 1098;
this.draw9.Text = "Line9";
this.draw9.Text = "Lane9";
//
// draw10
//
@ -721,7 +721,7 @@
this.draw10.SetBackImageAutoSize = true;
this.draw10.Size = new System.Drawing.Size(750, 330);
this.draw10.TabIndex = 1099;
this.draw10.Text = "Line10";
this.draw10.Text = "Lane10";
//
// ControlMainDisplayDotGraph10
//

4
INT69DB_2A/Controls/ControlMainDisplayDotGraph2.Designer.cs generated
View File

@ -62,7 +62,7 @@
this.draw2.SetBackImageAutoSize = true;
this.draw2.Size = new System.Drawing.Size(750, 330);
this.draw2.TabIndex = 965;
this.draw2.Text = "Line2";
this.draw2.Text = "Lane2";
//
// draw1
//
@ -79,7 +79,7 @@
this.draw1.SetBackImageAutoSize = true;
this.draw1.Size = new System.Drawing.Size(750, 330);
this.draw1.TabIndex = 964;
this.draw1.Text = "Line1";
this.draw1.Text = "Lane1";
//
// pictureBoxBypass2
//

2
INT69DB_2A/Controls/ControlMainDisplayDotGraph2.cs
View File

@ -105,7 +105,7 @@ namespace INT69DB_2A.Controls
chartchPenStyle[0].m_chColor = Color.Yellow;
chartchPenStyle[0].m_iPenWidth = 2;
draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.ChartChannelPenStyle = chartchPenStyle;
}

6
INT69DB_2A/Controls/ControlMainDisplayDotGraph3.Designer.cs generated
View File

@ -66,7 +66,7 @@
this.draw3.SetBackImageAutoSize = true;
this.draw3.Size = new System.Drawing.Size(750, 330);
this.draw3.TabIndex = 953;
this.draw3.Text = "Line3";
this.draw3.Text = "Lane3";
//
// draw2
//
@ -83,7 +83,7 @@
this.draw2.SetBackImageAutoSize = true;
this.draw2.Size = new System.Drawing.Size(750, 330);
this.draw2.TabIndex = 952;
this.draw2.Text = "Line2";
this.draw2.Text = "Lane2";
//
// draw1
//
@ -100,7 +100,7 @@
this.draw1.SetBackImageAutoSize = true;
this.draw1.Size = new System.Drawing.Size(750, 330);
this.draw1.TabIndex = 951;
this.draw1.Text = "Line1";
this.draw1.Text = "Lane1";
//
// pictureBoxBypass3
//

2
INT69DB_2A/Controls/ControlMainDisplayDotGraph3.cs
View File

@ -108,7 +108,7 @@ namespace INT69DB_2A.Controls
chartchPenStyle[0].m_chColor = Color.Yellow;
chartchPenStyle[0].m_iPenWidth = 2;
draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.ChartChannelPenStyle = chartchPenStyle;
}

8
INT69DB_2A/Controls/ControlMainDisplayDotGraph4.Designer.cs generated
View File

@ -63,7 +63,7 @@
this.draw4.SetBackImageAutoSize = true;
this.draw4.Size = new System.Drawing.Size(750, 330);
this.draw4.TabIndex = 937;
this.draw4.Text = "Line4";
this.draw4.Text = "Lane4";
//
// draw3
//
@ -80,7 +80,7 @@
this.draw3.SetBackImageAutoSize = true;
this.draw3.Size = new System.Drawing.Size(750, 330);
this.draw3.TabIndex = 936;
this.draw3.Text = "Line3";
this.draw3.Text = "Lane3";
//
// draw2
//
@ -97,7 +97,7 @@
this.draw2.SetBackImageAutoSize = true;
this.draw2.Size = new System.Drawing.Size(750, 330);
this.draw2.TabIndex = 935;
this.draw2.Text = "Line2";
this.draw2.Text = "Lane2";
//
// draw1
//
@ -114,7 +114,7 @@
this.draw1.SetBackImageAutoSize = true;
this.draw1.Size = new System.Drawing.Size(750, 330);
this.draw1.TabIndex = 934;
this.draw1.Text = "Line1";
this.draw1.Text = "Lane1";
//
// pictureBoxBypass4
//

2
INT69DB_2A/Controls/ControlMainDisplayDotGraph4.cs
View File

@ -111,7 +111,7 @@ namespace INT69DB_2A.Controls
chartchPenStyle[0].m_chColor = Color.Yellow;
chartchPenStyle[0].m_iPenWidth = 2;
draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.ChartChannelPenStyle = chartchPenStyle;
}

10
INT69DB_2A/Controls/ControlMainDisplayDotGraph5.Designer.cs generated
View File

@ -66,7 +66,7 @@
this.draw5.SetBackImageAutoSize = true;
this.draw5.Size = new System.Drawing.Size(750, 330);
this.draw5.TabIndex = 918;
this.draw5.Text = "Line5";
this.draw5.Text = "Lane5";
//
// draw4
//
@ -83,7 +83,7 @@
this.draw4.SetBackImageAutoSize = true;
this.draw4.Size = new System.Drawing.Size(750, 330);
this.draw4.TabIndex = 917;
this.draw4.Text = "Line4";
this.draw4.Text = "Lane4";
//
// draw3
//
@ -100,7 +100,7 @@
this.draw3.SetBackImageAutoSize = true;
this.draw3.Size = new System.Drawing.Size(750, 330);
this.draw3.TabIndex = 916;
this.draw3.Text = "Line3";
this.draw3.Text = "Lane3";
//
// draw2
//
@ -117,7 +117,7 @@
this.draw2.SetBackImageAutoSize = true;
this.draw2.Size = new System.Drawing.Size(750, 330);
this.draw2.TabIndex = 915;
this.draw2.Text = "Line2";
this.draw2.Text = "Lane2";
//
// draw1
//
@ -134,7 +134,7 @@
this.draw1.SetBackImageAutoSize = true;
this.draw1.Size = new System.Drawing.Size(750, 330);
this.draw1.TabIndex = 914;
this.draw1.Text = "Line1";
this.draw1.Text = "Lane1";
//
// pictureBoxBypass5
//

2
INT69DB_2A/Controls/ControlMainDisplayDotGraph5.cs
View File

@ -114,7 +114,7 @@ namespace INT69DB_2A.Controls
chartchPenStyle[0].m_chColor = Color.Yellow;
chartchPenStyle[0].m_iPenWidth = 2;
draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.ChartChannelPenStyle = chartchPenStyle;
}

12
INT69DB_2A/Controls/ControlMainDisplayDotGraph6.Designer.cs generated
View File

@ -340,7 +340,7 @@
this.draw1.SetBackImageAutoSize = true;
this.draw1.Size = new System.Drawing.Size(750, 330);
this.draw1.TabIndex = 890;
this.draw1.Text = "Line1";
this.draw1.Text = "Lane1";
//
// draw2
//
@ -357,7 +357,7 @@
this.draw2.SetBackImageAutoSize = true;
this.draw2.Size = new System.Drawing.Size(750, 330);
this.draw2.TabIndex = 891;
this.draw2.Text = "Line2";
this.draw2.Text = "Lane2";
//
// draw3
//
@ -374,7 +374,7 @@
this.draw3.SetBackImageAutoSize = true;
this.draw3.Size = new System.Drawing.Size(750, 330);
this.draw3.TabIndex = 892;
this.draw3.Text = "Line3";
this.draw3.Text = "Lane3";
//
// draw4
//
@ -391,7 +391,7 @@
this.draw4.SetBackImageAutoSize = true;
this.draw4.Size = new System.Drawing.Size(750, 330);
this.draw4.TabIndex = 893;
this.draw4.Text = "Line4";
this.draw4.Text = "Lane4";
//
// draw5
//
@ -408,7 +408,7 @@
this.draw5.SetBackImageAutoSize = true;
this.draw5.Size = new System.Drawing.Size(750, 330);
this.draw5.TabIndex = 894;
this.draw5.Text = "Line5";
this.draw5.Text = "Lane5";
//
// draw6
//
@ -425,7 +425,7 @@
this.draw6.SetBackImageAutoSize = true;
this.draw6.Size = new System.Drawing.Size(750, 330);
this.draw6.TabIndex = 895;
this.draw6.Text = "Line6";
this.draw6.Text = "Lane6";
//
// ControlMainDisplayDotGraph6
//

2
INT69DB_2A/Controls/ControlMainDisplayDotGraph6.cs
View File

@ -117,7 +117,7 @@ namespace INT69DB_2A.Controls
chartchPenStyle[0].m_chColor = Color.Yellow;
chartchPenStyle[0].m_iPenWidth = 2;
draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.ChartChannelPenStyle = chartchPenStyle;
}

14
INT69DB_2A/Controls/ControlMainDisplayDotGraph7.Designer.cs generated
View File

@ -389,7 +389,7 @@
this.draw6.SetBackImageAutoSize = true;
this.draw6.Size = new System.Drawing.Size(750, 330);
this.draw6.TabIndex = 1075;
this.draw6.Text = "Line6";
this.draw6.Text = "Lane6";
//
// draw5
//
@ -406,7 +406,7 @@
this.draw5.SetBackImageAutoSize = true;
this.draw5.Size = new System.Drawing.Size(750, 330);
this.draw5.TabIndex = 1074;
this.draw5.Text = "Line5";
this.draw5.Text = "Lane5";
//
// draw4
//
@ -423,7 +423,7 @@
this.draw4.SetBackImageAutoSize = true;
this.draw4.Size = new System.Drawing.Size(750, 330);
this.draw4.TabIndex = 1073;
this.draw4.Text = "Line4";
this.draw4.Text = "Lane4";
//
// draw3
//
@ -440,7 +440,7 @@
this.draw3.SetBackImageAutoSize = true;
this.draw3.Size = new System.Drawing.Size(750, 330);
this.draw3.TabIndex = 1072;
this.draw3.Text = "Line3";
this.draw3.Text = "Lane3";
//
// draw2
//
@ -457,7 +457,7 @@
this.draw2.SetBackImageAutoSize = true;
this.draw2.Size = new System.Drawing.Size(750, 330);
this.draw2.TabIndex = 1071;
this.draw2.Text = "Line2";
this.draw2.Text = "Lane2";
//
// draw1
//
@ -474,7 +474,7 @@
this.draw1.SetBackImageAutoSize = true;
this.draw1.Size = new System.Drawing.Size(750, 330);
this.draw1.TabIndex = 1070;
this.draw1.Text = "Line1";
this.draw1.Text = "Lane1";
//
// draw7
//
@ -491,7 +491,7 @@
this.draw7.SetBackImageAutoSize = true;
this.draw7.Size = new System.Drawing.Size(750, 330);
this.draw7.TabIndex = 1076;
this.draw7.Text = "Line7";
this.draw7.Text = "Lane7";
//
// ControlMainDisplayDotGraph7
//

2
INT69DB_2A/Controls/ControlMainDisplayDotGraph7.cs
View File

@ -120,7 +120,7 @@ namespace INT69DB_2A.Controls
chartchPenStyle[0].m_chColor = Color.Yellow;
chartchPenStyle[0].m_iPenWidth = 2;
draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.ChartChannelPenStyle = chartchPenStyle;
}

16
INT69DB_2A/Controls/ControlMainDisplayDotGraph8.Designer.cs generated
View File

@ -438,7 +438,7 @@
this.draw8.SetBackImageAutoSize = true;
this.draw8.Size = new System.Drawing.Size(750, 330);
this.draw8.TabIndex = 1107;
this.draw8.Text = "Line8";
this.draw8.Text = "Lane8";
//
// draw7
//
@ -455,7 +455,7 @@
this.draw7.SetBackImageAutoSize = true;
this.draw7.Size = new System.Drawing.Size(750, 330);
this.draw7.TabIndex = 1106;
this.draw7.Text = "Line7";
this.draw7.Text = "Lane7";
//
// draw6
//
@ -472,7 +472,7 @@
this.draw6.SetBackImageAutoSize = true;
this.draw6.Size = new System.Drawing.Size(750, 330);
this.draw6.TabIndex = 1105;
this.draw6.Text = "Line6";
this.draw6.Text = "Lane6";
//
// draw5
//
@ -489,7 +489,7 @@
this.draw5.SetBackImageAutoSize = true;
this.draw5.Size = new System.Drawing.Size(750, 330);
this.draw5.TabIndex = 1104;
this.draw5.Text = "Line5";
this.draw5.Text = "Lane5";
//
// draw4
//
@ -506,7 +506,7 @@
this.draw4.SetBackImageAutoSize = true;
this.draw4.Size = new System.Drawing.Size(750, 330);
this.draw4.TabIndex = 1103;
this.draw4.Text = "Line4";
this.draw4.Text = "Lane4";
//
// draw3
//
@ -523,7 +523,7 @@
this.draw3.SetBackImageAutoSize = true;
this.draw3.Size = new System.Drawing.Size(750, 330);
this.draw3.TabIndex = 1102;
this.draw3.Text = "Line3";
this.draw3.Text = "Lane3";
//
// draw2
//
@ -540,7 +540,7 @@
this.draw2.SetBackImageAutoSize = true;
this.draw2.Size = new System.Drawing.Size(750, 330);
this.draw2.TabIndex = 1101;
this.draw2.Text = "Line2";
this.draw2.Text = "Lane2";
//
// draw1
//
@ -557,7 +557,7 @@
this.draw1.SetBackImageAutoSize = true;
this.draw1.Size = new System.Drawing.Size(750, 330);
this.draw1.TabIndex = 1100;
this.draw1.Text = "Line1";
this.draw1.Text = "Lane1";
//
// ControlMainDisplayDotGraph8
//

2
INT69DB_2A/Controls/ControlMainDisplayDotGraph8.cs
View File

@ -123,7 +123,7 @@ namespace INT69DB_2A.Controls
chartchPenStyle[0].m_chColor = Color.Yellow;
chartchPenStyle[0].m_iPenWidth = 2;
draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
draw.ChartChannelPenStyle = chartchPenStyle;
}

2
INT69DB_2A/Controls/ControlUserSetting.cs
View File

@ -176,7 +176,7 @@ namespace INT69DB_2A.Controls
private void labelPassword_Click(object sender, EventArgs e)
{
string value = "";
DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelPassword.Text);
DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelPassword.Text, this.ParentForm.ParentForm.SystemConfig.Language);
if (keyboard.ShowDialog() == DialogResult.OK)
{

14
INT69DB_2A/DataStore.cs
View File

@ -46,7 +46,7 @@ namespace INT69DB_2A
public enum MainDisplayStore
{
BarGraph,
LineGraph,
DotGraph,
Table,
};
@ -346,6 +346,7 @@ namespace INT69DB_2A
f3_OPT3,
f4_Printer,
f5_OPT4,
f6_OPT5,
}
public enum EthernetMode
@ -356,6 +357,7 @@ namespace INT69DB_2A
f3_OPT3,
f4_Modbus,
f5_OPT4,
f6_OPT5,
}
public enum UserGroup
@ -491,10 +493,10 @@ namespace INT69DB_2A
AutoZeroMode,
EtcDoubleEntry,
EtcChattering,
EtcBuzzerRunTime,
EtcRelayRunTime,
EtcDecimalpoint,
Chattering,
BuzzerONTime,
RelayONTime,
Decimal,
EtcBypass,
MotorDirection,
@ -1550,7 +1552,7 @@ namespace INT69DB_2A
this.ProductNumber = 1;
this.UsbID = 1;
this.ImpellerMotorBaudrate = 4;
this.Serial3BaudRate = 9600;
this.Serial3BaudRate = 0;
this.Serial3Mode = 0;
this.InputSensorSelect = 5;
this.ImpellerMotorAnglePass = 3;

365
INT69DB_2A/DialogForms/DialogFormMessage.cs
View File

@ -118,14 +118,8 @@ namespace INT69DB_2A.DialogForms
this.labelMessage2.Text = "";
break;
case 13:
this.labelErrorCode.Text = "시스템 백업";
this.labelMessage1.Text = "백업 완료";
this.labelMessage2.Text = "";
break;
case 14:
this.labelErrorCode.Text = "시스템 백업";
this.labelMessage1.Text = "백업 실패 !!";
this.labelMessage2.Text = "";
break;
case 15:
this.labelErrorCode.Text = "Error 01_15";
@ -146,6 +140,8 @@ namespace INT69DB_2A.DialogForms
this.labelMessage1.Text = "전원을 끄고 다시 켜주세요";
break;
case 19:
this.labelErrorCode.Text = "Error 01_19";
this.labelMessage1.Text = "이 파일은 지원이 되지 않습니다";
break;
case 20:
break;
@ -238,14 +234,8 @@ namespace INT69DB_2A.DialogForms
this.labelMessage2.Text = "";
break;
case 13:
this.labelErrorCode.Text = "System backup";
this.labelMessage1.Text = "Backup Complete";
this.labelMessage2.Text = "";
break;
case 14:
this.labelErrorCode.Text = "System backup";
this.labelMessage1.Text = "Backup Fail !!";
this.labelMessage2.Text = "";
break;
case 15:
this.labelErrorCode.Text = "Error 01_15";
@ -267,6 +257,8 @@ namespace INT69DB_2A.DialogForms
this.labelMessage2.Text = "and then turn ON the power.";
break;
case 19:
this.labelErrorCode.Text = "Error 01_19";
this.labelMessage1.Text = "This file is not supported";
break;
case 20:
break;
@ -359,14 +351,8 @@ namespace INT69DB_2A.DialogForms
this.labelMessage2.Text = "";
break;
case 13:
this.labelErrorCode.Text = "系统备份";
this.labelMessage1.Text = "复制完成";
this.labelMessage2.Text = "";
break;
case 14:
this.labelErrorCode.Text = "系统备份";
this.labelMessage1.Text = "复制失败 !!";
this.labelMessage2.Text = "";
break;
case 15:
this.labelErrorCode.Text = "错误 01_15";
@ -387,6 +373,8 @@ namespace INT69DB_2A.DialogForms
this.labelMessage1.Text = "关掉电源，然后在打开电源";
break;
case 19:
this.labelErrorCode.Text = "錯誤 01_19";
this.labelMessage1.Text = "不支援这个档案";
break;
case 20:
break;
@ -481,14 +469,8 @@ namespace INT69DB_2A.DialogForms
this.labelMessage2.Text = "";
break;
case 13:
this.labelErrorCode.Text = "System backup";
this.labelMessage1.Text = "Zálohování dokončeno";
this.labelMessage2.Text = "";
break;
case 14:
this.labelErrorCode.Text = "System backup";
this.labelMessage1.Text = "Zálohování se nezdařilo !!";
this.labelMessage2.Text = "";
break;
case 15:
this.labelErrorCode.Text = "Chybě 01_15";
@ -510,6 +492,8 @@ namespace INT69DB_2A.DialogForms
this.labelMessage2.Text = "vypněte a pak opět zapněte.";
break;
case 19:
this.labelErrorCode.Text = "Chybě 01_19";
this.labelMessage1.Text = "Tento soubor není podporován";
break;
case 20:
break;
@ -574,88 +558,6 @@ namespace INT69DB_2A.DialogForms
this.labelMessage1.Text = "입력범위를 확인하세요.";
this.labelMessage2.Text = data;
break;
case 2:
this.labelErrorCode.Text = "Error 02_02";
this.labelMessage1.Text = "최신 프로그램입니다.";
break;
case 3:
this.labelErrorCode.Text = "Error 02_03";
this.labelMessage1.Text = "연속으로 불량이 발생했습니다";
break;
case 4:
this.labelErrorCode.Text = "Error 02_04";
this.labelMessage1.Text = "백업할 파일이 없습니다";
break;
case 5:
this.labelErrorCode.Text = "Error 02_05";
this.labelMessage1.Text = "USB메모리가 장착되지 않았습니다";
break;
case 6:
this.labelErrorCode.Text = "Error 02_06";
this.labelMessage1.Text = "제조사에 문의하세요";
break;
case 7:
this.labelErrorCode.Text = "Error 02_07";
this.labelMessage1.Text = "USB에 업데이트 할 파일이 없습니다";
break;
case 8:
this.labelErrorCode.Text = "Error 02_08";
this.labelMessage1.Text = "업데이트 할 실행파일 개수가 많습니다";
break;
case 9:
this.labelErrorCode.Text = "Error 02_09";
this.labelMessage1.Text = "USB에 업데이트 폴더가 없습니다";
break;
case 10:
this.labelErrorCode.Text = "Error 02_10";
this.labelMessage1.Text = "해당 메모리가 장착되지 않았습니다";
break;
case 11:
this.labelErrorCode.Text = "Error 02_11";
this.labelMessage1.Text = "입력센서 에러에 의해 정지하였습니다.";
break;
case 12:
break;
case 13:
break;
case 14:
break;
case 15:
break;
case 16:
break;
case 17:
this.labelErrorCode.Text = "Error 02_17";
this.labelMessage1.Text = "초기화를 실행해 주세요";
break;
case 18:
this.labelErrorCode.Text = "Info 02_18";
this.labelMessage1.Text = "전원을 끄고 다시 켜주세요";
break;
case 19:
break;
case 20:
break;
case 31:
this.labelErrorCode.Text = "Error 02_31";
this.labelMessage1.Text = "유저 파일 에러";
break;
case 32:
this.labelErrorCode.Text = "Error 02_32";
this.labelMessage1.Text = "ID 확인하세요";
break;
case 33:
this.labelErrorCode.Text = "Error 02_33";
this.labelMessage1.Text = "Password 확인하세요";
break;
case 34:
this.labelErrorCode.Text = "Error 02_34";
this.labelMessage1.Text = "동일한 ID가 있습니다!";
break;
case 35:
this.labelErrorCode.Text = "Error 02_35";
this.labelMessage1.Text = "4~10자 입력 하세요!";
break;
default:
this.labelErrorCode.Text = "Error 02_99";
this.labelMessage1.Text = "제조사에 문의하세요";
@ -674,89 +576,6 @@ namespace INT69DB_2A.DialogForms
this.labelErrorCode.Text = "Error 02_01";
this.labelMessage1.Text = "Confirm input range";
break;
case 2:
this.labelErrorCode.Text = "Error 02_02";
this.labelMessage1.Text = "Application is the lastest";
break;
case 3:
this.labelErrorCode.Text = "Error 02_03";
this.labelMessage1.Text = "Detect Continuous N.G !!";
break;
case 4:
this.labelErrorCode.Text = "Error 02_04";
this.labelMessage1.Text = "There are no Backup files";
break;
case 5:
this.labelErrorCode.Text = "Error 02_05";
this.labelMessage1.Text = "No USB Memory";
break;
case 6:
this.labelErrorCode.Text = "Error 02_06";
this.labelMessage1.Text = "Please contact a manufacturer";
break;
case 7:
this.labelErrorCode.Text = "Error 02_07";
this.labelMessage1.Text = "There are no update files in USB";
break;
case 8:
this.labelErrorCode.Text = "Error 02_08";
this.labelMessage1.Text = "Too much file for update";
break;
case 9:
this.labelErrorCode.Text = "Error 02_09";
this.labelMessage1.Text = "There is no folder has update files in USB";
break;
case 10:
this.labelErrorCode.Text = "Error 02_10";
this.labelMessage1.Text = "There is no MEMORY";
break;
case 11:
this.labelErrorCode.Text = "Error 02_11";
this.labelMessage1.Text = "Emergency stop due to entry sensor error";
break;
case 12:
break;
case 13:
break;
case 14:
break;
case 15:
break;
case 16:
break;
case 17:
this.labelErrorCode.Text = "Error 02_17";
this.labelMessage1.Text = "Please run the initialization";
break;
case 18:
this.labelErrorCode.Text = "Info 02_18";
this.labelMessage1.Text = "Turn OFF the power";
this.labelMessage2.Text = "and then turn ON the power.";
break;
case 19:
break;
case 20:
break;
case 31:
this.labelErrorCode.Text = "Error 02_31";
this.labelMessage1.Text = "User files error";
break;
case 32:
this.labelErrorCode.Text = "Error 02_32";
this.labelMessage1.Text = "Check the ID";
break;
case 33:
this.labelErrorCode.Text = "Error 02_33";
this.labelMessage1.Text = "Check the password";
break;
case 34:
this.labelErrorCode.Text = "Error 02_34";
this.labelMessage1.Text = "The system already has the same ID";
break;
case 35:
this.labelErrorCode.Text = "Error 02_35";
this.labelMessage1.Text = "Please enter 4-10 characters";
break;
default:
this.labelErrorCode.Text = "Error 02_99";
this.labelMessage1.Text = "Please contact a manufacturer";
@ -775,88 +594,6 @@ namespace INT69DB_2A.DialogForms
this.labelErrorCode.Text = "错误 02_01";
this.labelMessage1.Text = "确认输入范围";
break;
case 2:
this.labelErrorCode.Text = "错误 02_02";
this.labelMessage1.Text = "最近应用";
break;
case 3:
this.labelErrorCode.Text = "错误 02_03";
this.labelMessage1.Text = "测试连续NG";
break;
case 4:
this.labelErrorCode.Text = "错误 02_04";
this.labelMessage1.Text = "无支持文件";
break;
case 5:
this.labelErrorCode.Text = "错误 02_05";
this.labelMessage1.Text = "无USB存储卡";
break;
case 6:
this.labelErrorCode.Text = "错误 02_06";
this.labelMessage1.Text = "请联系厂商";
break;
case 7:
this.labelErrorCode.Text = "错误 02_07";
this.labelMessage1.Text = "USB无更新文件";
break;
case 8:
this.labelErrorCode.Text = "错误 02_08";
this.labelMessage1.Text = "太多文件需更新";
break;
case 9:
this.labelErrorCode.Text = "错误 02_09";
this.labelMessage1.Text = "USB没有文件夹需要更新文件다";
break;
case 10:
this.labelErrorCode.Text = "错误 02_10";
this.labelMessage1.Text = "无存储";
break;
case 11:
this.labelErrorCode.Text = "错误 02_11";
this.labelMessage1.Text = "由于进入传感器错误导致紧急停止";
break;
case 12:
break;
case 13:
break;
case 14:
break;
case 15:
break;
case 16:
break;
case 17:
this.labelErrorCode.Text = "错误 02_17";
this.labelMessage1.Text = "运行初始化";
break;
case 18:
this.labelErrorCode.Text = "信息 02_18";
this.labelMessage1.Text = "关掉电源，然后在打开电源";
break;
case 19:
break;
case 20:
break;
case 31:
this.labelErrorCode.Text = "错误 02_31";
this.labelMessage1.Text = "用户文件错误";
break;
case 32:
this.labelErrorCode.Text = "错误 02_32";
this.labelMessage1.Text = "检查身份证";
break;
case 33:
this.labelErrorCode.Text = "错误 02_33";
this.labelMessage1.Text = "检查密码";
break;
case 34:
this.labelErrorCode.Text = "错误 02_34";
this.labelMessage1.Text = "系统已具有相同的ID";
break;
case 35:
this.labelErrorCode.Text = "错误 02_35";
this.labelMessage1.Text = "请输入4-10个字符";
break;
default:
this.labelErrorCode.Text = "错误 02_99";
this.labelMessage1.Text = "请联系厂商";
@ -875,92 +612,6 @@ namespace INT69DB_2A.DialogForms
this.labelErrorCode.Text = "Chybě 02_01";
this.labelMessage1.Text = "Potvrďte vstupní rozsah.";
break;
case 2:
this.labelErrorCode.Text = "Chybě 02_02";
this.labelMessage1.Text = "Aplikace je aktuální.";
break;
case 3:
this.labelErrorCode.Text = "Chybě 02_03";
this.labelMessage1.Text = "Detekce plynulosti N.G.";
break;
case 4:
this.labelErrorCode.Text = "Chybě 02_04";
this.labelMessage1.Text = "Neexistují žádné záložní soubory.";
break;
case 5:
this.labelErrorCode.Text = "Chybě 02_05";
this.labelMessage1.Text = "USB disk není připojen";
break;
case 6:
this.labelErrorCode.Text = "Chybě 02_06";
this.labelMessage1.Text = "Kontaktujte výrobce";
break;
case 7:
this.labelErrorCode.Text = "Chybě 02_07";
this.labelMessage1.Text = "Na USB disku nejsou";
this.labelMessage2.Text = "žádné aktualizační soubory";
break;
case 8:
this.labelErrorCode.Text = "Chybě 02_08";
this.labelMessage1.Text = "Příliš mnoho souboru k aktualizaci";
break;
case 9:
this.labelErrorCode.Text = "Chybě 02_09";
this.labelMessage1.Text = "Na USB disku není žádná";
this.labelMessage2.Text = "složka s aktualizačními soubory.";
break;
case 10:
this.labelErrorCode.Text = "Chybě 02_10";
this.labelMessage1.Text = "Není žádná PAMĚTI";
break;
case 11:
this.labelErrorCode.Text = "Chybě 02_11";
this.labelMessage1.Text = "Nouzové zastavení z důvodu chyby snímače vstupu";
break;
case 12:
break;
case 13:
break;
case 14:
break;
case 15:
break;
case 16:
break;
case 17:
this.labelErrorCode.Text = "Chybě 02_17";
this.labelMessage1.Text = "Spusťte inicializaci";
break;
case 18:
this.labelErrorCode.Text = "informace 02_18";
this.labelMessage1.Text = "Nejprve zařízení";
this.labelMessage2.Text = "vypněte a pak opět zapněte.";
break;
case 19:
break;
case 20:
break;
case 31:
this.labelErrorCode.Text = "Chybě 02_31";
this.labelMessage1.Text = "Chyba souborů uživatele";
this.labelMessage2.Text = "";
break;
case 32:
this.labelErrorCode.Text = "Chybě 02_32";
this.labelMessage1.Text = "Zkontrolujte ID";
break;
case 33:
this.labelErrorCode.Text = "Chybě 02_33";
this.labelMessage1.Text = "Zkontrolujte heslo";
break;
case 34:
this.labelErrorCode.Text = "Chybě 02_34";
this.labelMessage1.Text = "Systém již má stejné ID";
break;
case 35:
this.labelErrorCode.Text = "Chybě 02_35";
this.labelMessage1.Text = "Zadejte 4–10 znaků";
break;
default:
this.labelErrorCode.Text = "Chybě 02_99";
this.labelMessage1.Text = "Kontaktujte výrobce";

90
INT69DB_2A/DialogForms/DialogFormMessage.designer.cs generated
View File

@ -30,15 +30,15 @@
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DialogFormMessage));
this.panel1 = new System.Windows.Forms.Panel();
this.pictureBoxExclamation = new System.Windows.Forms.PictureBox();
this.pictureBoxHand = new System.Windows.Forms.PictureBox();
this.pictureBoxAsterisk = new System.Windows.Forms.PictureBox();
this.pictureBoxQuestion = new System.Windows.Forms.PictureBox();
this.labelMessage2 = new System.Windows.Forms.Label();
this.labelMessage1 = new System.Windows.Forms.Label();
this.buttonOK = new System.Windows.Forms.Button();
this.labelErrorCode = new System.Windows.Forms.Label();
this.timerAutoClose = new System.Windows.Forms.Timer();
this.pictureBoxExclamation = new System.Windows.Forms.PictureBox();
this.pictureBoxHand = new System.Windows.Forms.PictureBox();
this.pictureBoxAsterisk = new System.Windows.Forms.PictureBox();
this.pictureBoxQuestion = new System.Windows.Forms.PictureBox();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
@ -51,30 +51,61 @@
this.panel1.Controls.Add(this.pictureBoxQuestion);
this.panel1.Controls.Add(this.labelMessage2);
this.panel1.Controls.Add(this.labelMessage1);
this.panel1.Location = new System.Drawing.Point(15, 34);
this.panel1.Location = new System.Drawing.Point(3, 34);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(420, 95);
this.panel1.Size = new System.Drawing.Size(444, 95);
//
// pictureBoxExclamation
//
this.pictureBoxExclamation.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxExclamation.Image")));
this.pictureBoxExclamation.Location = new System.Drawing.Point(5, 20);
this.pictureBoxExclamation.Name = "pictureBoxExclamation";
this.pictureBoxExclamation.Size = new System.Drawing.Size(50, 50);
//
// pictureBoxHand
//
this.pictureBoxHand.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxHand.Image")));
this.pictureBoxHand.Location = new System.Drawing.Point(5, 20);
this.pictureBoxHand.Name = "pictureBoxHand";
this.pictureBoxHand.Size = new System.Drawing.Size(50, 50);
this.pictureBoxHand.Visible = false;
//
// pictureBoxAsterisk
//
this.pictureBoxAsterisk.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxAsterisk.Image")));
this.pictureBoxAsterisk.Location = new System.Drawing.Point(5, 20);
this.pictureBoxAsterisk.Name = "pictureBoxAsterisk";
this.pictureBoxAsterisk.Size = new System.Drawing.Size(50, 50);
this.pictureBoxAsterisk.Visible = false;
//
// pictureBoxQuestion
//
this.pictureBoxQuestion.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxQuestion.Image")));
this.pictureBoxQuestion.Location = new System.Drawing.Point(5, 20);
this.pictureBoxQuestion.Name = "pictureBoxQuestion";
this.pictureBoxQuestion.Size = new System.Drawing.Size(50, 50);
this.pictureBoxQuestion.Visible = false;
//
// labelMessage2
//
this.labelMessage2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.labelMessage2.Location = new System.Drawing.Point(67, 50);
this.labelMessage2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
this.labelMessage2.Location = new System.Drawing.Point(57, 50);
this.labelMessage2.Name = "labelMessage2";
this.labelMessage2.Size = new System.Drawing.Size(350, 20);
this.labelMessage2.Size = new System.Drawing.Size(387, 20);
this.labelMessage2.Text = "COM2 port problem. Please contact a manufacturer.";
//
// labelMessage1
//
this.labelMessage1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
this.labelMessage1.Location = new System.Drawing.Point(67, 20);
this.labelMessage1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
this.labelMessage1.Location = new System.Drawing.Point(57, 20);
this.labelMessage1.Name = "labelMessage1";
this.labelMessage1.Size = new System.Drawing.Size(350, 20);
this.labelMessage1.Size = new System.Drawing.Size(387, 20);
this.labelMessage1.Text = "COM2 port problem. Please contact a manufacturer.";
//
// buttonOK
//
this.buttonOK.BackColor = System.Drawing.Color.LightGray;
this.buttonOK.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
this.buttonOK.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold);
this.buttonOK.ForeColor = System.Drawing.Color.Black;
this.buttonOK.Location = new System.Drawing.Point(335, 135);
this.buttonOK.Name = "buttonOK";
@ -86,7 +117,7 @@
//
// labelErrorCode
//
this.labelErrorCode.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
this.labelErrorCode.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold);
this.labelErrorCode.Location = new System.Drawing.Point(15, 11);
this.labelErrorCode.Name = "labelErrorCode";
this.labelErrorCode.Size = new System.Drawing.Size(350, 20);
@ -97,37 +128,6 @@
this.timerAutoClose.Interval = 1000;
this.timerAutoClose.Tick += new System.EventHandler(this.timerAutoClose_Tick);
//
// pictureBoxExclamation
//
this.pictureBoxExclamation.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxExclamation.Image")));
this.pictureBoxExclamation.Location = new System.Drawing.Point(11, 20);
this.pictureBoxExclamation.Name = "pictureBoxExclamation";
this.pictureBoxExclamation.Size = new System.Drawing.Size(50, 50);
//
// pictureBoxHand
//
this.pictureBoxHand.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxHand.Image")));
this.pictureBoxHand.Location = new System.Drawing.Point(11, 20);
this.pictureBoxHand.Name = "pictureBoxHand";
this.pictureBoxHand.Size = new System.Drawing.Size(50, 50);
this.pictureBoxHand.Visible = false;
//
// pictureBoxAsterisk
//
this.pictureBoxAsterisk.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxAsterisk.Image")));
this.pictureBoxAsterisk.Location = new System.Drawing.Point(11, 20);
this.pictureBoxAsterisk.Name = "pictureBoxAsterisk";
this.pictureBoxAsterisk.Size = new System.Drawing.Size(50, 50);
this.pictureBoxAsterisk.Visible = false;
//
// pictureBoxQuestion
//
this.pictureBoxQuestion.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxQuestion.Image")));
this.pictureBoxQuestion.Location = new System.Drawing.Point(11, 20);
this.pictureBoxQuestion.Name = "pictureBoxQuestion";
this.pictureBoxQuestion.Size = new System.Drawing.Size(50, 50);
this.pictureBoxQuestion.Visible = false;
//
// DialogFormMessage
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);

7
INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.Designer.cs generated
View File

@ -46,7 +46,7 @@
// textBox
//
this.textBox.Font = new System.Drawing.Font("Tahoma", 25F, System.Drawing.FontStyle.Regular);
this.textBox.Location = new System.Drawing.Point(143, 99);
this.textBox.Location = new System.Drawing.Point(143, 80);
this.textBox.MaxLength = 20;
this.textBox.Name = "textBox";
this.textBox.Size = new System.Drawing.Size(489, 47);
@ -104,17 +104,18 @@
this.labelTitle.BackPictureBox2 = null;
this.labelTitle.BorderColor = System.Drawing.Color.Black;
this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelTitle.Font = new System.Drawing.Font("새굴림", 20F, System.Drawing.FontStyle.Bold);
this.labelTitle.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold);
this.labelTitle.ForeColor = System.Drawing.Color.Gray;
this.labelTitle.InitVisible = true;
this.labelTitle.LineSpacing = 0F;
this.labelTitle.Location = new System.Drawing.Point(143, 43);
this.labelTitle.Location = new System.Drawing.Point(143, 16);
this.labelTitle.Name = "labelTitle";
this.labelTitle.Size = new System.Drawing.Size(489, 50);
this.labelTitle.TabIndex = 183;
this.labelTitle.Text = "입력";
this.labelTitle.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelTitle.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelTitle.Visible = false;
this.labelTitle.Wordwrap = false;
//
// DialogFormUserEditorKeyboard

18
INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.cs
View File

@ -16,7 +16,7 @@ namespace INT69DB_2A.DialogForms
#endregion
#region Constructor
public DialogFormUserEditorKeyboard(string value)
public DialogFormUserEditorKeyboard(string value, DataStore.LanguageID language)
{
InitializeComponent();
@ -25,6 +25,22 @@ namespace INT69DB_2A.DialogForms
this.InitializeControl();
this.DefaultSetting();
switch (language)
{
case DataStore.LanguageID.Korean:
this.labelTitle.Text = "입력";
break;
case DataStore.LanguageID.English:
this.labelTitle.Text = "Type";
break;
case DataStore.LanguageID.Chinese:
this.labelTitle.Text = "输入";
break;
default:
this.labelTitle.Text = "Type";
break;
}
}
#endregion

79
INT69DB_2A/Forms/FormCommunication.cs
View File

@ -122,6 +122,7 @@ namespace INT69DB_2A.Forms
this.comboBoxMode.Items.Add("OPT3");
this.comboBoxMode.Items.Add("Modbus");
this.comboBoxMode.Items.Add("OPT4");
this.comboBoxMode.Items.Add("OPT5");
this.comboBoxMode.SelectedIndex = 0;
this.comboBoxMode.SelectedIndexChanged += new EventHandler(this.comboBoxMode_SelectedIndexChanged);
@ -142,6 +143,7 @@ namespace INT69DB_2A.Forms
this.comboBoxSerial3Mode.Items.Add("OPT3");
this.comboBoxSerial3Mode.Items.Add("Printer");
this.comboBoxSerial3Mode.Items.Add("OPT4");
this.comboBoxSerial3Mode.Items.Add("OPT5");
this.comboBoxSerial3Mode.SelectedIndex = 0;
this.comboBoxSerial3Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSerial3Mode_SelectedIndexChanged);
}
@ -300,6 +302,13 @@ namespace INT69DB_2A.Forms
else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
data = this.ParentForm.Protocol_OPT4(1, this.ParentForm.CollectionWeightData[0]);
}
else if (this.ParentForm.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f6_OPT5)
{
if (this.ParentForm.SystemConfig.EquipmentMode == 1)
data = this.ParentForm.Protocol_OPT5(this.ParentForm.CollectionWeightData);
else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
data = this.ParentForm.Protocol_OPT5(1, this.ParentForm.CollectionWeightData[0]);
}
switch (this.ParentForm.SystemConfig.EthernetOperationMode)
{
@ -358,6 +367,13 @@ namespace INT69DB_2A.Forms
else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
data = this.ParentForm.Protocol_OPT4(1, this.ParentForm.CollectionWeightData[0]);
}
else if (this.ParentForm.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f6_OPT5)
{
if (this.ParentForm.SystemConfig.EquipmentMode == 1)
data = this.ParentForm.Protocol_OPT5(this.ParentForm.CollectionWeightData);
else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
data = this.ParentForm.Protocol_OPT5(1, this.ParentForm.CollectionWeightData[0]);
}
switch (this.ParentForm.SystemConfig.EthernetOperationMode)
{
@ -386,7 +402,14 @@ namespace INT69DB_2A.Forms
private void UpdateDisplayCom3()
{
this.comboBoxSerial3BaudRate.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial3BaudRate_SelectedIndexChanged);
this.comboBoxSerial3BaudRate.SelectedItem = this.ParentForm.SystemConfig.Serial3BaudRate;
try
{
this.comboBoxSerial3BaudRate.SelectedIndex = this.ParentForm.SystemConfig.Serial3BaudRate;
}
catch
{
this.comboBoxSerial3BaudRate.SelectedIndex = 0;
}
this.comboBoxSerial3BaudRate.SelectedIndexChanged += new EventHandler(this.comboBoxSerial3BaudRate_SelectedIndexChanged);
this.comboBoxSerial3Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial3Mode_SelectedIndexChanged);
@ -464,6 +487,19 @@ namespace INT69DB_2A.Forms
this.labelProtocolDescriptionCOM3_2.Text = "LANE[2],GRD[1],WEIGHT[6],ETX[1]]";
}
}
else if (this.comboBoxSerial3Mode.SelectedIndex == 6)
{
if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],Pass Count[7],NG Count[7],";
this.labelProtocolDescriptionCOM3_2.Text = "Total Count[9],{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],Pass Count[7],NG Count[7],";
this.labelProtocolDescriptionCOM3_2.Text = "Total Count[9],LANE[2],GRD[1],WEIGHT[6],ETX[1]]";
}
}
else
{
if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese)
@ -537,6 +573,19 @@ namespace INT69DB_2A.Forms
this.labelProtocolDescriptionEthernet_2.Text = "LANE[2],GRD[1],WEIGHT[6],ETX[1]]";
}
}
else if (this.comboBoxMode.SelectedIndex == (int)DataStore.EthernetMode.f6_OPT5)
{
if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3)
{
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],Pass Count[7],NG Count[7],";
this.labelProtocolDescriptionEthernet_2.Text = "Total Count[9],{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
{
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],Pass Count[7],NG Count[7],";
this.labelProtocolDescriptionEthernet_2.Text = "Total Count[9],LANE[2],GRD[1],WEIGHT[6],ETX[1]]";
}
}
else
{
if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese)
@ -1472,7 +1521,7 @@ namespace INT69DB_2A.Forms
beforeMode = this.ReturnCommunicationModeName(comboBox, this.ParentForm.SystemConfig.Serial3Mode);
beforeBaudrate = this.ParentForm.SystemConfig.Serial3BaudRate.ToString();
this.ParentForm.SystemConfig.Serial3BaudRate = (int)this.comboBoxSerial3BaudRate.SelectedItem;
this.ParentForm.SystemConfig.Serial3BaudRate = this.comboBoxSerial3BaudRate.SelectedIndex;
this.ParentForm.SystemConfig.Serial3Mode = this.comboBoxSerial3Mode.SelectedIndex;
afterMode = this.ReturnCommunicationModeName(comboBox, this.ParentForm.SystemConfig.Serial3Mode);
@ -1500,6 +1549,25 @@ namespace INT69DB_2A.Forms
this.ParentForm.smartSerialPortCom3.FrameSeparationType = SmartSerialPort.FRAMESEPARATIONTYPES.STXANDETX;
break;
}
switch (this.ParentForm.SystemConfig.Serial3BaudRate)
{
case 0:
this.ParentForm.smartSerialPortCom3.Baud_Rate = SmartSerialPort.BAUDRATE._9600bps;
break;
case 1:
this.ParentForm.smartSerialPortCom3.Baud_Rate = SmartSerialPort.BAUDRATE._19200bps;
break;
case 2:
this.ParentForm.smartSerialPortCom3.Baud_Rate = SmartSerialPort.BAUDRATE._38400bps;
break;
case 3:
this.ParentForm.smartSerialPortCom3.Baud_Rate = SmartSerialPort.BAUDRATE._115200bps;
break;
default:
this.ParentForm.smartSerialPortCom3.Baud_Rate = SmartSerialPort.BAUDRATE._9600bps;
break;
}
this.ParentForm.smartSerialPortCom3.Open();
this.buttonSerialSend.Enabled = true;
@ -1548,6 +1616,13 @@ namespace INT69DB_2A.Forms
else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT4_NotStxEtx(1, this.ParentForm.CollectionWeightData[0]));
}
else if (this.ParentForm.SystemConfig.Serial3Mode == (int)DataStore.SerialMode.f6_OPT5)
{
if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3)
this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT5_NotStxEtx(this.ParentForm.CollectionWeightData));
else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT5_NotStxEtx(1, this.ParentForm.CollectionWeightData[0]));
}
}
private void comboBoxSerial3BaudRate_SelectedIndexChanged(object sender, EventArgs e)

12
INT69DB_2A/Forms/FormConfiguration.cs
View File

@ -481,7 +481,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._6006_Chattering, value);
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcChattering, "", before, after);
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.Chattering, "", before, after);
}
}
}
@ -511,7 +511,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._6001_BuzzerOnTime, value);
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcBuzzerRunTime, "", before, after);
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BuzzerONTime, "", before, after);
}
}
}
@ -541,7 +541,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._6002_RelayRunTime, value);
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcRelayRunTime, "", before, after);
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.RelayONTime, "", before, after);
}
}
}
@ -572,13 +572,11 @@ namespace INT69DB_2A.Forms
string before = "", after = "";
before = this.comboBoxDecimalPlaces.Items.IndexOf(this.ParentForm.SystemConfig.DecimalPlaces).ToString();
this.ParentForm.SystemConfig.DecimalPlaces = this.comboBoxDecimalPlaces.SelectedIndex;
this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
after = this.comboBoxDecimalPlaces.SelectedItem.ToString();
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcDecimalpoint, "", before, after);
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.Decimal, "", before, after);
}
private void labelAlarmContinuousNG_Click(object sender, EventArgs e)

2
INT69DB_2A/Forms/FormDataStatistics.cs
View File

@ -661,7 +661,7 @@ namespace INT69DB_2A.Forms
{
ret = -1;
splash.Finish();
DialogFormMessage msg = new DialogFormMessage(13, this.ParentForm.SystemConfig.Language);
DialogFormMessage msg = new DialogFormMessage(19, this.ParentForm.SystemConfig.Language);
msg.ShowDialog();
this.ParentForm.smartFileIO.Close();

2
INT69DB_2A/Forms/FormDataViewer.cs
View File

@ -385,7 +385,7 @@ namespace INT69DB_2A.Forms
this.CollectionHistoryData.Clear();
ret = -1;
splash.Finish();
DialogFormMessage msg = new DialogFormMessage(13, this.ParentForm.SystemConfig.Language);
DialogFormMessage msg = new DialogFormMessage(19, this.ParentForm.SystemConfig.Language);
msg.ShowDialog();
this.ParentForm.smartFileIO.Close();

6
INT69DB_2A/Forms/FormInformation.cs
View File

@ -109,7 +109,7 @@ namespace INT69DB_2A.Forms
}
private void DefaultSetting()
{
this.labelDisplayVer.Text = "5.3.0";
this.labelDisplayVer.Text = "6.3.1";
this.labelUserMgerVer.Text = "";
this.labelAes128Ver.Text = "";
this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber;
@ -403,7 +403,9 @@ namespace INT69DB_2A.Forms
{
this.ParentForm.SystemConfig.CurrentForm = DataStore.FormStore.FormInformation;
this.ParentForm.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._1500_ProgramVersion, "");
SerialMgrComm.serialPort_GetVersion();
if (this.ParentForm.FlagDllSerial == true)
SerialMgrComm.serialPort_GetVersion();
if (this.ParentForm.SystemConfig.IsLogin == true)
UserManager.UserManager_GetVersion();

30
INT69DB_2A/Forms/FormMain.Designer.cs generated
View File

@ -41,6 +41,8 @@
this.timerUserList = new System.Windows.Forms.Timer();
this.timerTimeOutTransmission = new System.Windows.Forms.Timer();
this.smartSerialPortCom3 = new SmartX.SmartSerialPort();
this.smartSerialPortLink = new SmartX.SmartSerialPort();
this.smartFileCom3Log = new SmartX.SmartFile();
((System.ComponentModel.ISupportInitialize)(this.smartForm)).BeginInit();
this.SuspendLayout();
//
@ -123,6 +125,31 @@
this.smartSerialPortCom3.STXCodes = null;
this.smartSerialPortCom3.TailErrorCodeOffset = 0;
//
// smartSerialPortLink
//
this.smartSerialPortLink.Baud_Rate = SmartX.SmartSerialPort.BAUDRATE._115200bps;
this.smartSerialPortLink.ErrorCheckCodeType = SmartX.SmartSerialPort.ERRORCHECKCODETYPES.ASCIICODE;
this.smartSerialPortLink.ErrorCheckMode = SmartX.SmartSerialPort.ERRORCHECK.NONE;
this.smartSerialPortLink.ErrorCode_Location = SmartX.SmartSerialPort.ERRORCODELOCATION.HEADER;
this.smartSerialPortLink.ETXCode = ((byte)(3));
this.smartSerialPortLink.ETXCodes = null;
this.smartSerialPortLink.FrameBufferSize = ((uint)(4096u));
this.smartSerialPortLink.FrameSeparationType = SmartX.SmartSerialPort.FRAMESEPARATIONTYPES.STXANDETX;
this.smartSerialPortLink.HeadErrorCodeOffset = 0;
this.smartSerialPortLink.PortNo = SmartX.SmartSerialPort.COMPORTNO.COM2;
this.smartSerialPortLink.ReadTimeout = -1;
this.smartSerialPortLink.ReceiveDetect = SmartX.SmartSerialPort.RECEIVEDETECTTYPE.EVENT_QUEUE;
this.smartSerialPortLink.ReceiveFrameDebugMode = false;
this.smartSerialPortLink.RS485SoftwareDetection = false;
this.smartSerialPortLink.STXCode = ((byte)(2));
this.smartSerialPortLink.STXCodes = null;
this.smartSerialPortLink.TailErrorCodeOffset = 0;
this.smartSerialPortLink.OnReadQueueEvent += new SmartX.SmartSerialPort.ReceiveDataHandler(this.smartSerialPortLink_OnReadQueueEvent);
//
// smartFileCom3Log
//
this.smartFileCom3Log.FilePathName = null;
//
// FormMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@ -151,6 +178,7 @@
private System.Windows.Forms.Timer timerUserList;
public System.Windows.Forms.Timer timerTimeOutTransmission;
public SmartX.SmartSerialPort smartSerialPortCom3;
private SmartX.SmartSerialPort smartSerialPortLink;
public SmartX.SmartFile smartFileCom3Log;
}
}

367
INT69DB_2A/Forms/FormMain.cs
View File

@ -41,6 +41,8 @@ namespace INT69DB_2A.Forms
private bool IsTimerWaitResponseEnableTrue;
public int FlagAutomaticLogoutWarningTime; //Part11 Auto Logout
public string ComPortMainToLCD; // DllSerial Port
public bool FlagDllSerial; // DllSerial 사용여부
private string TransferNum; // 수신데이터 ID저장 (재전송 시 사용)
// Motor Download 통신용 변수
public int LineNum;
@ -437,6 +439,7 @@ namespace INT69DB_2A.Forms
this.EquipmentStatus = DataStore.EquipmentStatus.Stop;
this.ColorLogOff = Color.Red;
this.ColorLogOn = Color.Yellow;
this.TransferNum = "-";
this.PathLaunchFolder = "SD Card\\";
this.PathSystemFileFolder1 = this.PathLaunchFolder + "SystemFile1\\";
@ -546,12 +549,17 @@ namespace INT69DB_2A.Forms
this.CurrentAlarmTotalPassCnt = new Counter(this.SystemConfig.EquipmentColumns, this.SystemConfig.AlarmTotalPassCnt);
// SerialDll Initialize
this.ComPortMainToLCD = "COM2:";
SerialMgrComm.IntializeSerialManager();
SerialMgrComm.SerialPortMessageReceive += this.SerialPort_MessageReceive;
SerialMgrComm.SerialPortErrMessageReceive += this.SerialPort_ErrMessageReceive;
SerialMgrComm.SerialPortGetVersionDataEvent += this.Serialport_GetVersionDataEvent;
// DllSerial 사용여부 설정
this.FlagDllSerial = false;
if (this.FlagDllSerial == true)
{
// SerialDll Initialize
this.ComPortMainToLCD = "COM2:";
SerialMgrComm.IntializeSerialManager();
SerialMgrComm.SerialPortMessageReceive += this.SerialPort_MessageReceive;
SerialMgrComm.SerialPortErrMessageReceive += this.SerialPort_ErrMessageReceive;
SerialMgrComm.SerialPortGetVersionDataEvent += this.Serialport_GetVersionDataEvent;
}
}
private bool UI_Invoke(ThreadStart invoker)
{
@ -1489,6 +1497,205 @@ namespace INT69DB_2A.Forms
return sb.ToString();
}
public string Protocol_OPT5(Collection<WeightData> datas)
{
string value = "";
int toTalAll = 0, toTalPass = 0, totalNg = 0;
StringBuilder sb = new StringBuilder();
for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
{
toTalAll += datas[i].TotalCount;
toTalPass += datas[i].PassCount;
totalNg += datas[i].TotalNGCount;
}
sb.Append((char)0x02);
sb.Append(string.Format("IN{0:D3}", this.SystemConfig.EquipmentID));
sb.Append(string.Format("{0:D4}", this.SystemConfig.ProductNumber));
value = toTalPass.ToString();
sb.Append(value.PadLeft(7, ' '));
value = totalNg.ToString();
sb.Append(value.PadLeft(7, ' '));
value = toTalAll.ToString();
sb.Append(value.PadLeft(9, ' '));
if (this.SystemConfig.IsWeightViewForward == true)
{
for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
{
if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Under)
sb.Append("U");
else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Over)
sb.Append("O");
else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Double)
sb.Append("D");
else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Pass)
sb.Append("P");
else
sb.Append("E");
value = Helper.DoubleToString(datas[i].Weight, this.SystemConfig.DecimalPlaces);
sb.Append(value.PadLeft(6, ' '));
}
}
else
{
for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++)
{
if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Under)
sb.Append("U");
else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Pass)
sb.Append("P");
else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Over)
sb.Append("O");
else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Double)
sb.Append("D");
else
sb.Append("E");
value = Helper.DoubleToString(datas[datas.Count - i].Weight, this.SystemConfig.DecimalPlaces);
sb.Append(value.PadLeft(6, ' '));
}
}
sb.Append((char)0x03);
return sb.ToString();
}
public string Protocol_OPT5(int lane, WeightData data)
{
string value = "";
StringBuilder sb = new StringBuilder();
sb.Append((char)0x02);
sb.Append(string.Format("IN{0:D3}", this.SystemConfig.EquipmentID));
sb.Append(string.Format("{0:D4}", this.SystemConfig.ProductNumber));
value = data.PassCount.ToString();
sb.Append(value.PadLeft(7, ' '));
value = data.TotalNGCount.ToString();
sb.Append(value.PadLeft(7, ' '));
value = data.TotalCount.ToString();
sb.Append(value.PadLeft(9, ' '));
sb.Append(string.Format("{0:D2}", lane));
if (data.JudgmentStatus == DataStore.JudgmentStatus.Under)
sb.Append("U");
else if (data.JudgmentStatus == DataStore.JudgmentStatus.Over)
sb.Append("O");
else if (data.JudgmentStatus == DataStore.JudgmentStatus.Double)
sb.Append("D");
else if (data.JudgmentStatus == DataStore.JudgmentStatus.Pass)
sb.Append("P");
else
sb.Append("E");
value = Helper.DoubleToString(data.Weight, this.SystemConfig.DecimalPlaces);
sb.Append(value.PadLeft(6, ' '));
sb.Append((char)0x03);
return sb.ToString();
}
public string Protocol_OPT5_NotStxEtx(Collection<WeightData> datas)
{
string value = "";
int toTalAll = 0, toTalPass = 0, totalNg = 0;
StringBuilder sb = new StringBuilder();
for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
{
toTalAll += datas[i].TotalCount;
toTalPass += datas[i].PassCount;
totalNg += datas[i].TotalNGCount;
}
sb.Append(string.Format("IN{0:D3}", this.SystemConfig.EquipmentID));
sb.Append(string.Format("{0:D4}", this.SystemConfig.ProductNumber));
value = toTalPass.ToString();
sb.Append(value.PadLeft(7, ' '));
value = totalNg.ToString();
sb.Append(value.PadLeft(7, ' '));
value = toTalAll.ToString();
sb.Append(value.PadLeft(9, ' '));
if (this.SystemConfig.IsWeightViewForward == true)
{
for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
{
if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Under)
sb.Append("U");
else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Over)
sb.Append("O");
else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Double)
sb.Append("D");
else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Pass)
sb.Append("P");
else
sb.Append("E");
value = Helper.DoubleToString(datas[i].Weight, this.SystemConfig.DecimalPlaces);
sb.Append(value.PadLeft(6, ' '));
}
}
else
{
for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++)
{
if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Under)
sb.Append("U");
else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Pass)
sb.Append("P");
else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Over)
sb.Append("O");
else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Double)
sb.Append("D");
else
sb.Append("E");
value = Helper.DoubleToString(datas[datas.Count - i].Weight, this.SystemConfig.DecimalPlaces);
sb.Append(value.PadLeft(6, ' '));
}
}
return sb.ToString();
}
public string Protocol_OPT5_NotStxEtx(int lane, WeightData data)
{
string value = "";
StringBuilder sb = new StringBuilder();
sb.Append(string.Format("IN{0:D3}", this.SystemConfig.EquipmentID));
sb.Append(string.Format("{0:D4}", this.SystemConfig.ProductNumber));
value = data.PassCount.ToString();
sb.Append(value.PadLeft(7, ' '));
value = data.TotalNGCount.ToString();
sb.Append(value.PadLeft(7, ' '));
value = data.TotalCount.ToString();
sb.Append(value.PadLeft(9, ' '));
sb.Append(string.Format("{0:D2}", lane));
if (data.JudgmentStatus == DataStore.JudgmentStatus.Under)
sb.Append("U");
else if (data.JudgmentStatus == DataStore.JudgmentStatus.Over)
sb.Append("O");
else if (data.JudgmentStatus == DataStore.JudgmentStatus.Double)
sb.Append("D");
else if (data.JudgmentStatus == DataStore.JudgmentStatus.Pass)
sb.Append("P");
else
sb.Append("E");
value = Helper.DoubleToString(data.Weight, this.SystemConfig.DecimalPlaces);
sb.Append(value.PadLeft(6, ' '));
return sb.ToString();
}
public byte[] Protocol_Modbus_Client_Write_Common_Data()
{
int index = 0;
@ -2960,6 +3167,9 @@ namespace INT69DB_2A.Forms
case 5:
this.UartCom3Write(this.Protocol_OPT4_NotStxEtx(datas));
break;
case 6:
this.UartCom3Write(this.Protocol_OPT5_NotStxEtx(datas));
break;
default:
break;
}
@ -3032,6 +3242,7 @@ namespace INT69DB_2A.Forms
{
try
{
this.smartSerialPortCom3.Close();
switch (this.SystemConfig.Serial3BaudRate)
{
case 0:
@ -3050,8 +3261,7 @@ namespace INT69DB_2A.Forms
this.smartSerialPortCom3.Baud_Rate = SmartSerialPort.BAUDRATE._9600bps;
break;
}
if (this.smartSerialPortCom3.IsOpen == false)
this.smartSerialPortCom3.Open();
this.smartSerialPortCom3.Open();
}
catch
{
@ -3069,6 +3279,9 @@ namespace INT69DB_2A.Forms
public void UartCom3Write(string data)
{
this.smartSerialPortCom3.WriteFrame(data, SmartSerialPort.CODETYPES.ASCIICODE);
// 로그
//if (this.IsCom3LogOpen == true)
//this.smartFileCom3Log.WriteString(string.Format("COM3 Send ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, data));
}
private int UartCom3Write(string command, string id, string address, string data)
{
@ -3092,7 +3305,7 @@ namespace INT69DB_2A.Forms
return ret;
}
private void TreatSerialCommunication(Collection<WeightData> datas)
public void TreatSerialCommunication(Collection<WeightData> datas)
{
if (this.SystemConfig.Serial3Mode == 0)
return;
@ -3111,6 +3324,8 @@ namespace INT69DB_2A.Forms
}
else if (this.SystemConfig.Serial3Mode == 5) // OPT4
this.UartCom3Write(this.Protocol_OPT4_NotStxEtx(this.CollectionWeightData));
else if (this.SystemConfig.Serial3Mode == 6) // OPT5
this.UartCom3Write(this.Protocol_OPT5_NotStxEtx(this.CollectionWeightData));
}
private void TreatSerialCommunication(int lane, WeightData data)
{
@ -3131,6 +3346,8 @@ namespace INT69DB_2A.Forms
}
else if (this.SystemConfig.Serial3Mode == 5) // OPT4
this.UartCom3Write(this.Protocol_OPT4_NotStxEtx(lane, data));
else if (this.SystemConfig.Serial3Mode == 6) // OPT5
this.UartCom3Write(this.Protocol_OPT5_NotStxEtx(lane, data));
}
#endregion
#region Ethernet
@ -3173,6 +3390,11 @@ namespace INT69DB_2A.Forms
sendData = this.Protocol_OPT4(this.CollectionWeightData);
this.SendEthernetData(sendData);
}
else if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f6_OPT5)
{
sendData = this.Protocol_OPT5(this.CollectionWeightData);
this.SendEthernetData(sendData);
}
}
private void TreatEthernetCommunication(int lane, WeightData data)
{
@ -3210,6 +3432,11 @@ namespace INT69DB_2A.Forms
sendData = this.Protocol_OPT4(lane, data);
this.SendEthernetData(sendData);
}
else if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f6_OPT5)
{
sendData = this.Protocol_OPT5(lane, data);
this.SendEthernetData(sendData);
}
}
private void SendEthernetData(string etherData)
{
@ -3607,7 +3834,13 @@ namespace INT69DB_2A.Forms
try
{
SerialMgrComm.serialPortOpen(this.ComPortMainToLCD, 115200, 0, 0, 8);
if (this.FlagDllSerial == true)
SerialMgrComm.serialPortOpen(this.ComPortMainToLCD, 115200, 0, 0, 8);
else
{
if (this.smartSerialPortLink.IsOpen == false)
this.smartSerialPortLink.Open();
}
}
catch
{
@ -3627,7 +3860,10 @@ namespace INT69DB_2A.Forms
}
public void CloseSmartUartLink()
{
SerialMgrComm.serialPortClose(this.ComPortMainToLCD);
if (this.FlagDllSerial == true)
SerialMgrComm.serialPortClose(this.ComPortMainToLCD);
else
this.smartSerialPortLink.Close();
}
private bool SizeCheck(string cmd, string strTemp)
@ -3833,7 +4069,14 @@ namespace INT69DB_2A.Forms
sb.Append(chkSum);
SerialMgrComm.serialPortMessage(this.ComPortMainToLCD, sb.ToString());
// Serial Write
if (this.FlagDllSerial == true)
SerialMgrComm.serialPortMessage(this.ComPortMainToLCD, sb.ToString());
else
{
if (this.smartSerialPortLink.IsOpen == true)
this.smartSerialPortLink.WriteFrame(sb.ToString(), SmartSerialPort.CODETYPES.ASCIICODE);
}
// 통신 확인 로그
if (this.IsCommunicationLogOpen == true)
@ -3880,7 +4123,14 @@ namespace INT69DB_2A.Forms
for (int i = 0; i < byteCollection.Count; i++)
byteData[i] = byteCollection[i];
SerialMgrComm.serialPortMessageByte(this.ComPortMainToLCD, byteData, byteData.Length);
// Serial Write
if (this.FlagDllSerial == true)
SerialMgrComm.serialPortMessageByte(this.ComPortMainToLCD, byteData, byteData.Length);
else
{
if (this.smartSerialPortLink.IsOpen == true)
this.smartSerialPortLink.WriteFrame(byteData);
}
// 통신 확인 로그
if (this.IsCommunicationLogOpen == true)
@ -3911,7 +4161,14 @@ namespace INT69DB_2A.Forms
sb.Append(chkSum);
SerialMgrComm.serialPortMessage(this.ComPortMainToLCD, sb.ToString());
// Serial Write
if (this.FlagDllSerial == true)
SerialMgrComm.serialPortMessage(this.ComPortMainToLCD, sb.ToString());
else
{
if (this.smartSerialPortLink.IsOpen == true)
this.smartSerialPortLink.WriteFrame(sb.ToString(), SmartSerialPort.CODETYPES.ASCIICODE);
}
// 통신 확인 로그
if (this.IsCommunicationLogOpen == true)
@ -3947,6 +4204,53 @@ namespace INT69DB_2A.Forms
{
}
}
private void ReceiveData()
{
int ret = 0;
string strTemp = "";
byte[] readByte;
SmartSerialPort.FRAMEDATAREADSTATUS receiveDataState = SmartSerialPort.FRAMEDATAREADSTATUS.EMPTY;
try
{
receiveDataState = this.smartSerialPortLink.ReadQueue(out readByte);
strTemp = Encoding.Default.GetString(readByte, 0, readByte.Length);
}
catch
{
return;
}
if ((receiveDataState == SmartSerialPort.FRAMEDATAREADSTATUS.EMPTY) || (receiveDataState == SmartSerialPort.FRAMEDATAREADSTATUS.FAILDATA))
{
return;
}
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)
{
@ -4119,6 +4423,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;
@ -5493,7 +5802,7 @@ namespace INT69DB_2A.Forms
#region 통신
this.TreatSerialCommunication(this.CollectionWeightData);
this.TreatEthernetCommunication(this.CollectionWeightData);
this.TreatEthernetCommunication(this.CollectionWeightData);
#endregion
#region ACNC(Alarm Continuous Ng Count)
@ -5595,7 +5904,7 @@ namespace INT69DB_2A.Forms
// 판정설정 그래프
private int ReceiveCommandSG0(string lane, string receiveData)
{
int ret = 0, temp = 12;
int ret = 0, temp = 20;
switch (lane)
{
@ -8138,13 +8447,12 @@ namespace INT69DB_2A.Forms
// 폼생성
this.CreateForm();
this.SmartSplashProgramLoad.Finish();
this.smartForm.Show((int)DataStore.FormStore.FormMainDisplay);
// 통신 OPEN
this.OpenSmartUartLink();
this.SmartSplashProgramLoad.Finish();
this.smartForm.Show((int)DataStore.FormStore.FormMainDisplay);
// Serial3 통신 Open
this.UartCom3Open();
Thread.Sleep(100);
@ -8331,6 +8639,23 @@ namespace INT69DB_2A.Forms
}
}
private void smartSerialPortLink_OnReadQueueEvent()
{
this.ReceiveData();
// 통신 확인
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)
{
// 로그

6
INT69DB_2A/Forms/FormMain.resx
View File

@ -150,6 +150,12 @@
<metadata name="smartSerialPortCom3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>370, 56</value>
</metadata>
<metadata name="smartSerialPortLink.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>539, 56</value>
</metadata>
<metadata name="smartFileCom3Log.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>676, 54</value>
</metadata>
<metadata name="$this.FormFactorShadowProperty" xml:space="preserve">
<value>WEBPAD</value>
</metadata>

2
INT69DB_2A/Forms/FormMainDisplay.Designer.cs generated
View File

@ -418,7 +418,7 @@
this.labelTitleNGCount.Name = "labelTitleNGCount";
this.labelTitleNGCount.Size = new System.Drawing.Size(70, 20);
this.labelTitleNGCount.TabIndex = 183;
this.labelTitleNGCount.Text = "EXNG";
this.labelTitleNGCount.Text = "NG";
this.labelTitleNGCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelTitleNGCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelTitleNGCount.Wordwrap = false;

4
INT69DB_2A/Forms/FormMainDisplay.cs
View File

@ -752,7 +752,7 @@ namespace INT69DB_2A.Forms
this.UpdateDisplayButton(SmartButton.BUTSTATUS.DOWN, SmartButton.BUTSTATUS.UP, SmartButton.BUTSTATUS.UP);
#endregion
}
else if (displayForm == DataStore.MainDisplayStore.LineGraph)
else if (displayForm == DataStore.MainDisplayStore.DotGraph)
{
#region DotGraph
switch (this.ParentForm.SystemConfig.EquipmentColumns)
@ -3011,7 +3011,7 @@ namespace INT69DB_2A.Forms
if (button == this.buttonBarGraphForm)
this.MainDisplay = DataStore.MainDisplayStore.BarGraph;
else if (button == this.buttonDotGraphForm)
this.MainDisplay = DataStore.MainDisplayStore.LineGraph;
this.MainDisplay = DataStore.MainDisplayStore.DotGraph;
else if (button == this.buttonTableForm)
this.MainDisplay = DataStore.MainDisplayStore.Table;
else

87
INT69DB_2A/Forms/FormMotorSetting.Designer.cs generated
View File

@ -127,6 +127,7 @@
this.buttonCom1TestForward = new SmartX.SmartButton();
this.buttonCom1TestReverse = new SmartX.SmartButton();
this.panel1 = new System.Windows.Forms.Panel();
this.radioButtonImpellerMotorAngle180180 = new SmartX.SmartRadioButton();
((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
this.groupBoxSelectImpeller.SuspendLayout();
this.groupBoxEach.SuspendLayout();
@ -430,7 +431,7 @@
this.buttonEachForward.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonEachForward.DisableImage = null;
this.buttonEachForward.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonEachForward.DownImage")));
this.buttonEachForward.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonEachForward.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
this.buttonEachForward.GroupID = 0;
this.buttonEachForward.InitVisible = true;
this.buttonEachForward.Location = new System.Drawing.Point(27, 55);
@ -463,7 +464,7 @@
this.buttonEachReverse.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonEachReverse.DisableImage = null;
this.buttonEachReverse.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonEachReverse.DownImage")));
this.buttonEachReverse.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonEachReverse.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
this.buttonEachReverse.GroupID = 0;
this.buttonEachReverse.InitVisible = true;
this.buttonEachReverse.Location = new System.Drawing.Point(113, 55);
@ -496,7 +497,7 @@
this.buttonEachUnlock.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonEachUnlock.DisableImage = null;
this.buttonEachUnlock.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonEachUnlock.DownImage")));
this.buttonEachUnlock.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonEachUnlock.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
this.buttonEachUnlock.GroupID = 0;
this.buttonEachUnlock.InitVisible = true;
this.buttonEachUnlock.Location = new System.Drawing.Point(199, 55);
@ -529,7 +530,7 @@
this.buttonEachContinue.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonEachContinue.DisableImage = null;
this.buttonEachContinue.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonEachContinue.DownImage")));
this.buttonEachContinue.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonEachContinue.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
this.buttonEachContinue.GroupID = 0;
this.buttonEachContinue.InitVisible = true;
this.buttonEachContinue.Location = new System.Drawing.Point(285, 55);
@ -562,7 +563,7 @@
this.buttonAllContinue.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonAllContinue.DisableImage = null;
this.buttonAllContinue.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonAllContinue.DownImage")));
this.buttonAllContinue.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonAllContinue.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
this.buttonAllContinue.GroupID = 0;
this.buttonAllContinue.InitVisible = true;
this.buttonAllContinue.Location = new System.Drawing.Point(284, 55);
@ -595,7 +596,7 @@
this.buttonAllUnlock.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonAllUnlock.DisableImage = null;
this.buttonAllUnlock.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonAllUnlock.DownImage")));
this.buttonAllUnlock.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonAllUnlock.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
this.buttonAllUnlock.GroupID = 0;
this.buttonAllUnlock.InitVisible = true;
this.buttonAllUnlock.Location = new System.Drawing.Point(198, 55);
@ -628,7 +629,7 @@
this.buttonAllReverse.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonAllReverse.DisableImage = null;
this.buttonAllReverse.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonAllReverse.DownImage")));
this.buttonAllReverse.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonAllReverse.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
this.buttonAllReverse.GroupID = 0;
this.buttonAllReverse.InitVisible = true;
this.buttonAllReverse.Location = new System.Drawing.Point(112, 55);
@ -661,7 +662,7 @@
this.buttonAllForward.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonAllForward.DisableImage = null;
this.buttonAllForward.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonAllForward.DownImage")));
this.buttonAllForward.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonAllForward.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
this.buttonAllForward.GroupID = 0;
this.buttonAllForward.InitVisible = true;
this.buttonAllForward.Location = new System.Drawing.Point(26, 55);
@ -702,7 +703,7 @@
this.groupBoxSelectImpeller.Controls.Add(this.buttonLine4);
this.groupBoxSelectImpeller.Controls.Add(this.buttonLine5);
this.groupBoxSelectImpeller.Controls.Add(this.buttonLine6);
this.groupBoxSelectImpeller.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold);
this.groupBoxSelectImpeller.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.groupBoxSelectImpeller.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(66)))), ((int)(((byte)(44)))));
this.groupBoxSelectImpeller.FrameLineColor2 = System.Drawing.Color.Black;
this.groupBoxSelectImpeller.FrameLineThickness = 1;
@ -859,7 +860,7 @@
this.groupBoxEach.Controls.Add(this.buttonEachReverse);
this.groupBoxEach.Controls.Add(this.buttonEachUnlock);
this.groupBoxEach.Controls.Add(this.buttonEachContinue);
this.groupBoxEach.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold);
this.groupBoxEach.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.groupBoxEach.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(66)))), ((int)(((byte)(44)))));
this.groupBoxEach.FrameLineColor2 = System.Drawing.Color.Black;
this.groupBoxEach.FrameLineThickness = 1;
@ -882,7 +883,7 @@
this.smartLabel1.BackPictureBox2 = null;
this.smartLabel1.BorderColor = System.Drawing.Color.Black;
this.smartLabel1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.smartLabel1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold);
this.smartLabel1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
this.smartLabel1.ForeColor = System.Drawing.Color.DarkRed;
this.smartLabel1.InitVisible = true;
this.smartLabel1.LineSpacing = 0F;
@ -905,7 +906,7 @@
this.groupBoxAll.Controls.Add(this.buttonAllReverse);
this.groupBoxAll.Controls.Add(this.buttonAllUnlock);
this.groupBoxAll.Controls.Add(this.buttonAllContinue);
this.groupBoxAll.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold);
this.groupBoxAll.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.groupBoxAll.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(66)))), ((int)(((byte)(44)))));
this.groupBoxAll.FrameLineColor2 = System.Drawing.Color.Black;
this.groupBoxAll.FrameLineThickness = 1;
@ -928,7 +929,7 @@
this.smartLabel8.BackPictureBox2 = null;
this.smartLabel8.BorderColor = System.Drawing.Color.Black;
this.smartLabel8.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.smartLabel8.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold);
this.smartLabel8.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
this.smartLabel8.ForeColor = System.Drawing.Color.DarkRed;
this.smartLabel8.InitVisible = true;
this.smartLabel8.LineSpacing = 0F;
@ -948,7 +949,7 @@
this.labelTitle.BackPictureBox2 = null;
this.labelTitle.BorderColor = System.Drawing.Color.Black;
this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelTitle.Font = new System.Drawing.Font("New Gulim", 23F, System.Drawing.FontStyle.Bold);
this.labelTitle.Font = new System.Drawing.Font("새굴림", 23F, System.Drawing.FontStyle.Bold);
this.labelTitle.ForeColor = System.Drawing.Color.White;
this.labelTitle.InitVisible = true;
this.labelTitle.LineSpacing = 0F;
@ -1024,6 +1025,7 @@
//
this.groupBoxAngle.BackPictureBox = this.smartForm1;
this.groupBoxAngle.BackPictureBox1 = null;
this.groupBoxAngle.Controls.Add(this.radioButtonImpellerMotorAngle180180);
this.groupBoxAngle.Controls.Add(this.radioButtonImpellerMotorAngle360);
this.groupBoxAngle.Controls.Add(this.labelTitleStep2);
this.groupBoxAngle.Controls.Add(this.labelTitleStep1);
@ -1037,7 +1039,7 @@
this.groupBoxAngle.Controls.Add(this.comboBoxTwoStepPassAngle);
this.groupBoxAngle.Controls.Add(this.labelTitleNG);
this.groupBoxAngle.Controls.Add(this.labelTitlePass);
this.groupBoxAngle.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold);
this.groupBoxAngle.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.groupBoxAngle.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(66)))), ((int)(((byte)(44)))));
this.groupBoxAngle.FrameLineColor2 = System.Drawing.Color.Black;
this.groupBoxAngle.FrameLineThickness = 1;
@ -1059,12 +1061,12 @@
this.radioButtonImpellerMotorAngle360.BackPictureBox1 = null;
this.radioButtonImpellerMotorAngle360.BackPictureBox2 = null;
this.radioButtonImpellerMotorAngle360.Checked = false;
this.radioButtonImpellerMotorAngle360.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold);
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.Location = new System.Drawing.Point(312, 69);
this.radioButtonImpellerMotorAngle360.Name = "radioButtonImpellerMotorAngle360";
this.radioButtonImpellerMotorAngle360.OutputOnly = false;
this.radioButtonImpellerMotorAngle360.RadioBackColor = System.Drawing.Color.White;
@ -1127,7 +1129,7 @@
this.radioButtonImpellerMotorAngle60.BackPictureBox1 = null;
this.radioButtonImpellerMotorAngle60.BackPictureBox2 = null;
this.radioButtonImpellerMotorAngle60.Checked = false;
this.radioButtonImpellerMotorAngle60.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold);
this.radioButtonImpellerMotorAngle60.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold);
this.radioButtonImpellerMotorAngle60.GroupID = 0;
this.radioButtonImpellerMotorAngle60.ImageCheckRadioButton = null;
this.radioButtonImpellerMotorAngle60.ImageUnCheckRadioButton = null;
@ -1153,7 +1155,7 @@
this.radioButtonImpellerMotorAngle180.BackPictureBox1 = null;
this.radioButtonImpellerMotorAngle180.BackPictureBox2 = null;
this.radioButtonImpellerMotorAngle180.Checked = false;
this.radioButtonImpellerMotorAngle180.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold);
this.radioButtonImpellerMotorAngle180.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold);
this.radioButtonImpellerMotorAngle180.GroupID = 0;
this.radioButtonImpellerMotorAngle180.ImageCheckRadioButton = null;
this.radioButtonImpellerMotorAngle180.ImageUnCheckRadioButton = null;
@ -1179,7 +1181,7 @@
this.radioButtonImpellerMotorAngle120.BackPictureBox1 = null;
this.radioButtonImpellerMotorAngle120.BackPictureBox2 = null;
this.radioButtonImpellerMotorAngle120.Checked = false;
this.radioButtonImpellerMotorAngle120.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold);
this.radioButtonImpellerMotorAngle120.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold);
this.radioButtonImpellerMotorAngle120.GroupID = 0;
this.radioButtonImpellerMotorAngle120.ImageCheckRadioButton = null;
this.radioButtonImpellerMotorAngle120.ImageUnCheckRadioButton = null;
@ -1205,7 +1207,7 @@
this.radioButtonImpellerMotorAngle90.BackPictureBox1 = null;
this.radioButtonImpellerMotorAngle90.BackPictureBox2 = null;
this.radioButtonImpellerMotorAngle90.Checked = false;
this.radioButtonImpellerMotorAngle90.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold);
this.radioButtonImpellerMotorAngle90.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold);
this.radioButtonImpellerMotorAngle90.GroupID = 0;
this.radioButtonImpellerMotorAngle90.ImageCheckRadioButton = null;
this.radioButtonImpellerMotorAngle90.ImageUnCheckRadioButton = null;
@ -1372,7 +1374,7 @@
this.groupBoxDirection.Controls.Add(this.buttonDirectionLine4);
this.groupBoxDirection.Controls.Add(this.buttonDirectionLine5);
this.groupBoxDirection.Controls.Add(this.buttonDirectionLine6);
this.groupBoxDirection.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold);
this.groupBoxDirection.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.groupBoxDirection.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(66)))), ((int)(((byte)(44)))));
this.groupBoxDirection.FrameLineColor2 = System.Drawing.Color.Black;
this.groupBoxDirection.FrameLineThickness = 1;
@ -1743,7 +1745,7 @@
this.groupBoxEachDownload.Controls.Add(this.label5);
this.groupBoxEachDownload.Controls.Add(this.label6);
this.groupBoxEachDownload.Controls.Add(this.progressBarExistingDownload);
this.groupBoxEachDownload.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold);
this.groupBoxEachDownload.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.groupBoxEachDownload.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(66)))), ((int)(((byte)(44)))));
this.groupBoxEachDownload.FrameLineColor2 = System.Drawing.Color.Black;
this.groupBoxEachDownload.FrameLineThickness = 1;
@ -2270,7 +2272,7 @@
this.groupBoxInitialDownload.Controls.Add(this.labelStaticWarning2);
this.groupBoxInitialDownload.Controls.Add(this.labelStaticWarning1);
this.groupBoxInitialDownload.Controls.Add(this.progressBarDownload);
this.groupBoxInitialDownload.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold);
this.groupBoxInitialDownload.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.groupBoxInitialDownload.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(66)))), ((int)(((byte)(44)))));
this.groupBoxInitialDownload.FrameLineColor2 = System.Drawing.Color.Black;
this.groupBoxInitialDownload.FrameLineThickness = 1;
@ -2296,7 +2298,7 @@
this.buttonDeviceIDChange.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonDeviceIDChange.DisableImage = null;
this.buttonDeviceIDChange.DownImage = null;
this.buttonDeviceIDChange.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold);
this.buttonDeviceIDChange.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.buttonDeviceIDChange.GroupID = 0;
this.buttonDeviceIDChange.InitVisible = true;
this.buttonDeviceIDChange.Location = new System.Drawing.Point(179, 35);
@ -2330,7 +2332,7 @@
this.buttonInitialDownload.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonInitialDownload.DisableImage = null;
this.buttonInitialDownload.DownImage = null;
this.buttonInitialDownload.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold);
this.buttonInitialDownload.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.buttonInitialDownload.GroupID = 0;
this.buttonInitialDownload.InitVisible = true;
this.buttonInitialDownload.Location = new System.Drawing.Point(22, 35);
@ -2427,7 +2429,7 @@
this.groupBoxMotorTest.Controls.Add(this.labelStaticWarning3);
this.groupBoxMotorTest.Controls.Add(this.buttonCom1TestForward);
this.groupBoxMotorTest.Controls.Add(this.buttonCom1TestReverse);
this.groupBoxMotorTest.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold);
this.groupBoxMotorTest.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.groupBoxMotorTest.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(66)))), ((int)(((byte)(44)))));
this.groupBoxMotorTest.FrameLineColor2 = System.Drawing.Color.Black;
this.groupBoxMotorTest.FrameLineThickness = 1;
@ -2473,7 +2475,7 @@
this.buttonCom1TestForward.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonCom1TestForward.DisableImage = null;
this.buttonCom1TestForward.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonCom1TestForward.DownImage")));
this.buttonCom1TestForward.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonCom1TestForward.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
this.buttonCom1TestForward.GroupID = 0;
this.buttonCom1TestForward.InitVisible = true;
this.buttonCom1TestForward.Location = new System.Drawing.Point(106, 66);
@ -2506,7 +2508,7 @@
this.buttonCom1TestReverse.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonCom1TestReverse.DisableImage = null;
this.buttonCom1TestReverse.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonCom1TestReverse.DownImage")));
this.buttonCom1TestReverse.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.buttonCom1TestReverse.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
this.buttonCom1TestReverse.GroupID = 0;
this.buttonCom1TestReverse.InitVisible = true;
this.buttonCom1TestReverse.Location = new System.Drawing.Point(192, 66);
@ -2540,6 +2542,32 @@
this.panel1.Size = new System.Drawing.Size(800, 348);
this.panel1.Visible = false;
//
// radioButtonImpellerMotorAngle180180
//
this.radioButtonImpellerMotorAngle180180.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(228)))), ((int)(((byte)(180)))));
this.radioButtonImpellerMotorAngle180180.BackPictureBox = null;
this.radioButtonImpellerMotorAngle180180.BackPictureBox1 = null;
this.radioButtonImpellerMotorAngle180180.BackPictureBox2 = null;
this.radioButtonImpellerMotorAngle180180.Checked = false;
this.radioButtonImpellerMotorAngle180180.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold);
this.radioButtonImpellerMotorAngle180180.GroupID = 0;
this.radioButtonImpellerMotorAngle180180.ImageCheckRadioButton = null;
this.radioButtonImpellerMotorAngle180180.ImageUnCheckRadioButton = null;
this.radioButtonImpellerMotorAngle180180.InitVisible = true;
this.radioButtonImpellerMotorAngle180180.Location = new System.Drawing.Point(187, 69);
this.radioButtonImpellerMotorAngle180180.Name = "radioButtonImpellerMotorAngle180180";
this.radioButtonImpellerMotorAngle180180.OutputOnly = false;
this.radioButtonImpellerMotorAngle180180.RadioBackColor = System.Drawing.Color.White;
this.radioButtonImpellerMotorAngle180180.RadioCheckColor = System.Drawing.Color.Green;
this.radioButtonImpellerMotorAngle180180.RadioForeColor = System.Drawing.Color.Black;
this.radioButtonImpellerMotorAngle180180.RadioSymbolSize = 14;
this.radioButtonImpellerMotorAngle180180.Shadow = false;
this.radioButtonImpellerMotorAngle180180.Size = new System.Drawing.Size(119, 26);
this.radioButtonImpellerMotorAngle180180.TabIndex = 275;
this.radioButtonImpellerMotorAngle180180.Text = "180+180";
this.radioButtonImpellerMotorAngle180180.TextVAlign = SmartX.SmartRadioButton.TextVerAlign.Middle;
this.radioButtonImpellerMotorAngle180180.Click += new System.EventHandler(this.radioButtonImpellerMotorAngle_Click);
//
// FormMotorSetting
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@ -2674,5 +2702,6 @@
private SmartX.SmartButton buttonCom1TestReverse;
private System.Windows.Forms.Panel panel1;
private SmartX.SmartRadioButton radioButtonImpellerMotorAngle360;
private SmartX.SmartRadioButton radioButtonImpellerMotorAngle180180;
}
}

37
INT69DB_2A/Forms/FormMotorSetting.cs
View File

@ -811,6 +811,12 @@ namespace INT69DB_2A.Forms
case 12:
tempString = "130";
break;
case 13:
tempString = "360";
break;
case 14:
tempString = "360";
break;
default:
break;
}
@ -994,18 +1000,30 @@ namespace INT69DB_2A.Forms
else if (this.ParentForm.SystemConfig.ImpellerMotorAnglePass == 3)
this.radioButtonImpellerMotorAngle120.Checked = true;
else if (this.ParentForm.SystemConfig.ImpellerMotorAnglePass == 13)
this.radioButtonImpellerMotorAngle180180.Checked = true;
else if (this.ParentForm.SystemConfig.ImpellerMotorAnglePass == 14)
this.radioButtonImpellerMotorAngle360.Checked = true;
else
{
this.radioButtonImpellerMotorAngle180.Checked = true;
try
{
this.radioButtonImpellerMotorAngle180.Checked = true;
if (this.ParentForm.SystemConfig.ImpellerMotorAnglePass != 4)
this.comboBoxTwoStepPassAngle.SelectedIndex = this.ParentForm.SystemConfig.ImpellerMotorAnglePass - 5;
if (this.ParentForm.SystemConfig.ImpellerMotorAnglePass != 4)
this.comboBoxTwoStepPassAngle.SelectedIndex = this.ParentForm.SystemConfig.ImpellerMotorAnglePass - 5;
if (this.ParentForm.SystemConfig.ImpellerMotorAngleNG != 4)
this.comboBoxTwoStepNGAngle.SelectedIndex = this.ParentForm.SystemConfig.ImpellerMotorAngleNG - 5;
if (this.ParentForm.SystemConfig.ImpellerMotorAngleNG != 4)
this.comboBoxTwoStepNGAngle.SelectedIndex = this.ParentForm.SystemConfig.ImpellerMotorAngleNG - 5;
this.MotorAngleControlEnable(true);
this.MotorAngleControlEnable(true);
}
catch
{
this.comboBoxTwoStepPassAngle.SelectedIndex = 0;
this.comboBoxTwoStepNGAngle.SelectedIndex = 0;
this.MotorAngleControlEnable(true);
}
}
}
else
@ -2331,11 +2349,16 @@ namespace INT69DB_2A.Forms
else
this.ParentForm.SystemConfig.ImpellerMotorAngleNG = this.comboBoxTwoStepNGAngle.SelectedIndex + 5;
}
else if (this.radioButtonImpellerMotorAngle360.Checked == true)
else if (this.radioButtonImpellerMotorAngle180180.Checked == true)
{
this.ParentForm.SystemConfig.ImpellerMotorAnglePass = 13;
this.ParentForm.SystemConfig.ImpellerMotorAngleNG = 13;
}
else if (this.radioButtonImpellerMotorAngle360.Checked == true)
{
this.ParentForm.SystemConfig.ImpellerMotorAnglePass = 14;
this.ParentForm.SystemConfig.ImpellerMotorAngleNG = 14;
}
afterAnglePass = this.ReturnAngle(this.ParentForm.SystemConfig.ImpellerMotorAnglePass);
afterAngleNG = this.ReturnAngle(this.ParentForm.SystemConfig.ImpellerMotorAngleNG);

8
INT69DB_2A/Forms/FormProgramUpdate.Designer.cs generated
View File

@ -63,7 +63,7 @@
this.labelUpdateWait2.BackPictureBox2 = null;
this.labelUpdateWait2.BorderColor = System.Drawing.Color.Black;
this.labelUpdateWait2.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelUpdateWait2.Font = new System.Drawing.Font("New Gulim", 18F, System.Drawing.FontStyle.Bold);
this.labelUpdateWait2.Font = new System.Drawing.Font("새굴림", 18F, System.Drawing.FontStyle.Bold);
this.labelUpdateWait2.ForeColor = System.Drawing.Color.Black;
this.labelUpdateWait2.InitVisible = true;
this.labelUpdateWait2.LineSpacing = 0F;
@ -85,7 +85,7 @@
this.labelUpdateRestart.BackPictureBox2 = null;
this.labelUpdateRestart.BorderColor = System.Drawing.Color.Black;
this.labelUpdateRestart.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelUpdateRestart.Font = new System.Drawing.Font("New Gulim", 18F, System.Drawing.FontStyle.Bold);
this.labelUpdateRestart.Font = new System.Drawing.Font("새굴림", 18F, System.Drawing.FontStyle.Bold);
this.labelUpdateRestart.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.labelUpdateRestart.InitVisible = true;
this.labelUpdateRestart.LineSpacing = 0F;
@ -107,7 +107,7 @@
this.labelUpdateWait.BackPictureBox2 = null;
this.labelUpdateWait.BorderColor = System.Drawing.Color.Black;
this.labelUpdateWait.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelUpdateWait.Font = new System.Drawing.Font("New Gulim", 18F, System.Drawing.FontStyle.Bold);
this.labelUpdateWait.Font = new System.Drawing.Font("새굴림", 18F, System.Drawing.FontStyle.Bold);
this.labelUpdateWait.InitVisible = true;
this.labelUpdateWait.LineSpacing = 0F;
this.labelUpdateWait.Location = new System.Drawing.Point(108, 205);
@ -154,7 +154,7 @@
this.labelTitle.BackPictureBox2 = null;
this.labelTitle.BorderColor = System.Drawing.Color.Black;
this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelTitle.Font = new System.Drawing.Font("New Gulim", 23F, System.Drawing.FontStyle.Bold);
this.labelTitle.Font = new System.Drawing.Font("새굴림", 23F, System.Drawing.FontStyle.Bold);
this.labelTitle.ForeColor = System.Drawing.Color.White;
this.labelTitle.InitVisible = true;
this.labelTitle.LineSpacing = 0F;

1
INT69DB_2A/Forms/FormSystemSetting.cs
View File

@ -320,7 +320,6 @@ namespace INT69DB_2A.Forms
this.buttonLine1.ButtonDown();
for (int i = 1; i < this.CollectionButtonLine.Count; i++)
this.CollectionButtonLine[i].ButtonUp();
this.ParentForm.TransferData(CommunicationCommand.ModeJudgment, CommunicationID.SubBoard1);
this.SelectedProductItem = new ProductItem();
this.SelectedJudgmentSetItem = new JudgmentSetItem();

7
INT69DB_2A/Forms/FormUserEditor.cs
View File

@ -290,7 +290,8 @@ namespace INT69DB_2A.Forms
if (this.SelectedUserItem.Group == DataStore.UserGroup.Admin)
{
item.ActiveLevel = 9;
if (this.ParentForm.SystemConfig.IsPart11 == true)
item.ActiveLevel = 9;
}
else
{
@ -1032,7 +1033,7 @@ namespace INT69DB_2A.Forms
private void labelID_Click(object sender, EventArgs e)
{
string value = "";
DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelID.Text);
DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelID.Text, this.ParentForm.SystemConfig.Language);
if (keyboard.ShowDialog() == DialogResult.OK)
{
@ -1050,7 +1051,7 @@ namespace INT69DB_2A.Forms
private void labelPassword_Click(object sender, EventArgs e)
{
string value = "";
DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.SelectedUserItem.Password);
DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.SelectedUserItem.Password, this.ParentForm.SystemConfig.Language);
if (keyboard.ShowDialog() == DialogResult.OK)
{

6
INT69DB_2A/Forms/FormUserGroupEditor.cs
View File

@ -620,7 +620,7 @@ namespace INT69DB_2A.Forms
before = this.labelLevel1Name.Text;
DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelLevel1Name.Text);
DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelLevel1Name.Text, this.ParentForm.SystemConfig.Language);
if (keyboard.ShowDialog() == DialogResult.OK)
{
@ -641,7 +641,7 @@ namespace INT69DB_2A.Forms
before = this.labelLevel2Name.Text;
DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelLevel2Name.Text);
DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelLevel2Name.Text, this.ParentForm.SystemConfig.Language);
if (keyboard.ShowDialog() == DialogResult.OK)
{
@ -662,7 +662,7 @@ namespace INT69DB_2A.Forms
before = this.labelLevel3Name.Text;
DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelLevel3Name.Text);
DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelLevel3Name.Text, this.ParentForm.SystemConfig.Language);
if (keyboard.ShowDialog() == DialogResult.OK)
{

4
INT69DB_2A/INT69DB_2A.csproj
View File

@ -57,11 +57,11 @@
<Reference Include="mscorlib" />
<Reference Include="SmartXCommon, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_20210120\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartXCommon.dll</HintPath>
<HintPath>C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_V3대 마지막버전\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartXCommon.dll</HintPath>
</Reference>
<Reference Include="SmartX_IEC1000, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_20210120\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartX_IEC1000.dll</HintPath>
<HintPath>C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_V3대 마지막버전\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartX_IEC1000.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />

71
INT69DB_2A/Version.txt
View File

@ -15,6 +15,52 @@
멀티형 2~6열 스틱 계량기
*/
@ Ver 6.3.1 by LSJ
- 2025.04.02
- Ver 6.3.0 Modify
- Framework : SmartX Framework V3.2.4(update: 2021.01.20)
- FormDataStatistics.cs
FormDataViewer.cs
메시지 버그 수정
DataRead() : Message 13->19
@ Ver 6.3.0 by CJY
- 2025.02.07
- Ver 6.2.0 Modify
- Framework : SmartX Framework V3.2.4(update: 2021.01.20)
- 프로토콜 OPT5 추가
- (버그수정) 보레이트 설정 시 SelectedIndex로 변경
@ Ver 6.2.0 by CJY
- 2025.01.08
- Ver 6.1.1 Modify
- Framework : SmartX Framework V3.2.4(update: 2021.01.20)
- 모터설정 180+180 회전 추가
@ Ver 6.1.1 by LSJ
- 2025.01.02
- Ver 6.1.0 Modify
- Framework : SmartX Framework V3.2.4(update: 2021.01.20)
- 시스템설정
판정 그래프 안그려지는 버그 수정
// 판정설정 그래프
private int ReceiveCommandSG0(string lane, string receiveData)
temp = 12 -> 20 수정
속도 데이터가 추가 되어있다고함(실제로는 -99990000 이거만 수신됨..)
@ Ver 6.1.0 by LSJ
- 2024.12.05
- Ver 6.0.0 Modify
- Framework : SmartX Framework V3.2.4(update: 2021.01.20)
- SerialDll 미사용
SmartSerialPort 사용
- 환경설정 소수점 저장안되는 버그 수정
- XY 그래프 화면 데이터 갯수 수정
draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
-> draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
627/2 = 313
627/16 = 39
@ Ver 6.0.0 by CJY
- 2024.11.19
- Ver 5.2.1 Modify
@ -35,6 +81,31 @@
header.EquipmentType = 103;
- 이미지 96dpi, 포토샵 이미지 확인
@ Ver 5.3.0 by LSJ
- 2025.02.07
- Ver 5.2.2 Modify
- Framework : SmartX Framework V3.1.1(update: 2019.03.21)
- 영테크팩 요청사항 추가
V6.3.0 - OPT5 추가
- 메시지 박스 사이즈 변경
영문 4-13 메시지 짤리는 문제로 사이즈 늘림
@ Ver 5.2.2 by LSJ
- 2024.12.05
- Ver 5.2.0 Modify
- Framework : SmartX Framework V3.1.1(update: 2019.03.21)
- 버그수정
환경설정-소수점 변경시 저장안되는 버그 수정
- Part11 관련 수정
OtherBackup() 시 헤더파일에 파라미터 누락
header.EquipmentType = 103;
- XY 그래프 화면 데이터 갯수 수정
draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
-> draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1);
627/2 = 313
627/16 = 39
>>>>>>> 5d6775a ( - ?곹뀒?ы뙥 ?붿껌?ы빆 異붽?)
@ Ver 5.2.1 by CJY
- 2024.08.21
- Ver 5.2.0 Modify

BIN
INT69DB_2A/bin/Release/SmartXCommon.dll
View File

Binary file not shown.

BIN
INT69DB_2A/bin/Release/SmartX_IEC1000.dll
View File

Binary file not shown.