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

Compare commits

base: chojy:V6.2.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

7 Commits
V6.2.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
20 changed files with 449 additions and 431 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";
}

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)
{

6
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
@ -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)

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();

2
INT69DB_2A/Forms/FormInformation.cs
View File

@ -109,7 +109,7 @@ namespace INT69DB_2A.Forms
}
private void DefaultSetting()
{
this.labelDisplayVer.Text = "6.2.0";
this.labelDisplayVer.Text = "6.3.1";
this.labelUserMgerVer.Text = "";
this.labelAes128Ver.Text = "";
this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber;

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

@ -42,6 +42,7 @@
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();
//
@ -145,6 +146,10 @@
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);
@ -174,6 +179,6 @@
public System.Windows.Forms.Timer timerTimeOutTransmission;
public SmartX.SmartSerialPort smartSerialPortCom3;
private SmartX.SmartSerialPort smartSerialPortLink;
public SmartX.SmartFile smartFileCom3Log;
}
}

225
INT69DB_2A/Forms/FormMain.cs
View File

@ -1497,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;
@ -2968,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;
}
@ -3040,6 +3242,7 @@ namespace INT69DB_2A.Forms
{
try
{
this.smartSerialPortCom3.Close();
switch (this.SystemConfig.Serial3BaudRate)
{
case 0:
@ -3058,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
{
@ -3077,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)
{
@ -3100,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;
@ -3119,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)
{
@ -3139,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
@ -3181,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)
{
@ -3218,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)
{

3
INT69DB_2A/Forms/FormMain.resx
View File

@ -153,6 +153,9 @@
<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>

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

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)
{

41
INT69DB_2A/Version.txt
View File

@ -15,6 +15,22 @@
멀티형 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
@ -65,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.