diff --git a/INT69DB_2A/DataStore.cs b/INT69DB_2A/DataStore.cs index a890b00..4c8bd6d 100644 --- a/INT69DB_2A/DataStore.cs +++ b/INT69DB_2A/DataStore.cs @@ -1176,6 +1176,7 @@ namespace INT69DB_2A private bool m_IsPingTimer; private bool m_IsOptDataStatistics; private bool m_IsIntegratedTransmission; + private bool m_IsEmergencyStopEntrySensorError; private int m_DecimalPlaces; private int m_EthernetPort; @@ -1322,6 +1323,11 @@ namespace INT69DB_2A get { return this.m_IsIntegratedTransmission; } set { this.m_IsIntegratedTransmission = value; } } + public bool IsEmergencyStopEntrySensorError + { + get { return this.m_IsEmergencyStopEntrySensorError; } + set { this.m_IsEmergencyStopEntrySensorError = value; } + } public int DecimalPlaces { @@ -1544,6 +1550,7 @@ namespace INT69DB_2A this.IsPingTimer = false; this.IsOptDataStatistics = false; this.IsIntegratedTransmission = false; + this.IsEmergencyStopEntrySensorError = false; this.DecimalPlaces = 1; this.EthernetPort = 5000; @@ -1630,7 +1637,7 @@ namespace INT69DB_2A public DataStore.LanguageID Language; - public bool DummyBool1; + public bool IsEmergencyStopEntrySensorError; public bool IsIntegratedTransmission; public bool IsLogin; public bool IsFeedingConveyorRunPass; diff --git a/INT69DB_2A/DialogForms/DialogFormMessage.cs b/INT69DB_2A/DialogForms/DialogFormMessage.cs index 52b0359..823d9d8 100644 --- a/INT69DB_2A/DialogForms/DialogFormMessage.cs +++ b/INT69DB_2A/DialogForms/DialogFormMessage.cs @@ -7,12 +7,14 @@ using System.Drawing; using System.Text; using System.Windows.Forms; +using INT69DB_2A.Forms; + namespace INT69DB_2A.DialogForms { public partial class DialogFormMessage : Form { #region Field - + private FormMain m_ParentForm; #endregion #region Constructor @@ -1324,6 +1326,112 @@ namespace INT69DB_2A.DialogForms break; } } + public DialogFormMessage(int code, DataStore.LanguageID language, FormMain parent) + { + InitializeComponent(); + + this.ParentForm = parent; + + this.labelErrorCode.Text = ""; + this.labelMessage1.Text = ""; + this.labelMessage2.Text = ""; + + switch (language) + { + case DataStore.LanguageID.Korean: + #region 한글 + switch (code) + { + case 11: + this.labelErrorCode.Text = "Error 11"; + this.labelMessage1.Text = "입력센서 에러에 의해 정지하였습니다."; + break; + default: + this.labelErrorCode.Text = "Error 99"; + this.labelMessage1.Text = "제조사에 문의하세요"; + break; + } + #endregion + break; + case DataStore.LanguageID.English: + #region 영문 + switch (code) + { + case 11: + this.labelErrorCode.Text = "Error 11"; + this.labelMessage1.Text = "Emergency stop due to entry sensor error"; + break; + default: + this.labelErrorCode.Text = "Error 99"; + this.labelMessage1.Text = "Please contact a manufacturer"; + break; + } + #endregion + break; + case DataStore.LanguageID.Chinese: + #region 중문 + this.buttonOK.Text = "好"; + + switch (code) + { + case 11: + this.labelErrorCode.Text = "錯誤 11"; + this.labelMessage1.Text = "由于进入传感器错误导致紧急停止"; + break; + default: + this.labelErrorCode.Text = "錯誤 99"; + this.labelMessage1.Text = "请联系厂商"; + break; + } + #endregion + break; + case DataStore.LanguageID.Czech: + #region 체코어 + switch (code) + { + case 11: + this.labelErrorCode.Text = "Chybě 11"; + this.labelMessage1.Text = "Nouzové zastavení z důvodu chyby snímače vstupu"; + break; + default: + this.labelErrorCode.Text = "Chybě 99"; + this.labelMessage1.Text = "Kontaktujte výrobce"; + break; + } + #endregion + break; + case DataStore.LanguageID.German: + #region 독일어 + switch (code) + { + case 11: + this.labelErrorCode.Text = "Fehler 11"; + this.labelMessage1.Text = "Notstopp aufgrund eines Eintrittssensorfehlers"; + break; + default: + this.labelErrorCode.Text = "Fehler 99"; + this.labelMessage1.Text = "Hersteller kontaktieren"; + break; + } + #endregion + break; + default: + #region 한글 + switch (code) + { + case 11: + this.labelErrorCode.Text = "Error 11"; + this.labelMessage1.Text = "입력센서 에러에 의해 정지하였습니다."; + break; + default: + this.labelErrorCode.Text = "Error 99"; + this.labelMessage1.Text = "제조사에 문의하세요"; + break; + } + #endregion + break; + } + } public DialogFormMessage(DataStore.MessageBoxIcon icon, string code, string message1, string message2, int autoClose_sec) { InitializeComponent(); @@ -1379,7 +1487,11 @@ namespace INT69DB_2A.DialogForms #endregion #region Property - + public FormMain ParentForm + { + get { return this.m_ParentForm; } + set { this.m_ParentForm = value; } + } #endregion #region Method diff --git a/INT69DB_2A/Forms/FormEquipmentSetting.Designer.cs b/INT69DB_2A/Forms/FormEquipmentSetting.Designer.cs index 27efb5a..efa2e7e 100644 --- a/INT69DB_2A/Forms/FormEquipmentSetting.Designer.cs +++ b/INT69DB_2A/Forms/FormEquipmentSetting.Designer.cs @@ -95,6 +95,8 @@ this.pictureBoxFormIcon = new System.Windows.Forms.PictureBox(); this.buttonSave = new SmartX.SmartButton(); this.buttonBack = new SmartX.SmartButton(); + this.buttonEmergencyStopEntrySensorError = new SmartX.SmartButton(); + this.labelStaticEmergencyStopEntrySensorError = new SmartX.SmartLabel(); ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit(); this.panel1.SuspendLayout(); this.panel3.SuspendLayout(); @@ -150,9 +152,9 @@ this.labelStaticEquipmentLine.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelStaticEquipmentLine.InitVisible = true; this.labelStaticEquipmentLine.LineSpacing = 0F; - this.labelStaticEquipmentLine.Location = new System.Drawing.Point(16, 112); + this.labelStaticEquipmentLine.Location = new System.Drawing.Point(614, 81); this.labelStaticEquipmentLine.Name = "labelStaticEquipmentLine"; - this.labelStaticEquipmentLine.Size = new System.Drawing.Size(204, 25); + this.labelStaticEquipmentLine.Size = new System.Drawing.Size(87, 25); this.labelStaticEquipmentLine.TabIndex = 119; this.labelStaticEquipmentLine.Text = "장비 열"; this.labelStaticEquipmentLine.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; @@ -189,7 +191,7 @@ this.labelStaticSelectSensor.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelStaticSelectSensor.InitVisible = true; this.labelStaticSelectSensor.LineSpacing = 0F; - this.labelStaticSelectSensor.Location = new System.Drawing.Point(12, 206); + this.labelStaticSelectSensor.Location = new System.Drawing.Point(12, 174); this.labelStaticSelectSensor.Name = "labelStaticSelectSensor"; this.labelStaticSelectSensor.Size = new System.Drawing.Size(208, 25); this.labelStaticSelectSensor.TabIndex = 119; @@ -229,7 +231,7 @@ this.labelStaticIndividualNG.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelStaticIndividualNG.InitVisible = true; this.labelStaticIndividualNG.LineSpacing = 0F; - this.labelStaticIndividualNG.Location = new System.Drawing.Point(12, 175); + this.labelStaticIndividualNG.Location = new System.Drawing.Point(12, 143); this.labelStaticIndividualNG.Name = "labelStaticIndividualNG"; this.labelStaticIndividualNG.Size = new System.Drawing.Size(208, 25); this.labelStaticIndividualNG.TabIndex = 125; @@ -250,7 +252,7 @@ this.buttonEachNG.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonEachNG.DownImage"))); this.buttonEachNG.GroupID = 0; this.buttonEachNG.InitVisible = true; - this.buttonEachNG.Location = new System.Drawing.Point(226, 175); + this.buttonEachNG.Location = new System.Drawing.Point(226, 143); this.buttonEachNG.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonEachNG.Name = "buttonEachNG"; this.buttonEachNG.NestedClickEventPrevent = false; @@ -372,16 +374,16 @@ // comboBoxEquipmentColumn // this.comboBoxEquipmentColumn.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); - this.comboBoxEquipmentColumn.Location = new System.Drawing.Point(226, 109); + this.comboBoxEquipmentColumn.Location = new System.Drawing.Point(707, 78); this.comboBoxEquipmentColumn.Name = "comboBoxEquipmentColumn"; - this.comboBoxEquipmentColumn.Size = new System.Drawing.Size(104, 29); + this.comboBoxEquipmentColumn.Size = new System.Drawing.Size(83, 29); this.comboBoxEquipmentColumn.TabIndex = 127; this.comboBoxEquipmentColumn.SelectedIndexChanged += new System.EventHandler(this.control_Click); // // comboBoxInputSensorSelect // this.comboBoxInputSensorSelect.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); - this.comboBoxInputSensorSelect.Location = new System.Drawing.Point(226, 202); + this.comboBoxInputSensorSelect.Location = new System.Drawing.Point(226, 170); this.comboBoxInputSensorSelect.Name = "comboBoxInputSensorSelect"; this.comboBoxInputSensorSelect.Size = new System.Drawing.Size(165, 29); this.comboBoxInputSensorSelect.TabIndex = 127; @@ -687,7 +689,7 @@ this.smartLabel12.ForeColor = System.Drawing.Color.Red; this.smartLabel12.InitVisible = true; this.smartLabel12.LineSpacing = 0F; - this.smartLabel12.Location = new System.Drawing.Point(428, 176); + this.smartLabel12.Location = new System.Drawing.Point(428, 144); this.smartLabel12.Name = "smartLabel12"; this.smartLabel12.Size = new System.Drawing.Size(267, 23); this.smartLabel12.TabIndex = 145; @@ -708,7 +710,7 @@ this.smartLabel14.ForeColor = System.Drawing.Color.Red; this.smartLabel14.InitVisible = true; this.smartLabel14.LineSpacing = 0F; - this.smartLabel14.Location = new System.Drawing.Point(428, 207); + this.smartLabel14.Location = new System.Drawing.Point(428, 175); this.smartLabel14.Name = "smartLabel14"; this.smartLabel14.Size = new System.Drawing.Size(267, 23); this.smartLabel14.TabIndex = 145; @@ -962,6 +964,8 @@ // this.groupBoxSpecialMenu.BackPictureBox = this.smartForm1; this.groupBoxSpecialMenu.BackPictureBox1 = null; + this.groupBoxSpecialMenu.Controls.Add(this.buttonEmergencyStopEntrySensorError); + this.groupBoxSpecialMenu.Controls.Add(this.labelStaticEmergencyStopEntrySensorError); this.groupBoxSpecialMenu.Controls.Add(this.smartLabel6); this.groupBoxSpecialMenu.Controls.Add(this.labelDataStoragePeriod); this.groupBoxSpecialMenu.Controls.Add(this.labelStaticDataStoragePeriod); @@ -1030,7 +1034,7 @@ this.smartLabel6.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular); this.smartLabel6.InitVisible = true; this.smartLabel6.LineSpacing = 0F; - this.smartLabel6.Location = new System.Drawing.Point(316, 299); + this.smartLabel6.Location = new System.Drawing.Point(320, 299); this.smartLabel6.Name = "smartLabel6"; this.smartLabel6.Size = new System.Drawing.Size(174, 25); this.smartLabel6.TabIndex = 259; @@ -1050,7 +1054,7 @@ this.labelDataStoragePeriod.Font = new System.Drawing.Font("Arial", 18F, System.Drawing.FontStyle.Bold); this.labelDataStoragePeriod.InitVisible = true; this.labelDataStoragePeriod.LineSpacing = 0F; - this.labelDataStoragePeriod.Location = new System.Drawing.Point(226, 299); + this.labelDataStoragePeriod.Location = new System.Drawing.Point(230, 299); this.labelDataStoragePeriod.Name = "labelDataStoragePeriod"; this.labelDataStoragePeriod.Size = new System.Drawing.Size(84, 25); this.labelDataStoragePeriod.TabIndex = 258; @@ -1070,7 +1074,7 @@ this.labelStaticDataStoragePeriod.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelStaticDataStoragePeriod.InitVisible = true; this.labelStaticDataStoragePeriod.LineSpacing = 0F; - this.labelStaticDataStoragePeriod.Location = new System.Drawing.Point(12, 299); + this.labelStaticDataStoragePeriod.Location = new System.Drawing.Point(16, 299); this.labelStaticDataStoragePeriod.Name = "labelStaticDataStoragePeriod"; this.labelStaticDataStoragePeriod.Size = new System.Drawing.Size(208, 25); this.labelStaticDataStoragePeriod.TabIndex = 257; @@ -1091,7 +1095,7 @@ this.smartLabel2.ForeColor = System.Drawing.Color.Red; this.smartLabel2.InitVisible = true; this.smartLabel2.LineSpacing = 0F; - this.smartLabel2.Location = new System.Drawing.Point(428, 144); + this.smartLabel2.Location = new System.Drawing.Point(428, 112); this.smartLabel2.Name = "smartLabel2"; this.smartLabel2.Size = new System.Drawing.Size(267, 25); this.smartLabel2.TabIndex = 248; @@ -1112,7 +1116,7 @@ this.buttonIntegratedTransmission.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonIntegratedTransmission.DownImage"))); this.buttonIntegratedTransmission.GroupID = 0; this.buttonIntegratedTransmission.InitVisible = true; - this.buttonIntegratedTransmission.Location = new System.Drawing.Point(226, 144); + this.buttonIntegratedTransmission.Location = new System.Drawing.Point(226, 112); this.buttonIntegratedTransmission.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonIntegratedTransmission.Name = "buttonIntegratedTransmission"; this.buttonIntegratedTransmission.NestedClickEventPrevent = false; @@ -1141,7 +1145,7 @@ this.labelStaticIntegratedTransmission.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelStaticIntegratedTransmission.InitVisible = true; this.labelStaticIntegratedTransmission.LineSpacing = 0F; - this.labelStaticIntegratedTransmission.Location = new System.Drawing.Point(12, 144); + this.labelStaticIntegratedTransmission.Location = new System.Drawing.Point(12, 112); this.labelStaticIntegratedTransmission.Name = "labelStaticIntegratedTransmission"; this.labelStaticIntegratedTransmission.Size = new System.Drawing.Size(208, 25); this.labelStaticIntegratedTransmission.TabIndex = 246; @@ -1240,6 +1244,56 @@ this.buttonBack.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonBack.UpImage"))); this.buttonBack.Click += new System.EventHandler(this.buttonBack_Click); // + // buttonEmergencyStopEntrySensorError + // + this.buttonEmergencyStopEntrySensorError.BackPictureBox = null; + this.buttonEmergencyStopEntrySensorError.BackPictureBox1 = null; + this.buttonEmergencyStopEntrySensorError.BackPictureBox2 = null; + this.buttonEmergencyStopEntrySensorError.ButtonColor = System.Drawing.Color.Gray; + this.buttonEmergencyStopEntrySensorError.ButtonImageAutoSize = true; + this.buttonEmergencyStopEntrySensorError.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonEmergencyStopEntrySensorError.DisableImage = null; + this.buttonEmergencyStopEntrySensorError.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonEmergencyStopEntrySensorError.DownImage"))); + this.buttonEmergencyStopEntrySensorError.GroupID = 0; + this.buttonEmergencyStopEntrySensorError.InitVisible = true; + this.buttonEmergencyStopEntrySensorError.Location = new System.Drawing.Point(226, 205); + this.buttonEmergencyStopEntrySensorError.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; + this.buttonEmergencyStopEntrySensorError.Name = "buttonEmergencyStopEntrySensorError"; + this.buttonEmergencyStopEntrySensorError.NestedClickEventPrevent = false; + this.buttonEmergencyStopEntrySensorError.OutlinePixel = 1; + this.buttonEmergencyStopEntrySensorError.RepeatInterval = 200; + this.buttonEmergencyStopEntrySensorError.RepeatIntervalAccelerate = null; + this.buttonEmergencyStopEntrySensorError.SafeInterval = 200; + this.buttonEmergencyStopEntrySensorError.Size = new System.Drawing.Size(84, 25); + this.buttonEmergencyStopEntrySensorError.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonEmergencyStopEntrySensorError.TabIndex = 269; + this.buttonEmergencyStopEntrySensorError.TextColor = System.Drawing.Color.Black; + this.buttonEmergencyStopEntrySensorError.TextDownColor = System.Drawing.Color.White; + this.buttonEmergencyStopEntrySensorError.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonEmergencyStopEntrySensorError.TextLocation = new System.Drawing.Point(0, 0); + this.buttonEmergencyStopEntrySensorError.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonEmergencyStopEntrySensorError.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonEmergencyStopEntrySensorError.UpImage"))); + this.buttonEmergencyStopEntrySensorError.Click += new System.EventHandler(this.control_Click); + // + // labelStaticEmergencyStopEntrySensorError + // + this.labelStaticEmergencyStopEntrySensorError.BackPictureBox = this.smartForm1; + this.labelStaticEmergencyStopEntrySensorError.BackPictureBox1 = null; + this.labelStaticEmergencyStopEntrySensorError.BackPictureBox2 = null; + this.labelStaticEmergencyStopEntrySensorError.BorderColor = System.Drawing.Color.Black; + this.labelStaticEmergencyStopEntrySensorError.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelStaticEmergencyStopEntrySensorError.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); + this.labelStaticEmergencyStopEntrySensorError.InitVisible = true; + this.labelStaticEmergencyStopEntrySensorError.LineSpacing = 0F; + this.labelStaticEmergencyStopEntrySensorError.Location = new System.Drawing.Point(16, 205); + this.labelStaticEmergencyStopEntrySensorError.Name = "labelStaticEmergencyStopEntrySensorError"; + this.labelStaticEmergencyStopEntrySensorError.Size = new System.Drawing.Size(204, 25); + this.labelStaticEmergencyStopEntrySensorError.TabIndex = 268; + this.labelStaticEmergencyStopEntrySensorError.Text = "입력센서 오류 시 정지"; + this.labelStaticEmergencyStopEntrySensorError.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; + this.labelStaticEmergencyStopEntrySensorError.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelStaticEmergencyStopEntrySensorError.Wordwrap = false; + // // FormEquipmentSetting // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -1331,5 +1385,7 @@ private SmartX.SmartLabel labelStaticDataStoragePeriod; private SmartX.SmartLabel smartLabel6; public System.Windows.Forms.RadioButton radioButtonJapanese; + private SmartX.SmartButton buttonEmergencyStopEntrySensorError; + private SmartX.SmartLabel labelStaticEmergencyStopEntrySensorError; } } \ No newline at end of file diff --git a/INT69DB_2A/Forms/FormEquipmentSetting.cs b/INT69DB_2A/Forms/FormEquipmentSetting.cs index a2a4440..2808f67 100644 --- a/INT69DB_2A/Forms/FormEquipmentSetting.cs +++ b/INT69DB_2A/Forms/FormEquipmentSetting.cs @@ -55,6 +55,7 @@ namespace INT69DB_2A.Forms this.radioButtonEquipmentModeStick2.Text = "Stick-II"; this.radioButtonEquipmentModeStick3.Text = "Stick-III"; this.labelStaticEquipmentLine.Text = "Line"; + this.labelStaticEmergencyStopEntrySensorError.Text = "Emergency stop due to entry sensor error"; this.labelStaticWeightCheck.Text = "Order"; this.labelStaticIndividualNG.Text = "Individual NG"; this.labelStaticSelectSensor.Text = "Select Entry sensor"; @@ -82,6 +83,7 @@ namespace INT69DB_2A.Forms this.radioButtonEquipmentModeStick2.Text = "球杆-II"; this.radioButtonEquipmentModeStick3.Text = "球杆-III"; this.labelStaticEquipmentLine.Text = "列"; + this.labelStaticEmergencyStopEntrySensorError.Text = "由于进入传感器错误导致紧急停止"; this.labelStaticWeightCheck.Text = "重量标示"; this.labelStaticIndividualNG.Text = "单独NG"; this.labelStaticSelectSensor.Text = "选择输入传感器"; @@ -123,6 +125,7 @@ namespace INT69DB_2A.Forms this.radioButtonEquipmentModeStick2.Text = "スティック-II"; this.radioButtonEquipmentModeStick3.Text = "スティック-III"; this.labelStaticEquipmentLine.Text = "ライン"; + this.labelStaticEmergencyStopEntrySensorError.Text = "入力センサエラー時に停止"; this.labelStaticWeightCheck.Text = "重量表示"; this.labelStaticIndividualNG.Text = "個別NG"; this.labelStaticSelectSensor.Text = "入力センサㅡの選択"; @@ -223,6 +226,12 @@ namespace INT69DB_2A.Forms // 입력센서 선택 this.comboBoxInputSensorSelect.SelectedItem = this.ParentForm.SystemConfig.InputSensorSelect; + // 입력센서 연속입력 시 정지 + if (this.ParentForm.SystemConfig.IsEmergencyStopEntrySensorError == true) + this.buttonEmergencyStopEntrySensorError.ButtonDown(); + else + this.buttonEmergencyStopEntrySensorError.ButtonUp(); + // 배출 컨베어 if (this.ParentForm.SystemConfig.IsDischargeConveyor == true) this.buttonDischargeConveyor.ButtonDown(); @@ -435,6 +444,12 @@ namespace INT69DB_2A.Forms // 입력센서 선택 this.ParentForm.SystemConfig.InputSensorSelect = this.comboBoxInputSensorSelect.SelectedIndex + 1; + // 입력센서 연속입력 시 정지 + if (this.buttonEmergencyStopEntrySensorError.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + this.ParentForm.SystemConfig.IsEmergencyStopEntrySensorError = true; + else + this.ParentForm.SystemConfig.IsEmergencyStopEntrySensorError = false; + // 배출 컨베어 if (this.buttonDischargeConveyor.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) this.ParentForm.SystemConfig.IsDischargeConveyor = true; diff --git a/INT69DB_2A/Forms/FormEquipmentSetting.resx b/INT69DB_2A/Forms/FormEquipmentSetting.resx index 3a92ddb..8c017c1 100644 --- a/INT69DB_2A/Forms/FormEquipmentSetting.resx +++ b/INT69DB_2A/Forms/FormEquipmentSetting.resx @@ -851,6 +851,134 @@ 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 + AAAAAElFTkSuQmCC + + + + + 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 diff --git a/INT69DB_2A/Forms/FormInformation.cs b/INT69DB_2A/Forms/FormInformation.cs index 8155883..2bdc0ad 100644 --- a/INT69DB_2A/Forms/FormInformation.cs +++ b/INT69DB_2A/Forms/FormInformation.cs @@ -113,7 +113,7 @@ namespace INT69DB_2A.Forms } private void DefaultSetting() { - this.labelDisplayVer.Text = "6.5.0"; + this.labelDisplayVer.Text = "6.6.0"; this.labelUserMgerVer.Text = ""; this.labelAes128Ver.Text = ""; this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber; diff --git a/INT69DB_2A/Forms/FormInitialization.cs b/INT69DB_2A/Forms/FormInitialization.cs index 25df2c5..12d504f 100644 --- a/INT69DB_2A/Forms/FormInitialization.cs +++ b/INT69DB_2A/Forms/FormInitialization.cs @@ -154,7 +154,7 @@ namespace INT69DB_2A.Forms structItem1.SerialNumber = this.ParentForm.SystemConfig.SerialNumber; // Dummy bool - structItem1.DummyBool1 = false; + structItem1.IsEmergencyStopEntrySensorError = this.ParentForm.SystemConfig.IsEmergencyStopEntrySensorError; structItem1.IsIntegratedTransmission = this.ParentForm.SystemConfig.IsIntegratedTransmission; structItem1.IsLogin = this.ParentForm.SystemConfig.IsLogin; structItem1.IsFeedingConveyorRunPass = this.ParentForm.SystemConfig.IsFeedingConveyorRunPass; @@ -195,8 +195,8 @@ namespace INT69DB_2A.Forms structItem2.DummyBool16 = false; structItem2.DummyBool17 = false; structItem2.DummyBool18 = false; - structItem2.IsAlarmContinuousNGEnable = false; - structItem2.IsAlarmTotalPassCntEnable = false; + structItem2.IsAlarmContinuousNGEnable = this.ParentForm.SystemConfig.IsAlarmContinuousNGEnable; + structItem2.IsAlarmTotalPassCntEnable = this.ParentForm.SystemConfig.IsAlarmTotalPassCntEnable; structItem2.DummyInt1 = 0; structItem2.DummyInt2 = 0; @@ -205,8 +205,8 @@ namespace INT69DB_2A.Forms structItem2.DummyInt5 = 0; structItem2.DummyInt6 = 0; structItem2.DummyInt7 = 0; - structItem2.AlarmContinuousNG = 0; - structItem2.AlarmTotalPassCnt = 0; + structItem2.AlarmContinuousNG = this.ParentForm.SystemConfig.AlarmContinuousNG; + structItem2.AlarmTotalPassCnt = this.ParentForm.SystemConfig.AlarmTotalPassCnt; structItem2.ModbusTcpStartAddress = this.ParentForm.SystemConfig.ModbusTcpStartAddress; structItem2.ModbusRtuSlaveID = this.ParentForm.SystemConfig.ModbusRtuSlaveID; structItem2.ModbusTcpAddress1 = this.ParentForm.SystemConfig.ModbusTcpAddress1; diff --git a/INT69DB_2A/Forms/FormMain.Designer.cs b/INT69DB_2A/Forms/FormMain.Designer.cs index 74c3905..ce77355 100644 --- a/INT69DB_2A/Forms/FormMain.Designer.cs +++ b/INT69DB_2A/Forms/FormMain.Designer.cs @@ -43,6 +43,7 @@ this.smartSerialPortCom3 = new SmartX.SmartSerialPort(); this.smartSerialPortLink = new SmartX.SmartSerialPort(); this.smartFileCom3Log = new SmartX.SmartFile(); + this.smartThread = new SmartX.SmartThread(this.components); ((System.ComponentModel.ISupportInitialize)(this.smartForm)).BeginInit(); this.SuspendLayout(); // @@ -150,6 +151,13 @@ // this.smartFileCom3Log.FilePathName = null; // + // smartThread + // + this.smartThread.Priority = System.Threading.ThreadPriority.Normal; + this.smartThread.WorkerReportsProgress = false; + this.smartThread.UIThreadFunction += new SmartX.SmartThread.UIThreadHandler(this.smartThread_UIThreadFunction); + this.smartThread.OnEnding += new SmartX.SmartThread.EndingHandler(this.smartThread_OnEnding); + // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -180,5 +188,6 @@ public SmartX.SmartSerialPort smartSerialPortCom3; private SmartX.SmartSerialPort smartSerialPortLink; public SmartX.SmartFile smartFileCom3Log; + public SmartX.SmartThread smartThread; } } \ No newline at end of file diff --git a/INT69DB_2A/Forms/FormMain.cs b/INT69DB_2A/Forms/FormMain.cs index 25e860a..a3786eb 100644 --- a/INT69DB_2A/Forms/FormMain.cs +++ b/INT69DB_2A/Forms/FormMain.cs @@ -43,6 +43,7 @@ namespace INT69DB_2A.Forms public string ComPortMainToLCD; // DllSerial Port public bool FlagDllSerial; // DllSerial 사용여부 private string TransferNum; // 수신데이터 ID저장 (재전송 시 사용) + public bool FlagThreadMessage1; // 플레그 쓰레드 메시지 11 // Motor Download 통신용 변수 public int LineNum; @@ -440,6 +441,7 @@ namespace INT69DB_2A.Forms this.ColorLogOff = Color.Red; this.ColorLogOn = Color.Yellow; this.TransferNum = "-"; + this.FlagThreadMessage1 = false; this.PathLaunchFolder = "SD Card\\"; this.PathSystemFileFolder1 = this.PathLaunchFolder + "SystemFile1\\"; @@ -730,6 +732,15 @@ namespace INT69DB_2A.Forms this.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._9016_ParameterProduct, sb.ToString()); } + + private void StartThreadMessage1() + { + if (this.smartThread.State != SmartThread.ThreadState.Running) + { + this.smartThread.Start(); + this.FlagThreadMessage1 = false; + } + } #region Communication Protocol public void PrintingHeadLine() @@ -4928,6 +4939,32 @@ namespace INT69DB_2A.Forms } #endregion + #region 입력센서 연속 입력 시 정지 + if (this.SystemConfig.IsEmergencyStopEntrySensorError == true) + { + if (this.SystemConfig.IsWeightViewForward == true) + { + if (this.CollectionWeightData[0].JudgmentStatus == DataStore.JudgmentStatus.SensorError) + { + this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + + // 메시지 11 - 입력센서 에러에 의해 정지하였습니다 + this.StartThreadMessage1(); + } + } + else + { + if (this.CollectionWeightData[this.CollectionWeightData.Count - 1].JudgmentStatus == DataStore.JudgmentStatus.SensorError) + { + this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + + // 메시지 11 - 입력센서 에러에 의해 정지하였습니다 + this.StartThreadMessage1(); + } + } + } + #endregion + #region 통신 if (this.SystemConfig.IsIntegratedTransmission == false) { @@ -5012,6 +5049,32 @@ namespace INT69DB_2A.Forms } #endregion + #region 입력센서 연속 입력 시 정지 + if (this.SystemConfig.IsEmergencyStopEntrySensorError == true) + { + if (this.SystemConfig.IsWeightViewForward == true) + { + if (this.CollectionWeightData[1].JudgmentStatus == DataStore.JudgmentStatus.SensorError) + { + this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + + // 메시지 11 - 입력센서 에러에 의해 정지하였습니다 + this.StartThreadMessage1(); + } + } + else + { + if (this.CollectionWeightData[this.CollectionWeightData.Count - 2].JudgmentStatus == DataStore.JudgmentStatus.SensorError) + { + this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + + // 메시지 11 - 입력센서 에러에 의해 정지하였습니다 + this.StartThreadMessage1(); + } + } + } + #endregion + #region 통신 if (this.SystemConfig.IsIntegratedTransmission == false) { @@ -5096,6 +5159,32 @@ namespace INT69DB_2A.Forms } #endregion + #region 입력센서 연속 입력 시 정지 + if (this.SystemConfig.IsEmergencyStopEntrySensorError == true) + { + if (this.SystemConfig.IsWeightViewForward == true) + { + if (this.CollectionWeightData[2].JudgmentStatus == DataStore.JudgmentStatus.SensorError) + { + this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + + // 메시지 11 - 입력센서 에러에 의해 정지하였습니다 + this.StartThreadMessage1(); + } + } + else + { + if (this.CollectionWeightData[this.CollectionWeightData.Count - 3].JudgmentStatus == DataStore.JudgmentStatus.SensorError) + { + this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + + // 메시지 11 - 입력센서 에러에 의해 정지하였습니다 + this.StartThreadMessage1(); + } + } + } + #endregion + #region 통신 if (this.SystemConfig.IsIntegratedTransmission == false) { @@ -5180,6 +5269,32 @@ namespace INT69DB_2A.Forms } #endregion + #region 입력센서 연속 입력 시 정지 + if (this.SystemConfig.IsEmergencyStopEntrySensorError == true) + { + if (this.SystemConfig.IsWeightViewForward == true) + { + if (this.CollectionWeightData[3].JudgmentStatus == DataStore.JudgmentStatus.SensorError) + { + this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + + // 메시지 11 - 입력센서 에러에 의해 정지하였습니다 + this.StartThreadMessage1(); + } + } + else + { + if (this.CollectionWeightData[this.CollectionWeightData.Count - 4].JudgmentStatus == DataStore.JudgmentStatus.SensorError) + { + this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + + // 메시지 11 - 입력센서 에러에 의해 정지하였습니다 + this.StartThreadMessage1(); + } + } + } + #endregion + #region 통신 if (this.SystemConfig.IsIntegratedTransmission == false) { @@ -5264,6 +5379,32 @@ namespace INT69DB_2A.Forms } #endregion + #region 입력센서 연속 입력 시 정지 + if (this.SystemConfig.IsEmergencyStopEntrySensorError == true) + { + if (this.SystemConfig.IsWeightViewForward == true) + { + if (this.CollectionWeightData[4].JudgmentStatus == DataStore.JudgmentStatus.SensorError) + { + this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + + // 메시지 11 - 입력센서 에러에 의해 정지하였습니다 + this.StartThreadMessage1(); + } + } + else + { + if (this.CollectionWeightData[this.CollectionWeightData.Count - 5].JudgmentStatus == DataStore.JudgmentStatus.SensorError) + { + this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + + // 메시지 11 - 입력센서 에러에 의해 정지하였습니다 + this.StartThreadMessage1(); + } + } + } + #endregion + #region 통신 if (this.SystemConfig.IsIntegratedTransmission == false) { @@ -5348,6 +5489,32 @@ namespace INT69DB_2A.Forms } #endregion + #region 입력센서 연속 입력 시 정지 + if (this.SystemConfig.IsEmergencyStopEntrySensorError == true) + { + if (this.SystemConfig.IsWeightViewForward == true) + { + if (this.CollectionWeightData[5].JudgmentStatus == DataStore.JudgmentStatus.SensorError) + { + this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + + // 메시지 11 - 입력센서 에러에 의해 정지하였습니다 + this.StartThreadMessage1(); + } + } + else + { + if (this.CollectionWeightData[this.CollectionWeightData.Count - 6].JudgmentStatus == DataStore.JudgmentStatus.SensorError) + { + this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + + // 메시지 11 - 입력센서 에러에 의해 정지하였습니다 + this.StartThreadMessage1(); + } + } + } + #endregion + #region 통신 if (this.SystemConfig.IsIntegratedTransmission == false) { @@ -5432,6 +5599,32 @@ namespace INT69DB_2A.Forms } #endregion + #region 입력센서 연속 입력 시 정지 + if (this.SystemConfig.IsEmergencyStopEntrySensorError == true) + { + if (this.SystemConfig.IsWeightViewForward == true) + { + if (this.CollectionWeightData[6].JudgmentStatus == DataStore.JudgmentStatus.SensorError) + { + this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + + // 메시지 11 - 입력센서 에러에 의해 정지하였습니다 + this.StartThreadMessage1(); + } + } + else + { + if (this.CollectionWeightData[this.CollectionWeightData.Count - 7].JudgmentStatus == DataStore.JudgmentStatus.SensorError) + { + this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + + // 메시지 11 - 입력센서 에러에 의해 정지하였습니다 + this.StartThreadMessage1(); + } + } + } + #endregion + #region 통신 if (this.SystemConfig.IsIntegratedTransmission == false) { @@ -5516,6 +5709,32 @@ namespace INT69DB_2A.Forms } #endregion + #region 입력센서 연속 입력 시 정지 + if (this.SystemConfig.IsEmergencyStopEntrySensorError == true) + { + if (this.SystemConfig.IsWeightViewForward == true) + { + if (this.CollectionWeightData[7].JudgmentStatus == DataStore.JudgmentStatus.SensorError) + { + this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + + // 메시지 11 - 입력센서 에러에 의해 정지하였습니다 + this.StartThreadMessage1(); + } + } + else + { + if (this.CollectionWeightData[this.CollectionWeightData.Count - 8].JudgmentStatus == DataStore.JudgmentStatus.SensorError) + { + this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + + // 메시지 11 - 입력센서 에러에 의해 정지하였습니다 + this.StartThreadMessage1(); + } + } + } + #endregion + #region 통신 if (this.SystemConfig.IsIntegratedTransmission == false) { @@ -5600,6 +5819,32 @@ namespace INT69DB_2A.Forms } #endregion + #region 입력센서 연속 입력 시 정지 + if (this.SystemConfig.IsEmergencyStopEntrySensorError == true) + { + if (this.SystemConfig.IsWeightViewForward == true) + { + if (this.CollectionWeightData[8].JudgmentStatus == DataStore.JudgmentStatus.SensorError) + { + this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + + // 메시지 11 - 입력센서 에러에 의해 정지하였습니다 + this.StartThreadMessage1(); + } + } + else + { + if (this.CollectionWeightData[this.CollectionWeightData.Count - 9].JudgmentStatus == DataStore.JudgmentStatus.SensorError) + { + this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + + // 메시지 11 - 입력센서 에러에 의해 정지하였습니다 + this.StartThreadMessage1(); + } + } + } + #endregion + #region 통신 if (this.SystemConfig.IsIntegratedTransmission == false) { @@ -5684,6 +5929,32 @@ namespace INT69DB_2A.Forms } #endregion + #region 입력센서 연속 입력 시 정지 + if (this.SystemConfig.IsEmergencyStopEntrySensorError == true) + { + if (this.SystemConfig.IsWeightViewForward == true) + { + if (this.CollectionWeightData[9].JudgmentStatus == DataStore.JudgmentStatus.SensorError) + { + this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + + // 메시지 11 - 입력센서 에러에 의해 정지하였습니다 + this.StartThreadMessage1(); + } + } + else + { + if (this.CollectionWeightData[this.CollectionWeightData.Count - 10].JudgmentStatus == DataStore.JudgmentStatus.SensorError) + { + this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + + // 메시지 11 - 입력센서 에러에 의해 정지하였습니다 + this.StartThreadMessage1(); + } + } + } + #endregion + #region 통신 if (this.SystemConfig.IsIntegratedTransmission == false) { @@ -5790,12 +6061,29 @@ namespace INT69DB_2A.Forms #endregion #region 진입센서에러 - for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) + //for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) + //{ + // if (this.CollectionWeightData[i].JudgmentStatus == DataStore.JudgmentStatus.SensorError) + // { + // this.ChildFormMainDisplay.UpdateAlarmMessage4Display(true); + // break; + // } + //} + #endregion + + #region 입력센서 연속 입력 시 정지 + if (this.SystemConfig.IsEmergencyStopEntrySensorError == true) { - if (this.CollectionWeightData[i].JudgmentStatus == DataStore.JudgmentStatus.SensorError) + foreach (WeightData data in this.CollectionWeightData) { - this.ChildFormMainDisplay.UpdateAlarmMessage4Display(true); - break; + if (data.JudgmentStatus == DataStore.JudgmentStatus.SensorError) + { + this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + + // 메시지 11 - 입력센서 에러에 의해 정지하였습니다 + this.StartThreadMessage1(); + break; + } } } #endregion @@ -6587,7 +6875,7 @@ namespace INT69DB_2A.Forms structItem.Serial3BaudRate = this.SystemConfig.Serial3BaudRate; structItem.Serial3Mode = this.SystemConfig.Serial3Mode; - structItem.DummyBool1 = false; + structItem.IsEmergencyStopEntrySensorError = this.SystemConfig.IsEmergencyStopEntrySensorError; structItem.IsIntegratedTransmission = this.SystemConfig.IsIntegratedTransmission; structItem.IsLogin = this.SystemConfig.IsLogin; structItem.IsFeedingConveyorRunPass = this.SystemConfig.IsFeedingConveyorRunPass; @@ -6709,7 +6997,7 @@ namespace INT69DB_2A.Forms structItem1.Serial3BaudRate = item.Serial3BaudRate; structItem1.Serial3Mode = item.Serial3Mode; - structItem1.DummyBool1 = false; + structItem1.IsEmergencyStopEntrySensorError = item.IsEmergencyStopEntrySensorError; structItem1.IsIntegratedTransmission = item.IsIntegratedTransmission; structItem1.IsLogin = item.IsLogin; structItem1.IsFeedingConveyorRunPass = item.IsFeedingConveyorRunPass; @@ -6821,6 +7109,7 @@ namespace INT69DB_2A.Forms this.SystemConfig.IsPingTimer = structItem1.IsPingTimer; this.SystemConfig.IsLogin = structItem1.IsLogin; this.SystemConfig.IsIntegratedTransmission = structItem1.IsIntegratedTransmission; + this.SystemConfig.IsEmergencyStopEntrySensorError = structItem1.IsEmergencyStopEntrySensorError; this.SystemConfig.DecimalPlaces = structItem1.DecimalPlaces; this.SystemConfig.EthernetPort = structItem1.EthernetPort; @@ -8777,6 +9066,22 @@ namespace INT69DB_2A.Forms data.IsUpdate = false; } + private void smartThread_UIThreadFunction(ThreadArgs args) + { + // 메시지 11. 입력센서 에러에 의해 정지하였습니다. + if (this.FlagThreadMessage1 == false) + { + DialogFormMessage msg = new DialogFormMessage(11, this.SystemConfig.Language, this); + msg.ShowDialog(); + + this.FlagThreadMessage1 = true; + } + } + private void smartThread_OnEnding(ThreadArgs args) + { + + } + #region DLL_SerialportEvent private void Serialport_ReceiveDataEvent(string data) { diff --git a/INT69DB_2A/Forms/FormMain.resx b/INT69DB_2A/Forms/FormMain.resx index 0f9d1fc..08209ae 100644 --- a/INT69DB_2A/Forms/FormMain.resx +++ b/INT69DB_2A/Forms/FormMain.resx @@ -156,6 +156,9 @@ 676, 54 + + 831, 54 + WEBPAD diff --git a/INT69DB_2A/Version.txt b/INT69DB_2A/Version.txt index 95463b0..b16e47e 100644 --- a/INT69DB_2A/Version.txt +++ b/INT69DB_2A/Version.txt @@ -15,6 +15,11 @@ Ƽ 2~6 ƽ 跮 */ +@ Ver 6.6.0 by CJY + - 2025.09.29 + - Ver 6.5.0 Modify + - Է¼ Է ߰ + @ Ver 6.5.0 by LSJ - 2025.09.23 - Ver 6.4.0 Modify diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration10.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration10.resources index 388c4e9..7bb348f 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration10.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration10.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration2.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration2.resources index 1a3ae5a..b3cabcf 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration2.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration2.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration3.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration3.resources index 96b7dff..0759e7c 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration3.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration3.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration4.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration4.resources index bd79850..2b18df4 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration4.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration4.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration5.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration5.resources index 339db97..fbb2691 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration5.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration5.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration6.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration6.resources index 2fc5675..a3d1fad 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration6.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration6.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration7.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration7.resources index 75e2c4c..e0e3958 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration7.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration7.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration8.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration8.resources index 3c2a9bb..d072560 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration8.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlCalibration8.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplay2.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplay2.resources index ff1b15f..66fc2eb 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplay2.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplay2.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph10.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph10.resources index 5ca0663..248a32c 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph10.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph10.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph2.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph2.resources index 41417d0..17458d1 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph2.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph2.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph3.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph3.resources index f5a8d50..2040636 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph3.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph3.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph4.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph4.resources index e6023c7..519eb6a 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph4.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph4.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph5.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph5.resources index 1fd509f..56a680e 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph5.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph5.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph6.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph6.resources index c126b31..d3dcda6 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph6.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph6.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph7.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph7.resources index 12a7c50..4b55ced 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph7.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph7.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph8.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph8.resources index e43f6e5..f6c36dc 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph8.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayDotGraph8.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph10.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph10.resources index d651add..5c0043c 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph10.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph10.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph2.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph2.resources index 4357a9a..bdf3087 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph2.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph2.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph3.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph3.resources index c1714a3..78bbd18 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph3.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph3.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph4.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph4.resources index 5f618c1..a22cbfd 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph4.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph4.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph5.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph5.resources index 60ea10a..5c6409a 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph5.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph5.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph6.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph6.resources index 93f8d83..4763bec 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph6.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph6.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph7.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph7.resources index 5b5fb6c..65f6f54 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph7.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph7.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph8.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph8.resources index e7217f0..28a2d82 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph8.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph8.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable10.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable10.resources index c95a330..918e5c8 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable10.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable10.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable2.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable2.resources index 4357a9a..bdf3087 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable2.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable2.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable3.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable3.resources index c1714a3..78bbd18 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable3.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable3.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable4.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable4.resources index 5f618c1..a22cbfd 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable4.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable4.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable5.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable5.resources index b18d92a..40d2953 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable5.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable5.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable6.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable6.resources index 93f8d83..4763bec 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable6.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable6.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable7.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable7.resources index 5b5fb6c..65f6f54 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable7.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable7.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable8.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable8.resources index e7217f0..28a2d82 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable8.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Controls.ControlMainDisplayTable8.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormDataStatistics.resources b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormDataStatistics.resources index e7f61e5..c136bd8 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormDataStatistics.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormDataStatistics.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormDataViewerFilter.resources b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormDataViewerFilter.resources index 387430f..338d865 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormDataViewerFilter.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormDataViewerFilter.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormHistoryData.resources b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormHistoryData.resources index e7f61e5..c136bd8 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormHistoryData.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormHistoryData.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormLogOn.resources b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormLogOn.resources index 85444a2..20f2fb9 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormLogOn.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormLogOn.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormMessage.resources b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormMessage.resources index 63a7363..cd5b5ff 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormMessage.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormMessage.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormUserEditorKeyboard.resources b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormUserEditorKeyboard.resources index 83d9176..9c87886 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormUserEditorKeyboard.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormUserEditorKeyboard.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormYesNo.resources b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormYesNo.resources index 63a7363..cd5b5ff 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormYesNo.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormYesNo.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormCalibration.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormCalibration.resources index 13920ac..eecf100 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormCalibration.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormCalibration.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormCommunication.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormCommunication.resources index 08e072f..0931753 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormCommunication.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormCommunication.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormConfiguration.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormConfiguration.resources index f7d315d..da20e51 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormConfiguration.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormConfiguration.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormDataBackup.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormDataBackup.resources index 96d254d..8ba45c7 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormDataBackup.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormDataBackup.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormDataBackup_Part11.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormDataBackup_Part11.resources index 4aaee81..7f4b479 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormDataBackup_Part11.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormDataBackup_Part11.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormDataStatistics.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormDataStatistics.resources index 24c8ac1..85d5223 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormDataStatistics.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormDataStatistics.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormDataViewer.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormDataViewer.resources index 14f078e..89a190f 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormDataViewer.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormDataViewer.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormEquipmentSetting.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormEquipmentSetting.resources index 843fc63..5471d75 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormEquipmentSetting.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormEquipmentSetting.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormEquipmentTest.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormEquipmentTest.resources index e837dd5..05a1adf 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormEquipmentTest.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormEquipmentTest.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormIOTest.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormIOTest.resources index 44bacb5..4218866 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormIOTest.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormIOTest.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormInformation.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormInformation.resources index 0852305..8697819 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormInformation.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormInformation.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormMainDisplay.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormMainDisplay.resources index 2da0534..f5760ad 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormMainDisplay.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormMainDisplay.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormMenu.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormMenu.resources index 8b8ae7c..f8a05b3 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormMenu.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormMenu.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormMotorSetting.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormMotorSetting.resources index 490024f..d439889 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormMotorSetting.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormMotorSetting.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormProgramUpdate.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormProgramUpdate.resources index 9eee95a..16fbf05 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormProgramUpdate.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormProgramUpdate.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormSystemSetting.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormSystemSetting.resources index 13a15bb..537595e 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormSystemSetting.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormSystemSetting.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormTimeSetting.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormTimeSetting.resources index 449cab8..3d9e3c3 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormTimeSetting.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormTimeSetting.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormUserEditor.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormUserEditor.resources index ca2d5aa..1636027 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormUserEditor.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormUserEditor.resources differ diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormUserGroupEditor.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormUserGroupEditor.resources index fbfa273..1db532b 100644 Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormUserGroupEditor.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormUserGroupEditor.resources differ