diff --git a/Document/DLL/SmartXCommon.dll b/Document/DLL/SmartXCommon.dll new file mode 100644 index 0000000..4bd057b Binary files /dev/null and b/Document/DLL/SmartXCommon.dll differ diff --git a/Document/DLL/SmartX_IEC1000.dll b/Document/DLL/SmartX_IEC1000.dll new file mode 100644 index 0000000..1b97ada Binary files /dev/null and b/Document/DLL/SmartX_IEC1000.dll differ diff --git a/INT69DB_2A/Forms/FormMain.cs b/INT69DB_2A/Forms/FormMain.cs index a3786eb..8ed4748 100644 --- a/INT69DB_2A/Forms/FormMain.cs +++ b/INT69DB_2A/Forms/FormMain.cs @@ -44,6 +44,9 @@ namespace INT69DB_2A.Forms public bool FlagDllSerial; // DllSerial 사용여부 private string TransferNum; // 수신데이터 ID저장 (재전송 시 사용) public bool FlagThreadMessage1; // 플레그 쓰레드 메시지 11 + public int TotalAllCount; // 스틱1 전체 수량 + public int TotalPassCount; // 스틱1 전체 Pass 수량 + public int TotalNGCount; // 스틱1 전체 NG 수량 // Motor Download 통신용 변수 public int LineNum; @@ -442,6 +445,9 @@ namespace INT69DB_2A.Forms this.ColorLogOn = Color.Yellow; this.TransferNum = "-"; this.FlagThreadMessage1 = false; + this.TotalAllCount = 0; + this.TotalNGCount = 0; + this.TotalPassCount = 0; this.PathLaunchFolder = "SD Card\\"; this.PathSystemFileFolder1 = this.PathLaunchFolder + "SystemFile1\\"; @@ -1511,25 +1517,18 @@ namespace INT69DB_2A.Forms public string Protocol_OPT5(Collection 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; - } + 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 = toTalPass.ToString(); + value = this.TotalPassCount.ToString(); sb.Append(value.PadLeft(7, ' ')); - value = totalNg.ToString(); + value = this.TotalNGCount.ToString(); sb.Append(value.PadLeft(7, ' ')); - value = toTalAll.ToString(); + value = this.TotalAllCount.ToString(); sb.Append(value.PadLeft(9, ' ')); if (this.SystemConfig.IsWeightViewForward == true) @@ -1583,13 +1582,12 @@ namespace INT69DB_2A.Forms sb.Append(string.Format("IN{0:D3}", this.SystemConfig.EquipmentID)); sb.Append(string.Format("{0:D4}", this.SystemConfig.ProductNumber)); - value = data.PassCount.ToString(); + value = this.TotalPassCount.ToString(); sb.Append(value.PadLeft(7, ' ')); - value = data.TotalNGCount.ToString(); + value = this.TotalNGCount.ToString(); sb.Append(value.PadLeft(7, ' ')); - value = data.TotalCount.ToString(); + value = this.TotalAllCount.ToString(); sb.Append(value.PadLeft(9, ' ')); - sb.Append(string.Format("{0:D2}", lane)); if (data.JudgmentStatus == DataStore.JudgmentStatus.Under) @@ -1612,24 +1610,17 @@ namespace INT69DB_2A.Forms public string Protocol_OPT5_NotStxEtx(Collection 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; - } + StringBuilder sb = new StringBuilder(); sb.Append(string.Format("IN{0:D3}", this.SystemConfig.EquipmentID)); sb.Append(string.Format("{0:D4}", this.SystemConfig.ProductNumber)); - value = toTalPass.ToString(); + value = this.TotalPassCount.ToString(); sb.Append(value.PadLeft(7, ' ')); - value = totalNg.ToString(); + value = this.TotalNGCount.ToString(); sb.Append(value.PadLeft(7, ' ')); - value = toTalAll.ToString(); + value = this.TotalAllCount.ToString(); sb.Append(value.PadLeft(9, ' ')); if (this.SystemConfig.IsWeightViewForward == true) @@ -1681,13 +1672,12 @@ namespace INT69DB_2A.Forms sb.Append(string.Format("IN{0:D3}", this.SystemConfig.EquipmentID)); sb.Append(string.Format("{0:D4}", this.SystemConfig.ProductNumber)); - value = data.PassCount.ToString(); + value = this.TotalPassCount.ToString(); sb.Append(value.PadLeft(7, ' ')); - value = data.TotalNGCount.ToString(); + value = this.TotalNGCount.ToString(); sb.Append(value.PadLeft(7, ' ')); - value = data.TotalCount.ToString(); + value = this.TotalAllCount.ToString(); sb.Append(value.PadLeft(9, ' ')); - sb.Append(string.Format("{0:D2}", lane)); if (data.JudgmentStatus == DataStore.JudgmentStatus.Under) @@ -3201,6 +3191,9 @@ namespace INT69DB_2A.Forms case 5: this.SendEthernetData(this.Protocol_OPT4_NotStxEtx(datas)); break; + case 6: + this.SendEthernetData(this.Protocol_OPT5_NotStxEtx(datas)); + break; default: break; } @@ -3335,7 +3328,7 @@ 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 + else if (this.SystemConfig.Serial3Mode == 6) // OPT5 this.UartCom3Write(this.Protocol_OPT5_NotStxEtx(this.CollectionWeightData)); } private void TreatSerialCommunication(int lane, WeightData data) diff --git a/INT69DB_2A/Forms/FormMainDisplay.cs b/INT69DB_2A/Forms/FormMainDisplay.cs index 4c6dcbf..4b1f236 100644 --- a/INT69DB_2A/Forms/FormMainDisplay.cs +++ b/INT69DB_2A/Forms/FormMainDisplay.cs @@ -1434,14 +1434,14 @@ namespace INT69DB_2A.Forms public void SetTotalCount() { string totalCNT = "", ngCNT = ""; - int totalAll = 0, totalPass = 0, totalNG = 0, totalUnder = 0, totalOver = 0, totalExNG = 0; + int totalUnder = 0, totalOver = 0, totalExNG = 0; for (int i = 0; i < this.ParentForm.SystemConfig.EquipmentColumns; i++) { - totalAll += this.ParentForm.CollectionWeightData[i].TotalCount; - totalPass += this.ParentForm.CollectionWeightData[i].PassCount; + this.ParentForm.TotalAllCount += this.ParentForm.CollectionWeightData[i].TotalCount; + this.ParentForm.TotalPassCount += this.ParentForm.CollectionWeightData[i].PassCount; - totalNG += this.ParentForm.CollectionWeightData[i].TotalNGCount; + this.ParentForm.TotalNGCount += this.ParentForm.CollectionWeightData[i].TotalNGCount; totalUnder += this.ParentForm.CollectionWeightData[i].UnderCount; totalOver += this.ParentForm.CollectionWeightData[i].OverCount; totalExNG += this.ParentForm.CollectionWeightData[i].ExNGCount; @@ -1451,10 +1451,10 @@ namespace INT69DB_2A.Forms switch (this.Mode_TotalCnt) { case DataStore.E_TotalCnt.f0_Total: - totalCNT = totalAll.ToString(); + totalCNT = this.ParentForm.TotalAllCount.ToString(); break; case DataStore.E_TotalCnt.f1_Pass: - totalCNT = totalPass.ToString(); + totalCNT = this.ParentForm.TotalPassCount.ToString(); break; default: break; @@ -1467,7 +1467,7 @@ namespace INT69DB_2A.Forms switch (this.Mode_TotalCntNG) { case DataStore.E_TotalCntNG.f0_NG: - ngCNT = totalNG.ToString(); + ngCNT = this.ParentForm.TotalNGCount.ToString(); break; case DataStore.E_TotalCntNG.f1_Under: ngCNT = totalUnder.ToString(); diff --git a/INT69DB_2A/INT69DB_2A.csproj b/INT69DB_2A/INT69DB_2A.csproj index 7339e59..004b7ca 100644 --- a/INT69DB_2A/INT69DB_2A.csproj +++ b/INT69DB_2A/INT69DB_2A.csproj @@ -57,11 +57,11 @@ False - C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_V3대 마지막버전\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartXCommon.dll + ..\Document\DLL\SmartXCommon.dll False - C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_V3대 마지막버전\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartX_IEC1000.dll + ..\Document\DLL\SmartX_IEC1000.dll diff --git a/INT69DB_2A/Version.txt b/INT69DB_2A/Version.txt index d8f059a..be5bd82 100644 --- a/INT69DB_2A/Version.txt +++ b/INT69DB_2A/Version.txt @@ -26,9 +26,9 @@ - Framework : SmartX Framework V3.2.4(update: 2021.01.20) - MainBoard Ver 10.3.1 - Ϻ ȸ û - 1. ȭ ޴ - CUT ޴ ߰ + 1. ȭ ޴ - CUT ޴ ߰ ⺻ CUT ȣ, timer CUT ȣ - 2. Ҽ 3ڸ ߰ + 2. Ҽ 3ڸ ߰ @ Ver 6.4.0 by CJY - 2025.08.27 @@ -69,11 +69,6 @@ temp = 12 -> 20 ӵ Ͱ ߰ Ǿִٰ(δ -99990000 ̰Ÿ ŵ..) -<<<<<<< HEAD -======= ->>>>>>> 875d61f (@ Ver 6.1.0 by LSJ) -======= ->>>>>>> e80d5a7 (@ Ver 6.1.1 by LSJ) @ Ver 6.1.0 by LSJ - 2024.12.05 - Ver 6.0.0 Modify diff --git a/INT69DB_2A/bin/Release/SmartXCommon.dll b/INT69DB_2A/bin/Release/SmartXCommon.dll index 2b8fa9d..4bd057b 100644 Binary files a/INT69DB_2A/bin/Release/SmartXCommon.dll and b/INT69DB_2A/bin/Release/SmartXCommon.dll differ diff --git a/INT69DB_2A/bin/Release/SmartX_IEC1000.dll b/INT69DB_2A/bin/Release/SmartX_IEC1000.dll index 11e2c64..1b97ada 100644 Binary files a/INT69DB_2A/bin/Release/SmartX_IEC1000.dll and b/INT69DB_2A/bin/Release/SmartX_IEC1000.dll differ