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

충돌 해결중

master
CJY 2025-12-23 09:30:40 +09:00
parent 6e9072d7d9
commit 5b220d7f54
5 changed files with 16 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
INT69DB_2A/Controls/ControlEquipmentTest.cs
View File

@ -206,8 +206,6 @@ namespace INT69DB_2A.Controls
this.labelCH3Mode.Text = "Printer"; this.labelCH3Mode.Text = "Printer";
else if (item.Serial3Mode == 5) else if (item.Serial3Mode == 5)
this.labelCH3Mode.Text = "OPT4"; this.labelCH3Mode.Text = "OPT4";
else if (item.Serial3Mode == 6)
this.labelCH3Mode.Text = "OPT5";
else else
this.labelCH3Mode.Text = "None"; this.labelCH3Mode.Text = "None";
} }

2
INT69DB_2A/DataStore.cs
View File

@ -347,7 +347,6 @@ namespace INT69DB_2A
f3_OPT3, f3_OPT3,
f4_Printer, f4_Printer,
f5_OPT4, f5_OPT4,
f6_OPT5,
} }
public enum EthernetMode public enum EthernetMode
@ -358,7 +357,6 @@ namespace INT69DB_2A
f3_OPT3, f3_OPT3,
f4_Modbus, f4_Modbus,
f5_OPT4, f5_OPT4,
f6_OPT5,
} }
public enum UserGroup public enum UserGroup

34
INT69DB_2A/Forms/FormCommunication.cs
View File

