diff --git a/INT69DB_2A/DataStore.cs b/INT69DB_2A/DataStore.cs index 8ccac15..4529d2a 100644 --- a/INT69DB_2A/DataStore.cs +++ b/INT69DB_2A/DataStore.cs @@ -1547,7 +1547,7 @@ namespace INT69DB_2A this.IsPrintPerProductEnable = false; this.IsPingTimer = false; this.IsOptDataStatistics = false; - this.IsIntegratedTransmission = false; + this.IsIntegratedTransmission = true; // 통합전송 기능 Default "ON" this.IsEmergencyStopEntrySensorError = false; this.DecimalPlaces = 1; @@ -1566,7 +1566,7 @@ namespace INT69DB_2A this.StepMotorType = 0; this.Unit = "g"; - this.SerialNumber = "23H0000"; + this.SerialNumber = "26A0000"; this.Language = DataStore.LanguageID.Korean; this.CurrentForm = DataStore.FormStore.FormMainDisplay; diff --git a/INT69DB_2A/Forms/FormDataBackup.cs b/INT69DB_2A/Forms/FormDataBackup.cs index 61552b4..0f72d14 100644 --- a/INT69DB_2A/Forms/FormDataBackup.cs +++ b/INT69DB_2A/Forms/FormDataBackup.cs @@ -171,16 +171,16 @@ namespace INT69DB_2A.Forms private void buttonDataBackupEnable_Click(object sender, EventArgs e) { - if (this.ParentForm.SystemConfig.IsDataBackup == true) - { - this.ParentForm.SystemConfig.IsDataBackup = false; - this.buttonDataBackupEnable.ButtonUp(); - } - else + if (this.buttonDataBackupEnable.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) { this.ParentForm.SystemConfig.IsDataBackup = true; - this.buttonDataBackupEnable.ButtonDown(); + + if (this.ParentForm.SystemConfig.EquipmentMode == 2) + this.ParentForm.SystemConfig.IsIntegratedTransmission = true; } + else + this.ParentForm.SystemConfig.IsDataBackup = false; + this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); } diff --git a/INT69DB_2A/Forms/FormInformation.cs b/INT69DB_2A/Forms/FormInformation.cs index 2bdc0ad..9553209 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.6.0"; + this.labelDisplayVer.Text = "6.6.1"; this.labelUserMgerVer.Text = ""; this.labelAes128Ver.Text = ""; this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber; diff --git a/INT69DB_2A/Forms/FormMain.cs b/INT69DB_2A/Forms/FormMain.cs index 96f4401..a9fc51e 100644 --- a/INT69DB_2A/Forms/FormMain.cs +++ b/INT69DB_2A/Forms/FormMain.cs @@ -4786,18 +4786,32 @@ namespace INT69DB_2A.Forms { for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) { - this.CollectionWeightData[i].Status = Helper.StringToWeightStatus(receiveData.Substring(i * 12, 2)); - this.CollectionWeightData[i].Weight = Helper.StringToWeight(receiveData.Substring(i * 12 + 2, 5), this.SystemConfig.DecimalPlaces); - this.CollectionWeightData[i].ADCValue = receiveData.Substring(i * 12 + 7, 5); + if (this.EquipmentStatus == DataStore.EquipmentStatus.Stop) + { + this.CollectionWeightData[i].Status = Helper.StringToWeightStatus(receiveData.Substring(i * 12, 2)); + this.CollectionWeightData[i].Weight = Helper.StringToWeight(receiveData.Substring(i * 12 + 2, 5), this.SystemConfig.DecimalPlaces); + this.CollectionWeightData[i].ADCValue = receiveData.Substring(i * 12 + 7, 5); + } + else + { + this.CollectionWeightData[i].Status = Helper.StringToWeightStatus(receiveData.Substring(i * 12, 2)); + } } } else if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormEquipmentTest) { for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) { - this.CollectionWeightDataTest[i].Status = Helper.StringToWeightStatus(receiveData.Substring(i * 12, 2)); - this.CollectionWeightDataTest[i].Weight = Helper.StringToWeight(receiveData.Substring(i * 12 + 2, 5), this.SystemConfig.DecimalPlaces); - this.CollectionWeightDataTest[i].ADCValue = receiveData.Substring(i * 12 + 7, 5); + if (this.EquipmentStatus == DataStore.EquipmentStatus.Stop) + { + this.CollectionWeightDataTest[i].Status = Helper.StringToWeightStatus(receiveData.Substring(i * 12, 2)); + this.CollectionWeightDataTest[i].Weight = Helper.StringToWeight(receiveData.Substring(i * 12 + 2, 5), this.SystemConfig.DecimalPlaces); + this.CollectionWeightDataTest[i].ADCValue = receiveData.Substring(i * 12 + 7, 5); + } + else + { + this.CollectionWeightDataTest[i].Status = Helper.StringToWeightStatus(receiveData.Substring(i * 12, 2)); + } } } #endregion diff --git a/INT69DB_2A/Forms/FormMainDisplay.cs b/INT69DB_2A/Forms/FormMainDisplay.cs index 4c6dcbf..aa61620 100644 --- a/INT69DB_2A/Forms/FormMainDisplay.cs +++ b/INT69DB_2A/Forms/FormMainDisplay.cs @@ -1697,6 +1697,9 @@ namespace INT69DB_2A.Forms if (this.labelFeedingConveyorOperatingTime.Text != value) this.labelFeedingConveyorOperatingTime.Text = value; + // timerTimeOutTransmission + this.ParentForm.timerTimeOutTransmission.Interval = jItem.JudgmentDelayTime - 100; + switch (this.ParentForm.SystemConfig.EquipmentColumns) { case 2: diff --git a/INT69DB_2A/Version.txt b/INT69DB_2A/Version.txt index be5bd82..a6e1964 100644 --- a/INT69DB_2A/Version.txt +++ b/INT69DB_2A/Version.txt @@ -5,9 +5,9 @@ H/W : IEC1000-104 O/S : WinCE 6.0 - Framework : 20160203 SmartX Framework V2.7(update: 2016.01.25) - 20190408 SmartX Framework V3.1.1(update: 2019.03.21) - 20241121 SmartX Framework V3.2.4(update: 2021.01.20) + Framework : V1.0.0 - SmartX Framework V2.7(update: 2016.01.25) + V2.0.0 - SmartX Framework V3.1.1(update: 2019.03.21) + V6.0.0 - SmartX Framework V3.2.4(update: 2021.01.20) Program by LeeSeonJae @@ -15,6 +15,19 @@ ¸ÖƼÇü 2~6¿­ ½ºÆ½ °è·®±â */ +@ Ver 6.6.1 by LSJ + - 2026.01.16 + - Ver 6.6.0 Modify + - Framework : SmartX Framework V3.2.4(update: 2021.01.20) + - ½ºÆ½2 ¸ðµå µ¥ÀÌÅÍ ÀúÀå ¹ö±× ¼öÁ¤ (15ÀÎÄ¡ ÇÁ·Î±×·¥Àº ¼öÁ¤µÇ¾î ÀÖÀ½) + ÆÇÁ¤ ½Ã Áß·®°ú µ¥ÀÌÅÍ ¹é¾÷ ½Ã(¿¢¼¿) Áß·® ÀúÀåµÇ´Â °ªÀÌ ´Ù¸£°Ô ÀúÀåµÊ + timeout ½Ã°£¿¡ µû¸¥ Áö¿¬À¸·Î Á¤Áö Áß·® µ¥ÀÌÅÍ ¼ö½ÅµÇ¸é¼­, Áß·® °ªÀÌ ´Ù¸¥°ªÀ¸·Î º¯°æµÇ´Â ¹®Á¦ÀÖÀ½ + ¿îÀü Áß, Á¤ÁöÁß·® µ¥ÀÌÅÍ ¼ö½Å½Ã Áß·®°ªÀº °»½Å ¾ÈµÇµµ·Ï ¼öÁ¤ + timeout ½Ã°£ : ÆÇÁ¤Áö¿¬ -100 + - ½ºÆ½2¸ðµå¿¡¼­ µ¥ÀÌÅÍ ¹é¾÷ ÀúÀå½Ã + [Àåºñ¼³Á¤] - [ÅëÇÕÀü¼Û] ±â´É ON À¸·Î ÀÚµ¿ ÀúÀå µÇµµ·Ï ¼öÁ¤ (½ºÆ½2¸ðµå¿¡¼­ µ¥ÀÌÅÍ ÀúÀåÇÏ·Á¸é ¹«Á¶°Ç ON µÇ¾î¾ßÇÔ) + ÅëÇÕÀü¼Û ÃʱⰪ ON À¸·Î ¼öÁ¤ + @ Ver 6.6.0 by CJY - 2025.09.29 - Ver 6.5.0 Modify