diff --git a/INT69DC_7C/DataStore.cs b/INT69DC_7C/DataStore.cs index b0c052d..656ed17 100644 --- a/INT69DC_7C/DataStore.cs +++ b/INT69DC_7C/DataStore.cs @@ -1287,7 +1287,7 @@ namespace INT69DC_7C this.IsOptDataStatistics = false; this.IsPrintPerProductEnable = false; this.IsAlarmContinuousNGEnable = false; - this.IsIntegratedTransmission = false; + this.IsIntegratedTransmission = true; // 통합전송 기능 Default "ON" this.IsSamplingView = false; this.IsAlarmTotalPassCntEnable = false; this.IsOptPart11 = false; @@ -1326,7 +1326,7 @@ namespace INT69DC_7C this.DataStoragePeriod = 36; this.Unit = "g"; - this.SerialNumber = "25I0000"; + this.SerialNumber = "26A0000"; this.EthernetServerAddress = "0.0.0.0"; this.User_Level1_Name = "Level 1"; this.User_Level2_Name = "Level 2"; diff --git a/INT69DC_7C/Forms/FormDataBackup.cs b/INT69DC_7C/Forms/FormDataBackup.cs index ecbc858..1b07020 100644 --- a/INT69DC_7C/Forms/FormDataBackup.cs +++ b/INT69DC_7C/Forms/FormDataBackup.cs @@ -232,7 +232,12 @@ namespace INT69DC_7C.Forms private void radioButtonEnable_Click(object sender, EventArgs e) { if (this.radioButtonEnable.Checked == true) + { this.ParentForm.SystemConfig.IsDataBackup = true; + + if (this.ParentForm.SystemConfig.EquipmentMode == 2) + this.ParentForm.SystemConfig.IsIntegratedTransmission = true; + } else this.ParentForm.SystemConfig.IsDataBackup = false; diff --git a/INT69DC_7C/Forms/FormInformation.cs b/INT69DC_7C/Forms/FormInformation.cs index 2caf4a6..3997308 100644 --- a/INT69DC_7C/Forms/FormInformation.cs +++ b/INT69DC_7C/Forms/FormInformation.cs @@ -142,7 +142,7 @@ namespace INT69DC_7C.Forms } private void DefaultSetting() { - this.labelDisplayVer.Text = "12.4.0"; + this.labelDisplayVer.Text = "12.4.2"; if(this.ParentForm.SystemConfig.EquipmentMode == 7) this.labelTitleMainboardName.Text = "INT68M-2A"; diff --git a/INT69DC_7C/Forms/FormMainDisplay.cs b/INT69DC_7C/Forms/FormMainDisplay.cs index 881c4c9..44b5dd1 100644 --- a/INT69DC_7C/Forms/FormMainDisplay.cs +++ b/INT69DC_7C/Forms/FormMainDisplay.cs @@ -1485,6 +1485,9 @@ namespace INT69DC_7C.Forms this.MainDisplayFeedbaack.UpdateFeedbackDisplay(this.ParentForm.CurrentFeedbackItem, this.ParentForm.SystemConfig, pItem); } + // timerTimeOutTransmission + this.ParentForm.timerTimeOutTransmission.Interval = jItem.JudgmentDelayTime - 100; + switch (this.ParentForm.SystemConfig.EquipmentColumns) { case 7: diff --git a/INT69DC_7C/Version.txt b/INT69DC_7C/Version.txt index 1c6d91c..ea096a9 100644 --- a/INT69DC_7C/Version.txt +++ b/INT69DC_7C/Version.txt @@ -5,10 +5,10 @@ H/W : IEC1000-150 O/S : WinCE 6.0 - Framework : 20160203 SmartX Framework V2.7(update: 2016.01.25) - 20180712 SmartX Framework V3.0.3(update: 2018.05.10) - 20190408 SmartX Framework V3.1.1(update: 2019.03.21) - 20241105 SmartX Framework V3.2.4(update: 2021.01.20) + Framework : V1.0.0 - SmartX Framework V2.7(update: 2016.01.25) + V6.0.0 - SmartX Framework V3.0.3(update: 2018.05.10) + V7.0.0 - SmartX Framework V3.1.1(update: 2019.03.21) + V12.0.0 - SmartX Framework V3.2.4(update: 2021.01.20) DLL DllUserMgr.dll @@ -24,6 +24,18 @@ ¸ÖƼÇü 8,10,12¿­ ÄÁº£¾î/½ºÆ½ °è·®±â */ +@ Ver 12.4.2 by LSJ + - 2026.01.16 + - Ver 12.4.1 Modify + - Framework : SmartX Framework V3.2.4(update: 2021.01.20) + - ½ºÆ½2¸ðµå¿¡¼­ µ¥ÀÌÅÍ ¹é¾÷ ÀúÀå½Ã + [Àåºñ¼³Á¤] - [ÅëÇÕÀü¼Û] ±â´É ON À¸·Î ÀÚµ¿ ÀúÀå µÇµµ·Ï ¼öÁ¤ (½ºÆ½2¸ðµå¿¡¼­ µ¥ÀÌÅÍ ÀúÀåÇÏ·Á¸é ¹«Á¶°Ç ON µÇ¾î¾ßÇÔ) + ÅëÇÕÀü¼Û ÃʱⰪ ON À¸·Î ¼öÁ¤ + - ½ºÆ½2À϶§ ÅëÇÕÀü¼Û¿¡ µû¸¥ ŸÀÌ¸Ó ½Ã°£ ¼³Á¤ ¼öÁ¤ + ºÎÆÃÇÒ¶§ Çѹø¸¸ ¼ÂÆÃÇϵµ·Ï µÇ¾î ÀÖ¾úÀ½ + timeout ½Ã°£ : ÆÇÁ¤Áö¿¬ -100 + ǰ¹ø Àüȯ ½Ã timeout ½Ã°£ Àç¼³Á¤ Çϵµ·Ï ÄÚµå Ãß°¡ + @ Ver 12.4.1 by CJY - 2025.11.05 - Ver 12.4.0 Modify