@ -316,13 +316,6 @@ namespace INT69DB_2A.Forms
else if (this.ParentForm.SystemConfig.EquipmentMode == 2) else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
data = this.ParentForm.Protocol_OPT4(1, this.ParentForm.CollectionWeightData[0]); 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) switch (this.ParentForm.SystemConfig.EthernetOperationMode)
{ {
@ -381,13 +374,6 @@ namespace INT69DB_2A.Forms
else if (this.ParentForm.SystemConfig.EquipmentMode == 2) else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
data = this.ParentForm.Protocol_OPT4(1, this.ParentForm.CollectionWeightData[0]); 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) switch (this.ParentForm.SystemConfig.EthernetOperationMode)
{ {
@ -579,19 +565,6 @@ namespace INT69DB_2A.Forms
this.labelProtocolDescriptionEthernet_2.Text = "LANE[2],GRD[1],WEIGHT[6],ETX[1]]"; 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 else
{ {
this.labelProtocolDescriptionEthernet_1.Text = "-"; this.labelProtocolDescriptionEthernet_1.Text = "-";
@ -1614,13 +1587,6 @@ namespace INT69DB_2A.Forms
else if (this.ParentForm.SystemConfig.EquipmentMode == 2) else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT4_NotStxEtx(1, this.ParentForm.CollectionWeightData[0])); 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) private void comboBoxSerial3BaudRate_SelectedIndexChanged(object sender, EventArgs e)

29
INT69DB_2A/Forms/FormMain.cs
View File

@ -43,10 +43,13 @@ namespace INT69DB_2A.Forms
public string ComPortMainToLCD; // DllSerial Port public string ComPortMainToLCD; // DllSerial Port
public bool FlagDllSerial; // DllSerial 사용여부 public bool FlagDllSerial; // DllSerial 사용여부
private string TransferNum; // 수신데이터 ID저장 (재전송 시 사용) private string TransferNum; // 수신데이터 ID저장 (재전송 시 사용)
<<<<<<< HEAD
public bool FlagThreadMessage1; // 플레그 쓰레드 메시지 11 public bool FlagThreadMessage1; // 플레그 쓰레드 메시지 11
public int TotalAllCount; // 스틱1 전체 수량 public int TotalAllCount; // 스틱1 전체 수량
public int TotalPassCount; // 스틱1 전체 Pass 수량 public int TotalPassCount; // 스틱1 전체 Pass 수량
public int TotalNGCount; // 스틱1 전체 NG 수량 public int TotalNGCount; // 스틱1 전체 NG 수량
=======
>>>>>>> 65f9fe0 ( - 프로토콜 OPT5 삭제)
// Motor Download 통신용 변수 // Motor Download 통신용 변수
public int LineNum; public int LineNum;
@ -444,10 +447,13 @@ namespace INT69DB_2A.Forms
this.ColorLogOff = Color.Red; this.ColorLogOff = Color.Red;
this.ColorLogOn = Color.Yellow; this.ColorLogOn = Color.Yellow;
this.TransferNum = "-"; this.TransferNum = "-";
<<<<<<< HEAD
this.FlagThreadMessage1 = false; this.FlagThreadMessage1 = false;
this.TotalAllCount = 0; this.TotalAllCount = 0;
this.TotalNGCount = 0; this.TotalNGCount = 0;
this.TotalPassCount = 0; this.TotalPassCount = 0;
=======
>>>>>>> 65f9fe0 ( - 프로토콜 OPT5 삭제)
this.PathLaunchFolder = "SD Card\\"; this.PathLaunchFolder = "SD Card\\";
this.PathSystemFileFolder1 = this.PathLaunchFolder + "SystemFile1\\"; this.PathSystemFileFolder1 = this.PathLaunchFolder + "SystemFile1\\";
@ -1514,6 +1520,7 @@ namespace INT69DB_2A.Forms
return sb.ToString(); return sb.ToString();
} }
<<<<<<< HEAD
public string Protocol_OPT5(Collection<WeightData> datas) public string Protocol_OPT5(Collection<WeightData> datas)
{ {
string value = ""; string value = "";
@ -1697,6 +1704,8 @@ namespace INT69DB_2A.Forms
return sb.ToString(); return sb.ToString();
} }
=======
>>>>>>> 65f9fe0 ( - 프로토콜 OPT5 삭제)
public byte[] Protocol_Modbus_Client_Write_Common_Data() public byte[] Protocol_Modbus_Client_Write_Common_Data()
{ {
int index = 0; int index = 0;
@ -3168,9 +3177,6 @@ namespace INT69DB_2A.Forms
case 5: case 5:
this.UartCom3Write(this.Protocol_OPT4_NotStxEtx(datas)); this.UartCom3Write(this.Protocol_OPT4_NotStxEtx(datas));
break; break;
case 6:
this.UartCom3Write(this.Protocol_OPT5_NotStxEtx(datas));
break;
default: default:
break; break;
} }
@ -3191,9 +3197,6 @@ namespace INT69DB_2A.Forms
case 5: case 5:
this.SendEthernetData(this.Protocol_OPT4_NotStxEtx(datas)); this.SendEthernetData(this.Protocol_OPT4_NotStxEtx(datas));
break; break;
case 6:
this.SendEthernetData(this.Protocol_OPT5_NotStxEtx(datas));
break;
default: default:
break; break;
} }
@ -3329,8 +3332,6 @@ namespace INT69DB_2A.Forms
} }
else if (this.SystemConfig.Serial3Mode == 5) // OPT4 else if (this.SystemConfig.Serial3Mode == 5) // OPT4
this.UartCom3Write(this.Protocol_OPT4_NotStxEtx(this.CollectionWeightData)); 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) private void TreatSerialCommunication(int lane, WeightData data)
{ {
@ -3351,8 +3352,6 @@ namespace INT69DB_2A.Forms
} }
else if (this.SystemConfig.Serial3Mode == 5) // OPT4 else if (this.SystemConfig.Serial3Mode == 5) // OPT4
this.UartCom3Write(this.Protocol_OPT4_NotStxEtx(lane, data)); this.UartCom3Write(this.Protocol_OPT4_NotStxEtx(lane, data));
else if (this.SystemConfig.Serial3Mode == 6) // OPT5
this.UartCom3Write(this.Protocol_OPT5_NotStxEtx(lane, data));
} }
#endregion #endregion
#region Ethernet #region Ethernet
@ -3395,11 +3394,6 @@ namespace INT69DB_2A.Forms
sendData = this.Protocol_OPT4(this.CollectionWeightData); sendData = this.Protocol_OPT4(this.CollectionWeightData);
this.SendEthernetData(sendData); 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) private void TreatEthernetCommunication(int lane, WeightData data)
{ {
@ -3437,11 +3431,6 @@ namespace INT69DB_2A.Forms
sendData = this.Protocol_OPT4(lane, data); sendData = this.Protocol_OPT4(lane, data);
this.SendEthernetData(sendData); 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) private void SendEthernetData(string etherData)
{ {

14
INT69DB_2A/Forms/FormMainDisplay.cs
View File

@ -1434,14 +1434,14 @@ namespace INT69DB_2A.Forms
public void SetTotalCount() public void SetTotalCount()
{ {
string totalCNT = "", ngCNT = ""; string totalCNT = "", ngCNT = "";
int totalUnder = 0, totalOver = 0, totalExNG = 0; int totalAll = 0, totalPass = 0, totalNG = 0, totalUnder = 0, totalOver = 0, totalExNG = 0;
for (int i = 0; i < this.ParentForm.SystemConfig.EquipmentColumns; i++) for (int i = 0; i < this.ParentForm.SystemConfig.EquipmentColumns; i++)
{ {
this.ParentForm.TotalAllCount += this.ParentForm.CollectionWeightData[i].TotalCount; totalAll += this.ParentForm.CollectionWeightData[i].TotalCount;
this.ParentForm.TotalPassCount += this.ParentForm.CollectionWeightData[i].PassCount; totalPass += this.ParentForm.CollectionWeightData[i].PassCount;
this.ParentForm.TotalNGCount += this.ParentForm.CollectionWeightData[i].TotalNGCount; totalNG += this.ParentForm.CollectionWeightData[i].TotalNGCount;
totalUnder += this.ParentForm.CollectionWeightData[i].UnderCount; totalUnder += this.ParentForm.CollectionWeightData[i].UnderCount;
totalOver += this.ParentForm.CollectionWeightData[i].OverCount; totalOver += this.ParentForm.CollectionWeightData[i].OverCount;
totalExNG += this.ParentForm.CollectionWeightData[i].ExNGCount; totalExNG += this.ParentForm.CollectionWeightData[i].ExNGCount;
@ -1451,10 +1451,10 @@ namespace INT69DB_2A.Forms
switch (this.Mode_TotalCnt) switch (this.Mode_TotalCnt)
{ {
case DataStore.E_TotalCnt.f0_Total: case DataStore.E_TotalCnt.f0_Total:
totalCNT = this.ParentForm.TotalAllCount.ToString(); totalCNT = totalAll.ToString();
break; break;
case DataStore.E_TotalCnt.f1_Pass: case DataStore.E_TotalCnt.f1_Pass:
totalCNT = this.ParentForm.TotalPassCount.ToString(); totalCNT = totalPass.ToString();
break; break;
default: default:
break; break;
@ -1467,7 +1467,7 @@ namespace INT69DB_2A.Forms
switch (this.Mode_TotalCntNG) switch (this.Mode_TotalCntNG)
{ {
case DataStore.E_TotalCntNG.f0_NG: case DataStore.E_TotalCntNG.f0_NG:
ngCNT = this.ParentForm.TotalNGCount.ToString(); ngCNT = totalNG.ToString();
break; break;
case DataStore.E_TotalCntNG.f1_Under: case DataStore.E_TotalCntNG.f1_Under:
ngCNT = totalUnder.ToString(); ngCNT = totalUnder.ToString();