diff --git a/INT63DC_6CH/Controls/ControlMainDisplayTable6.Designer.cs b/INT63DC_6CH/Controls/ControlMainDisplayTable6.Designer.cs
index 85cf9ba..b53dddd 100644
--- a/INT63DC_6CH/Controls/ControlMainDisplayTable6.Designer.cs
+++ b/INT63DC_6CH/Controls/ControlMainDisplayTable6.Designer.cs
@@ -834,6 +834,8 @@
this.label3Col1Row.BackPictureBox2 = null;
this.label3Col1Row.BorderColor = System.Drawing.Color.Black;
this.label3Col1Row.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.label3Col1Row.Font = new System.Drawing.Font("Tahoma", 16F, System.Drawing.FontStyle.Bold);
+ this.label3Col1Row.ForeColor = System.Drawing.Color.Blue;
this.label3Col1Row.InitVisible = true;
this.label3Col1Row.LineSpacing = 0F;
this.label3Col1Row.Location = new System.Drawing.Point(479, 19);
@@ -1160,6 +1162,7 @@
this.label2Col1Row.BorderColor = System.Drawing.Color.Black;
this.label2Col1Row.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.label2Col1Row.Font = new System.Drawing.Font("Tahoma", 16F, System.Drawing.FontStyle.Bold);
+ this.label2Col1Row.ForeColor = System.Drawing.Color.RoyalBlue;
this.label2Col1Row.InitVisible = true;
this.label2Col1Row.LineSpacing = 0F;
this.label2Col1Row.Location = new System.Drawing.Point(381, 19);
@@ -1429,6 +1432,7 @@
this.label1Col2Row.BorderColor = System.Drawing.Color.Black;
this.label1Col2Row.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.label1Col2Row.Font = new System.Drawing.Font("Tahoma", 16F, System.Drawing.FontStyle.Bold);
+ this.label1Col2Row.ForeColor = System.Drawing.Color.CornflowerBlue;
this.label1Col2Row.InitVisible = true;
this.label1Col2Row.LineSpacing = 0F;
this.label1Col2Row.Location = new System.Drawing.Point(283, 51);
diff --git a/INT63DC_6CH/DataStore.cs b/INT63DC_6CH/DataStore.cs
index 794e612..83d378c 100644
--- a/INT63DC_6CH/DataStore.cs
+++ b/INT63DC_6CH/DataStore.cs
@@ -84,6 +84,9 @@ namespace INT63DC_6CH
Empty,
UnderLimit,
OverLimit,
+ BP_Pass,
+ BP_NG,
+ BP_Individual,
};
public enum WeightStatus
@@ -894,7 +897,6 @@ namespace INT63DC_6CH
private int m_ProductNumber;
private int m_DataStoragePeriod;
private int m_EquipmentColumns;
- private int m_EquipmentID;
private int m_Chattering;
private int m_BuzzerRunTime;
private int m_RelayRunTime;
@@ -1005,11 +1007,6 @@ namespace INT63DC_6CH
get { return this.m_EquipmentColumns; }
set { this.m_EquipmentColumns = value; }
}
- public int EquipmentID
- {
- get { return this.m_EquipmentID; }
- set { this.m_EquipmentID = value; }
- }
public int Chattering
{
get { return this.m_Chattering; }
@@ -1208,8 +1205,7 @@ namespace INT63DC_6CH
this.ProductNumber = 1;
this.DataStoragePeriod = 36;
this.EquipmentColumns = 6;
- this.EquipmentID = 1;
- this.Chattering = 100;
+ this.Chattering = 300;
this.BuzzerRunTime = 500;
this.RelayRunTime = 1000;
this.Sorter1Location = 3;
@@ -1284,7 +1280,6 @@ namespace INT63DC_6CH
public int ProductNumber;
public int DataStoragePeriod;
public int EquipmentColumns;
- public int EquipmentID;
public int Chattering;
public int BuzzerRunTime;
public int RelayRunTime;
@@ -1710,7 +1705,7 @@ namespace INT63DC_6CH
else
this.UnderCount = 0;
}
- else if (value == DataStore.JudgmentStatus.Pass)
+ else if (value == DataStore.JudgmentStatus.Pass || value == DataStore.JudgmentStatus.BP_Individual || value == DataStore.JudgmentStatus.BP_Pass)
{
if (this.PassCount < 10000000)
this.PassCount++;
@@ -1724,7 +1719,7 @@ namespace INT63DC_6CH
else
this.OverCount = 0;
}
- else if (value == DataStore.JudgmentStatus.Double || value == DataStore.JudgmentStatus.ExNG)
+ else if (value == DataStore.JudgmentStatus.Double || value == DataStore.JudgmentStatus.ExNG || value == DataStore.JudgmentStatus.BP_NG)
{
if (this.ExNGCount < 10000000)
this.ExNGCount++;
diff --git a/INT63DC_6CH/Forms/FormCommunication.cs b/INT63DC_6CH/Forms/FormCommunication.cs
index 6da0108..803072c 100644
--- a/INT63DC_6CH/Forms/FormCommunication.cs
+++ b/INT63DC_6CH/Forms/FormCommunication.cs
@@ -521,7 +521,7 @@ namespace INT63DC_6CH.Forms
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],TARE[6],{GRD[1],WEIGHT[6]} * n,ETX[1]";
#endregion
}
- else if (this.comboBoxSerial3Mode.SelectedIndex == 5)
+ else if (this.comboBoxSerial3Mode.SelectedIndex == 3)
{
#region OPT3
this.labelProtocolDescriptionCOM3_1.Text =
@@ -531,7 +531,7 @@ namespace INT63DC_6CH.Forms
else
{
#region None
- this.labelProtocolDescriptionCOM3_1.Text = "COM3 Protocol Description";
+ this.labelProtocolDescriptionCOM3_1.Text = "";
#endregion
}
}
diff --git a/INT63DC_6CH/Forms/FormFactoryInitialize.cs b/INT63DC_6CH/Forms/FormFactoryInitialize.cs
index 9c0716e..7c6eaad 100644
--- a/INT63DC_6CH/Forms/FormFactoryInitialize.cs
+++ b/INT63DC_6CH/Forms/FormFactoryInitialize.cs
@@ -153,7 +153,6 @@ namespace INT63DC_6CH.Forms
structItem.ProductNumber = item.ProductNumber;
structItem.DataStoragePeriod = item.DataStoragePeriod;
structItem.EquipmentColumns = item.EquipmentColumns;
- structItem.EquipmentID = item.EquipmentID;
structItem.Chattering = item.Chattering;
structItem.BuzzerRunTime = item.BuzzerRunTime;
structItem.RelayRunTime = item.RelayRunTime;
diff --git a/INT63DC_6CH/Forms/FormMain.Designer.cs b/INT63DC_6CH/Forms/FormMain.Designer.cs
index 571d237..2af1f21 100644
--- a/INT63DC_6CH/Forms/FormMain.Designer.cs
+++ b/INT63DC_6CH/Forms/FormMain.Designer.cs
@@ -43,6 +43,7 @@
this.smartTCPMultiServer = new SmartX.SmartTCPMultiServer();
this.timerUserList = new System.Windows.Forms.Timer();
this.smartSerialPortLink = new SmartX.SmartSerialPort();
+ this.smartSerialPort3 = new SmartX.SmartSerialPort();
((System.ComponentModel.ISupportInitialize)(this.smartForm)).BeginInit();
this.SuspendLayout();
//
@@ -140,6 +141,26 @@
this.smartSerialPortLink.TailErrorCodeOffset = 0;
this.smartSerialPortLink.OnReadQueueEvent += new SmartX.SmartSerialPort.ReceiveDataHandler(this.smartSerialPort_OnReadQueueEvent);
//
+ // smartSerialPort3
+ //
+ this.smartSerialPort3.Baud_Rate = SmartX.SmartSerialPort.BAUDRATE._115200bps;
+ this.smartSerialPort3.ErrorCheckCodeType = SmartX.SmartSerialPort.ERRORCHECKCODETYPES.ASCIICODE;
+ this.smartSerialPort3.ErrorCheckMode = SmartX.SmartSerialPort.ERRORCHECK.NONE;
+ this.smartSerialPort3.ErrorCode_Location = SmartX.SmartSerialPort.ERRORCODELOCATION.HEADER;
+ this.smartSerialPort3.ETXCode = ((byte)(3));
+ this.smartSerialPort3.ETXCodes = null;
+ this.smartSerialPort3.FrameBufferSize = ((uint)(1024u));
+ this.smartSerialPort3.FrameSeparationType = SmartX.SmartSerialPort.FRAMESEPARATIONTYPES.STXANDETX;
+ this.smartSerialPort3.HeadErrorCodeOffset = 0;
+ this.smartSerialPort3.PortNo = SmartX.SmartSerialPort.COMPORTNO.COM3;
+ this.smartSerialPort3.ReadTimeout = -1;
+ this.smartSerialPort3.ReceiveDetect = SmartX.SmartSerialPort.RECEIVEDETECTTYPE.EVENT_QUEUE;
+ this.smartSerialPort3.ReceiveFrameDebugMode = false;
+ this.smartSerialPort3.RS485SoftwareDetection = false;
+ this.smartSerialPort3.STXCode = ((byte)(2));
+ this.smartSerialPort3.STXCodes = null;
+ this.smartSerialPort3.TailErrorCodeOffset = 0;
+ //
// FormMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -170,5 +191,6 @@
public SmartX.SmartTCPMultiServer smartTCPMultiServer;
private System.Windows.Forms.Timer timerUserList;
private SmartX.SmartSerialPort smartSerialPortLink;
+ private SmartX.SmartSerialPort smartSerialPort3;
}
}
\ No newline at end of file
diff --git a/INT63DC_6CH/Forms/FormMain.cs b/INT63DC_6CH/Forms/FormMain.cs
index db8c35b..1432bad 100644
--- a/INT63DC_6CH/Forms/FormMain.cs
+++ b/INT63DC_6CH/Forms/FormMain.cs
@@ -1229,7 +1229,7 @@ namespace INT63DC_6CH.Forms
private int ReceiveCommandSR0(string lane, string receiveData, string transactionID, string transferCNT)
{
int ret = 0;
- string data;
+ string data, etherStringData;
StringBuilder weightLimit = new StringBuilder();
StringBuilder sb = new StringBuilder();
@@ -1333,32 +1333,39 @@ namespace INT63DC_6CH.Forms
if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)
{
#region Serial 3
- if (this.SystemConfig.Serial3Mode == 1) // OPT1 - 중량 데이터 피드백
- {
- // V1.10.0 아남자동기 수정
- // FeedbackEmptyTransfer - 제품 안들어 올때 데이터 전송 여부
- // 중량이 0.3g 이하이면 전송 안함 (제품이 안들어 올때) <- 전체열이 0.3g이하일때 전송안함
- // V3.1.0 HRG 수정 (V1.10.0 기능 삭제)
- // Empty중량설정 추가 - 판정이 Empty이면 데이터 전송 안함
- // V3.3.2
- // Empty판정이 1개라도 있으면 데이터 전송 안함
- // V8.0.0
- // Empty 중량설정 이하면 전송 안하도록 수정(바이패스 시 GRD 'P'로 전송되어, 0g 이여도 전송됨
- int cnt = 0;
- foreach (WeightData weight in this.CollectionWeightData)
- {
- //if (weight.JudgmentStatus == DataStore.JudgmentStatus.Empty)
- // cnt++;
-
- if (weight.WeightInt < int.Parse(this.SystemConfig.EmptyWeight))
- cnt++;
- }
-
- if (cnt == 0)
- this.SerialCH3STD1(this.CollectionWeightData);
- }
- else if (this.SystemConfig.Serial3Mode == 2)
+ if (this.SystemConfig.Serial3Mode == 1) // STD1 - 중량 데이터 피드백
+ this.SerialCH3STD1(this.CollectionWeightData);
+ else if (this.SystemConfig.Serial3Mode == 2) // STD2 - 중량 데이터 피드백
this.SerialCH3STD2(this.CollectionWeightData);
+ else if (this.SystemConfig.Serial3Mode == 3) // STD3 - 중량 데이터 피드백
+ this.SerialCH3STD3(this.CollectionWeightData);
+ #endregion
+
+ #region 이더넷
+ if (this.SystemConfig.IsEthernetEnable == true)
+ {
+ if (this.SystemConfig.EthernetMode == 1) // STD1 - 중량 데이터 피드백
+ {
+ #region OPT2
+ etherStringData = this.Protocol_STD1(this.SystemConfig, this.CollectionWeightData);
+ this.SendEthernetData(etherStringData);
+ #endregion
+ }
+ else if (this.SystemConfig.EthernetMode == 2) // STD2 - 중량 데이터 피드백
+ {
+ #region OPT2
+ etherStringData = this.Protocol_STD2(this.SystemConfig, this.CollectionWeightData, this.CurrentProductItem);
+ this.SendEthernetData(etherStringData);
+ #endregion
+ }
+ else if (this.SystemConfig.EthernetMode == 3) // STD3 - 중량 데이터 피드백
+ {
+ #region OPT3
+ etherStringData = this.Protocol_STD3(this.SystemConfig, this.CollectionWeightData, this.CurrentProductItem);
+ this.SendEthernetData(etherStringData);
+ #endregion
+ }
+ }
#endregion
#region FormMainDisplay
@@ -1720,7 +1727,6 @@ namespace INT63DC_6CH.Forms
structItem.ProductNumber = this.SystemConfig.ProductNumber;
structItem.DataStoragePeriod = this.SystemConfig.DataStoragePeriod;
structItem.EquipmentColumns = this.SystemConfig.EquipmentColumns;
- structItem.EquipmentID = this.SystemConfig.EquipmentID;
structItem.Chattering = this.SystemConfig.Chattering;
structItem.BuzzerRunTime = this.SystemConfig.BuzzerRunTime;
structItem.RelayRunTime = this.SystemConfig.RelayRunTime;
@@ -1824,7 +1830,6 @@ namespace INT63DC_6CH.Forms
structItem.ProductNumber = item.ProductNumber;
structItem.DataStoragePeriod = item.DataStoragePeriod;
structItem.EquipmentColumns = item.EquipmentColumns;
- structItem.EquipmentID = item.EquipmentID;
structItem.Chattering = item.Chattering;
structItem.BuzzerRunTime = item.BuzzerRunTime;
structItem.RelayRunTime = item.RelayRunTime;
@@ -1918,7 +1923,6 @@ namespace INT63DC_6CH.Forms
this.SystemConfig.ProductNumber = structItem.ProductNumber;
this.SystemConfig.DataStoragePeriod = structItem.DataStoragePeriod;
this.SystemConfig.EquipmentColumns = structItem.EquipmentColumns;
- this.SystemConfig.EquipmentID = structItem.EquipmentID;
this.SystemConfig.Chattering = structItem.Chattering;
this.SystemConfig.BuzzerRunTime = structItem.BuzzerRunTime;
this.SystemConfig.RelayRunTime = structItem.RelayRunTime;
@@ -4210,6 +4214,9 @@ namespace INT63DC_6CH.Forms
case DataStore.JudgmentStatus.Double:
case DataStore.JudgmentStatus.ExNG:
case DataStore.JudgmentStatus.SensorError:
+ case DataStore.JudgmentStatus.BP_Individual:
+ case DataStore.JudgmentStatus.BP_NG:
+ case DataStore.JudgmentStatus.BP_Pass:
judgmentStatus = 4;
break;
default:
@@ -4679,7 +4686,7 @@ namespace INT63DC_6CH.Forms
{
StringBuilder sb = new StringBuilder();
- sb.Append(string.Format("IN{0:D3}", system.EquipmentID));
+ sb.Append(string.Format("IN{0:D3}", system.UsbID));
sb.Append(string.Format("{0:D4}", system.ProductNumber));
for (int i = 0; i < system.EquipmentColumns; i++)
@@ -4692,6 +4699,9 @@ namespace INT63DC_6CH.Forms
sb.Append("O");
else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Double)
sb.Append("D");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.BP_Individual || datas[i].JudgmentStatus == DataStore.JudgmentStatus.BP_NG ||
+ datas[i].JudgmentStatus == DataStore.JudgmentStatus.BP_Pass)
+ sb.Append("B");
else
sb.Append("E");
@@ -4714,7 +4724,7 @@ namespace INT63DC_6CH.Forms
{
StringBuilder sb = new StringBuilder();
- sb.Append(string.Format("IN{0:D3}", system.EquipmentID));
+ sb.Append(string.Format("IN{0:D3}", system.UsbID));
sb.Append(string.Format("{0:D4}", system.ProductNumber));
sb.Append(string.Format("{0:D2}", lane));
@@ -4726,6 +4736,9 @@ namespace INT63DC_6CH.Forms
sb.Append("O");
else if (data.JudgmentStatus == DataStore.JudgmentStatus.Double)
sb.Append("D");
+ else if (data.JudgmentStatus == DataStore.JudgmentStatus.BP_Individual || data.JudgmentStatus == DataStore.JudgmentStatus.BP_NG ||
+ data.JudgmentStatus == DataStore.JudgmentStatus.BP_Pass)
+ sb.Append("B");
else
sb.Append("E");
@@ -4748,7 +4761,7 @@ namespace INT63DC_6CH.Forms
{
StringBuilder sb = new StringBuilder();
- sb.Append(string.Format("IN{0:D3}", system.EquipmentID));
+ sb.Append(string.Format("IN{0:D3}", system.UsbID));
sb.Append(string.Format("{0:D4}", system.ProductNumber));
sb.Append(Helper.StringBlankFillDigits6(Helper.StringToDecimalPlaces(pItem.UnderRange, system.DecimalPlaces)));
@@ -4766,6 +4779,9 @@ namespace INT63DC_6CH.Forms
sb.Append("O");
else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Double)
sb.Append("D");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.BP_Individual || datas[i].JudgmentStatus == DataStore.JudgmentStatus.BP_NG ||
+ datas[i].JudgmentStatus == DataStore.JudgmentStatus.BP_Pass)
+ sb.Append("B");
else
sb.Append("E");
@@ -4788,7 +4804,7 @@ namespace INT63DC_6CH.Forms
{
StringBuilder sb = new StringBuilder();
- sb.Append(string.Format("IN{0:D3}", system.EquipmentID));
+ sb.Append(string.Format("IN{0:D3}", system.UsbID));
sb.Append(string.Format("{0:D4}", system.ProductNumber));
sb.Append(Helper.StringBlankFillDigits6(Helper.StringToDecimalPlaces(pItem.UnderRange, system.DecimalPlaces)));
@@ -4805,6 +4821,9 @@ namespace INT63DC_6CH.Forms
sb.Append("O");
else if (data.JudgmentStatus == DataStore.JudgmentStatus.Double)
sb.Append("D");
+ else if (data.JudgmentStatus == DataStore.JudgmentStatus.BP_Individual || data.JudgmentStatus == DataStore.JudgmentStatus.BP_NG ||
+ data.JudgmentStatus == DataStore.JudgmentStatus.BP_Pass)
+ sb.Append("B");
else
sb.Append("E");
@@ -4835,7 +4854,7 @@ namespace INT63DC_6CH.Forms
totalNg += datas[i].TotalNGCount;
}
- sb.Append(string.Format("IN{0:D3}", system.EquipmentID));
+ sb.Append(string.Format("IN{0:D3}", system.UsbID));
sb.Append(string.Format("{0:D4}", system.ProductNumber));
sb.Append(Helper.StringBlankFillDigits6(Helper.StringToDecimalPlaces(pItem.UnderRange, system.DecimalPlaces)));
@@ -4857,6 +4876,9 @@ namespace INT63DC_6CH.Forms
sb.Append("O");
else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Double)
sb.Append("D");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.BP_Individual || datas[i].JudgmentStatus == DataStore.JudgmentStatus.BP_NG ||
+ datas[i].JudgmentStatus == DataStore.JudgmentStatus.BP_Pass)
+ sb.Append("B");
else
sb.Append("E");
@@ -4880,7 +4902,7 @@ namespace INT63DC_6CH.Forms
string value = "";
StringBuilder sb = new StringBuilder();
- sb.Append(string.Format("IN{0:D3}", system.EquipmentID));
+ sb.Append(string.Format("IN{0:D3}", system.UsbID));
sb.Append(string.Format("{0:D4}", system.ProductNumber));
sb.Append(Helper.StringBlankFillDigits6(Helper.StringToDecimalPlaces(pItem.UnderRange, system.DecimalPlaces)));
@@ -4902,6 +4924,9 @@ namespace INT63DC_6CH.Forms
sb.Append("O");
else if (data.JudgmentStatus == DataStore.JudgmentStatus.Double)
sb.Append("D");
+ else if (data.JudgmentStatus == DataStore.JudgmentStatus.BP_Individual || data.JudgmentStatus == DataStore.JudgmentStatus.BP_NG ||
+ data.JudgmentStatus == DataStore.JudgmentStatus.BP_Pass)
+ sb.Append("B");
else
sb.Append("E");
@@ -6348,23 +6373,33 @@ namespace INT63DC_6CH.Forms
{
case 0:
baudrate = 9600;
+ this.smartSerialPort3.Baud_Rate = SmartSerialPort.BAUDRATE._9600bps;
break;
case 1:
baudrate = 19200;
+ this.smartSerialPort3.Baud_Rate = SmartSerialPort.BAUDRATE._19200bps;
break;
case 2:
baudrate = 38400;
+ this.smartSerialPort3.Baud_Rate = SmartSerialPort.BAUDRATE._38400bps;
break;
case 3:
baudrate = 115200;
+ this.smartSerialPort3.Baud_Rate = SmartSerialPort.BAUDRATE._115200bps;
break;
default:
baudrate = 9600;
+ this.smartSerialPort3.Baud_Rate = SmartSerialPort.BAUDRATE._9600bps;
break;
}
- // Port : COM3
- SerialMgrComm.serialPortOpen("COM3:", baudrate, 0, 0, 8);
+ if (this.FlagDllSerial == true)
+ SerialMgrComm.serialPortOpen("COM3:", baudrate, 0, 0, 8);
+ else
+ {
+ if (this.smartSerialPort3.IsOpen == false)
+ this.smartSerialPort3.Open();
+ }
}
catch
{
@@ -6392,9 +6427,12 @@ namespace INT63DC_6CH.Forms
{
string value = "";
- value = this.Protocol_STD1(this.SystemConfig, datas);
+ value = this.Protocol_STD1_NotStxEtx(this.SystemConfig, datas);
- SerialMgrComm.serialPortMessage("COM3:", value);
+ if (this.FlagDllSerial == true)
+ SerialMgrComm.serialPortMessage("COM3:", value);
+ else
+ this.smartSerialPort3.WriteFrame(value, SmartSerialPort.CODETYPES.ASCIICODE);
if (this.IsCom3LogOpen == true)
this.smartFileCom3Log.WriteString(string.Format("Send ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, value));
@@ -6403,9 +6441,12 @@ namespace INT63DC_6CH.Forms
{
string value = "";
- value = this.Protocol_STD2(this.SystemConfig, datas, this.CurrentProductItem);
+ value = this.Protocol_STD2_NotStxEtx(this.SystemConfig, datas, this.CurrentProductItem);
- SerialMgrComm.serialPortMessage("COM3:", value);
+ if (this.FlagDllSerial == true)
+ SerialMgrComm.serialPortMessage("COM3:", value);
+ else
+ this.smartSerialPort3.WriteFrame(value, SmartSerialPort.CODETYPES.ASCIICODE);
if (this.IsCom3LogOpen == true)
this.smartFileCom3Log.WriteString(string.Format("Send ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, value));
@@ -6414,9 +6455,12 @@ namespace INT63DC_6CH.Forms
{
string value = "";
- value = this.Protocol_STD3(this.SystemConfig, datas, this.CurrentProductItem);
+ value = this.Protocol_STD3_NotStxEtx(this.SystemConfig, datas, this.CurrentProductItem);
- SerialMgrComm.serialPortMessage("COM3:", value);
+ if (this.FlagDllSerial == true)
+ SerialMgrComm.serialPortMessage("COM3:", value);
+ else
+ this.smartSerialPort3.WriteFrame(value, SmartSerialPort.CODETYPES.ASCIICODE);
if (this.IsCom3LogOpen == true)
this.smartFileCom3Log.WriteString(string.Format("Send ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, value));
diff --git a/INT63DC_6CH/Forms/FormMain.resx b/INT63DC_6CH/Forms/FormMain.resx
index acd494f..637db23 100644
--- a/INT63DC_6CH/Forms/FormMain.resx
+++ b/INT63DC_6CH/Forms/FormMain.resx
@@ -156,6 +156,9 @@
781, 56
+
+ 939, 56
+
WEBPAD
diff --git a/INT63DC_6CH/Forms/FormMainDisplay.Designer.cs b/INT63DC_6CH/Forms/FormMainDisplay.Designer.cs
index 73a68ba..db209a7 100644
--- a/INT63DC_6CH/Forms/FormMainDisplay.Designer.cs
+++ b/INT63DC_6CH/Forms/FormMainDisplay.Designer.cs
@@ -2247,6 +2247,7 @@
this.buttonExit.TextLocation = new System.Drawing.Point(0, 0);
this.buttonExit.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonExit.UpImage = null;
+ this.buttonExit.Visible = false;
this.buttonExit.Click += new System.EventHandler(this.buttonExit_Click);
//
// FormMainDisplay
diff --git a/INT63DC_6CH/Forms/FormSystemSetting.Designer.cs b/INT63DC_6CH/Forms/FormSystemSetting.Designer.cs
index 74c198f..1f7356e 100644
--- a/INT63DC_6CH/Forms/FormSystemSetting.Designer.cs
+++ b/INT63DC_6CH/Forms/FormSystemSetting.Designer.cs
@@ -987,7 +987,6 @@
this.labelFeedSpeed.Text = "100";
this.labelFeedSpeed.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
this.labelFeedSpeed.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.labelFeedSpeed.Visible = false;
this.labelFeedSpeed.Wordwrap = false;
this.labelFeedSpeed.Click += new System.EventHandler(this.labelFeedSpeed_Click);
//
@@ -1009,7 +1008,6 @@
this.labelTitleFeedSpeed.Text = "속도";
this.labelTitleFeedSpeed.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelTitleFeedSpeed.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.labelTitleFeedSpeed.Visible = false;
this.labelTitleFeedSpeed.Wordwrap = false;
//
// smartSeparatorLine2
diff --git a/INT63DC_6CH/Forms/FormSystemSetting.cs b/INT63DC_6CH/Forms/FormSystemSetting.cs
index 54b9a15..2a8d09e 100644
--- a/INT63DC_6CH/Forms/FormSystemSetting.cs
+++ b/INT63DC_6CH/Forms/FormSystemSetting.cs
@@ -470,6 +470,8 @@ namespace INT63DC_6CH.Forms
if (this.SelectedJudgmentSetItem == null && this.SelectedJudgmentSetItem == null)
return;
+ this.labelTimeroutCount.Visible = false;
+
#region Judgment Item
this.SelectedJudgmentSetItem.JudgmentDelayTime = jItem.JudgmentDelayTime;
this.SelectedJudgmentSetItem.TurnDelayTime = jItem.TurnDelayTime;
diff --git a/INT63DC_6CH/Helper.cs b/INT63DC_6CH/Helper.cs
index a8287af..de15d9f 100644
--- a/INT63DC_6CH/Helper.cs
+++ b/INT63DC_6CH/Helper.cs
@@ -41,7 +41,8 @@ namespace INT63DC_6CH
progressBar.BarColor1 = Color.Yellow;
}
else if (judStatus == DataStore.JudgmentStatus.Under || judStatus == DataStore.JudgmentStatus.Double ||
- judStatus == DataStore.JudgmentStatus.SensorError || judStatus == DataStore.JudgmentStatus.ExNG)
+ judStatus == DataStore.JudgmentStatus.SensorError || judStatus == DataStore.JudgmentStatus.ExNG ||
+ judStatus == DataStore.JudgmentStatus.BP_NG)
{
if (progressBar.BarColor1 != Color.Red)
progressBar.BarColor1 = Color.Red;
@@ -76,6 +77,7 @@ namespace INT63DC_6CH
Color colorWeightSamplingData = Color.Blue;
Color colorWeightEmpty = Color.Gray;
Color colorWeightEmptySamplingData = Color.CornflowerBlue;
+ Color colorWeightBypass = Color.CornflowerBlue;
// Weight
sValue = Helper.DoubleToString(item.Weight, sys.DecimalPlaces);
@@ -100,6 +102,12 @@ namespace INT63DC_6CH
if (label.ForeColor != colorWeightStandard)
label.ForeColor = colorWeightStandard;
}
+ else if (item.JudgmentStatus == DataStore.JudgmentStatus.BP_Individual || item.JudgmentStatus == DataStore.JudgmentStatus.BP_NG ||
+ item.JudgmentStatus == DataStore.JudgmentStatus.BP_Pass)
+ {
+ if (label.ForeColor != colorWeightBypass)
+ label.ForeColor = colorWeightBypass;
+ }
else
{
if (label.ForeColor != colorWeightOver)
@@ -295,6 +303,12 @@ namespace INT63DC_6CH
return DataStore.JudgmentStatus.ExNG;
else if (value == "st" || value == "sT")
return DataStore.JudgmentStatus.Empty;
+ else if (value == "sb")
+ return DataStore.JudgmentStatus.BP_Individual;
+ else if (value == "sh")
+ return DataStore.JudgmentStatus.BP_Pass;
+ else if (value == "si")
+ return DataStore.JudgmentStatus.BP_NG;
else
return DataStore.JudgmentStatus.None;
}