- 버그수정

main
DESKTOP-999R8N3\CJY 2024-04-19 17:33:51 +09:00
parent 6e0567cc2b
commit ea61fd4b2f
9 changed files with 1187 additions and 1469 deletions

File diff suppressed because it is too large Load Diff

View File

@ -23,8 +23,10 @@ namespace INT_PT002.Controls
private Collection<SmartLabel> CollectionOffset; private Collection<SmartLabel> CollectionOffset;
private Collection<SmartLabel> CollectionContents; private Collection<SmartLabel> CollectionContents;
private Collection<SmartLabel> CollectionDec; private Collection<SmartLabel> CollectionDecIsProcessing;
private Collection<SmartLabel> CollectionHexa; private Collection<SmartLabel> CollectionDecIsLeak;
private Collection<SmartLabel> CollectionHexaIsProcessing;
private Collection<SmartLabel> CollectionHexaIsLeak;
#endregion #endregion
#region Constructor #region Constructor
@ -53,7 +55,7 @@ namespace INT_PT002.Controls
if (this.ParentForm.ParentForm.SystemConfig.LANGUAGE == Define.E_LanguageID.English) if (this.ParentForm.ParentForm.SystemConfig.LANGUAGE == Define.E_LanguageID.English)
{ {
#region 영문 #region 영문
this.labelTitlePort.Text = "Port"; this.labelTitlePort.Text = "Modbus Data";
this.labelTitleStartAddr1.Text = "Start"; this.labelTitleStartAddr1.Text = "Start";
this.labelTitleStartAddr2.Text = "Address"; this.labelTitleStartAddr2.Text = "Address";
this.labelTitleReceiveCount1.Text = "Receive"; this.labelTitleReceiveCount1.Text = "Receive";
@ -79,7 +81,7 @@ namespace INT_PT002.Controls
else else
{ {
#region 한글 #region 한글
this.labelTitlePort.Text = "Port"; this.labelTitlePort.Text = "Modbus Data";
this.labelTitleStartAddr1.Text = "Start"; this.labelTitleStartAddr1.Text = "Start";
this.labelTitleStartAddr2.Text = "Address"; this.labelTitleStartAddr2.Text = "Address";
this.labelTitleReceiveCount1.Text = "Receive"; this.labelTitleReceiveCount1.Text = "Receive";
@ -107,26 +109,31 @@ namespace INT_PT002.Controls
{ {
this.CollectionOffset = new Collection<SmartLabel>(); this.CollectionOffset = new Collection<SmartLabel>();
this.CollectionContents = new Collection<SmartLabel>(); this.CollectionContents = new Collection<SmartLabel>();
this.CollectionDec = new Collection<SmartLabel>(); this.CollectionDecIsProcessing = new Collection<SmartLabel>();
this.CollectionHexa = new Collection<SmartLabel>(); this.CollectionDecIsLeak = new Collection<SmartLabel>();
this.CollectionHexaIsProcessing = new Collection<SmartLabel>();
this.CollectionHexaIsLeak = new Collection<SmartLabel>();
for (int i = 1; i <= ModbusCount; i++) for (int i = 1; i <= ModbusCount; i++)
{ {
this.CollectionOffset.Add(FindByNameUtil.SmartLabel("labelOffset" + i, this)); this.CollectionOffset.Add(FindByNameUtil.SmartLabel("labelOffset" + i, this));
this.CollectionContents.Add(FindByNameUtil.SmartLabel("labelContents" + i, this)); this.CollectionContents.Add(FindByNameUtil.SmartLabel("labelContents" + i, this));
this.CollectionDec.Add(FindByNameUtil.SmartLabel("labelValueDec" + i, this));
this.CollectionHexa.Add(FindByNameUtil.SmartLabel("labelValueHexa" + i, this));
//Console.Write("\n" + string.Format("DefaultSetting {0:yyyy-MM-dd HH:mm:ss}: {1}", DateTime.Now, 4)); //Console.Write("\n" + string.Format("DefaultSetting {0:yyyy-MM-dd HH:mm:ss}: {1}", DateTime.Now, 4));
} }
for (int i = 1; i <= this.ParentForm.ParentForm.SystemConfig.EQUIPMENT_LANE; i++)
{
this.CollectionDecIsProcessing.Add(FindByNameUtil.SmartLabel("labelValueDecIsProcessing" + i, this));
this.CollectionDecIsLeak.Add(FindByNameUtil.SmartLabel("labelValueDecIsLeak" + i, this));
this.CollectionHexaIsProcessing.Add(FindByNameUtil.SmartLabel("labelValueHexaIsProcessing" + i, this));
this.CollectionHexaIsLeak.Add(FindByNameUtil.SmartLabel("labelValueHexaIsLeak" + i, this));
}
this.ReceiveCount = 0; this.ReceiveCount = 0;
this.labelReceiveCount.Text = this.ReceiveCount.ToString(); this.labelReceiveCount.Text = this.ReceiveCount.ToString();
} }
public void Clear()
{
this.UpdateData(this.ParentForm.ParentForm.Current30000ModbusData);
}
public void UpdateEquipmentStatusDisplay(Define.E_EquipmentStatus status) public void UpdateEquipmentStatusDisplay(Define.E_EquipmentStatus status)
{ {
@ -143,47 +150,19 @@ namespace INT_PT002.Controls
} }
public void UpdateData(_30000_ModbusData mData) public void UpdateData(_30000_ModbusData mData)
{ {
this.CollectionDec[0].Text = mData._1_IsProcessing.ToString(); this.ParentForm.ParentForm.Current30000ModbusData.SettingHexa();
this.CollectionDec[1].Text = mData._1_IsLeak.ToString();
this.CollectionDec[2].Text = mData._2_IsProcessing.ToString();
this.CollectionDec[3].Text = mData._2_IsLeak.ToString();
this.CollectionDec[4].Text = mData._3_IsProcessing.ToString();
this.CollectionDec[5].Text = mData._3_IsLeak.ToString();
this.CollectionDec[6].Text = mData._4_IsProcessing.ToString();
this.CollectionDec[7].Text = mData._4_IsLeak.ToString();
this.CollectionDec[8].Text = mData._5_IsProcessing.ToString();
this.CollectionDec[9].Text = mData._5_IsLeak.ToString();
this.CollectionDec[10].Text = mData._6_IsProcessing.ToString();
this.CollectionDec[11].Text = mData._6_IsLeak.ToString();
this.CollectionDec[12].Text = mData._7_IsProcessing.ToString();
this.CollectionDec[13].Text = mData._7_IsLeak.ToString();
this.CollectionDec[14].Text = mData._8_IsProcessing.ToString();
this.CollectionDec[15].Text = mData._8_IsLeak.ToString();
this.CollectionDec[16].Text = mData._9_IsProcessing.ToString();
this.CollectionDec[17].Text = mData._9_IsLeak.ToString();
this.CollectionDec[18].Text = mData._10_IsProcessing.ToString();
this.CollectionDec[19].Text = mData._10_IsLeak.ToString();
this.CollectionHexa[0].Text = mData.HexString_1_IsProcessing; for (int i = 0; i < this.ParentForm.ParentForm.SystemConfig.EQUIPMENT_LANE; i++)
this.CollectionHexa[1].Text = mData.HexString_1_IsLeak; {
this.CollectionHexa[2].Text = mData.HexString_2_IsProcessing; this.CollectionDecIsProcessing[i].Text = mData.CollectionIsProcessing[i].ToString();
this.CollectionHexa[3].Text = mData.HexString_2_IsLeak; this.CollectionDecIsLeak[i].Text = mData.CollectionIsLeak[i].ToString();
this.CollectionHexa[4].Text = mData.HexString_3_IsProcessing; this.CollectionHexaIsProcessing[i].Text = mData.CollectionIsProcessingHexa[i].ToString();
this.CollectionHexa[5].Text = mData.HexString_3_IsLeak; this.CollectionHexaIsLeak[i].Text = mData.CollectionIsLeakHexa[i].ToString();
this.CollectionHexa[6].Text = mData.HexString_4_IsProcessing; }
this.CollectionHexa[7].Text = mData.HexString_4_IsLeak;
this.CollectionHexa[8].Text = mData.HexString_5_IsProcessing; // 로그
this.CollectionHexa[9].Text = mData.HexString_5_IsLeak; if (this.ParentForm.ParentForm.IsCommunicationLogOpen == true)
this.CollectionHexa[10].Text = mData.HexString_6_IsProcessing; this.ParentForm.ParentForm.smartFileCommunicationLog.StringType.Write(string.Format("UpdateData ({0:yyyy-MM-dd HH:mm:ss})", DateTime.Now));
this.CollectionHexa[11].Text = mData.HexString_6_IsLeak;
this.CollectionHexa[12].Text = mData.HexString_7_IsProcessing;
this.CollectionHexa[13].Text = mData.HexString_7_IsLeak;
this.CollectionHexa[14].Text = mData.HexString_8_IsProcessing;
this.CollectionHexa[15].Text = mData.HexString_8_IsLeak;
this.CollectionHexa[16].Text = mData.HexString_9_IsProcessing;
this.CollectionHexa[17].Text = mData.HexString_9_IsLeak;
this.CollectionHexa[18].Text = mData.HexString_10_IsProcessing;
this.CollectionHexa[19].Text = mData.HexString_10_IsLeak;
} }
public void UpdateOffset(bool master, int startAddress) public void UpdateOffset(bool master, int startAddress)
{ {

View File

@ -114,6 +114,7 @@ namespace INT_PT002.DataStore
None, None,
Pass, Pass,
Ng, Ng,
Empty,
Error, Error,
} }

View File

@ -148,7 +148,7 @@ namespace INT_PT002.DataStore
#endregion #endregion
#region Method #region Method
private void Initialize() public void Initialize()
{ {
this.ProcessStatus = Define.E_ProcessStatus._0_None; this.ProcessStatus = Define.E_ProcessStatus._0_None;
this.Judgment = Define.E_JudgmentStatus.None; this.Judgment = Define.E_JudgmentStatus.None;

View File

@ -2,6 +2,7 @@
using System.Linq; using System.Linq;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using System.Collections.ObjectModel;
namespace INT_PT002 namespace INT_PT002
{ {
@ -36,26 +37,10 @@ namespace INT_PT002
public class _30000_ModbusData public class _30000_ModbusData
{ {
#region Field #region Field
private short m_1_IsProcessing; public Collection<short> m_CollectionIsProcessing;
private short m_1_IsLeak; public Collection<short> m_CollectionIsLeak;
private short m_2_IsProcessing; public Collection<string> m_CollectionIsProcessingHexa;
private short m_2_IsLeak; public Collection<string> m_CollectionIsLeakHexa;
private short m_3_IsProcessing;
private short m_3_IsLeak;
private short m_4_IsProcessing;
private short m_4_IsLeak;
private short m_5_IsProcessing;
private short m_5_IsLeak;
private short m_6_IsProcessing;
private short m_6_IsLeak;
private short m_7_IsProcessing;
private short m_7_IsLeak;
private short m_8_IsProcessing;
private short m_8_IsLeak;
private short m_9_IsProcessing;
private short m_9_IsLeak;
private short m_10_IsProcessing;
private short m_10_IsLeak;
#endregion #endregion
#region Constructor #region Constructor
@ -66,292 +51,59 @@ namespace INT_PT002
#endregion #endregion
#region Property #region Property
public short _1_IsProcessing public Collection<short> CollectionIsProcessing
{ {
get { return this.m_1_IsProcessing; } get { return this.m_CollectionIsProcessing; }
set { this.m_1_IsProcessing = value; } private set { this.m_CollectionIsProcessing = value; }
} }
public short _1_IsLeak public Collection<short> CollectionIsLeak
{ {
get { return this.m_1_IsLeak; } get { return this.m_CollectionIsLeak; }
set { this.m_1_IsLeak = value; } private set { this.m_CollectionIsLeak = value; }
} }
public short _2_IsProcessing public Collection<string> CollectionIsProcessingHexa
{ {
get { return this.m_2_IsProcessing; } get { return this.m_CollectionIsProcessingHexa; }
set { this.m_2_IsProcessing = value; } private set { this.m_CollectionIsProcessingHexa = value; }
} }
public short _2_IsLeak public Collection<string> CollectionIsLeakHexa
{ {
get { return this.m_2_IsLeak; } get { return this.m_CollectionIsLeakHexa; }
set { this.m_2_IsLeak = value; } private set { this.m_CollectionIsLeakHexa = value; }
} }
public short _3_IsProcessing
{
get { return this.m_3_IsProcessing; }
set { this.m_3_IsProcessing = value; }
}
public short _3_IsLeak
{
get { return this.m_3_IsLeak; }
set { this.m_3_IsLeak = value; }
}
public short _4_IsProcessing
{
get { return this.m_4_IsProcessing; }
set { this.m_4_IsProcessing = value; }
}
public short _4_IsLeak
{
get { return this.m_4_IsLeak; }
set { this.m_4_IsLeak = value; }
}
public short _5_IsProcessing
{
get { return this.m_5_IsProcessing; }
set { this.m_5_IsProcessing = value; }
}
public short _5_IsLeak
{
get { return this.m_5_IsLeak; }
set { this.m_5_IsLeak = value; }
}
public short _6_IsProcessing
{
get { return this.m_6_IsProcessing; }
set { this.m_6_IsProcessing = value; }
}
public short _6_IsLeak
{
get { return this.m_6_IsLeak; }
set { this.m_6_IsLeak = value; }
}
public short _7_IsProcessing
{
get { return this.m_7_IsProcessing; }
set { this.m_7_IsProcessing = value; }
}
public short _7_IsLeak
{
get { return this.m_7_IsLeak; }
set { this.m_7_IsLeak = value; }
}
public short _8_IsProcessing
{
get { return this.m_8_IsProcessing; }
set { this.m_8_IsProcessing = value; }
}
public short _8_IsLeak
{
get { return this.m_8_IsLeak; }
set { this.m_8_IsLeak = value; }
}
public short _9_IsProcessing
{
get { return this.m_9_IsProcessing; }
set { this.m_9_IsProcessing = value; }
}
public short _9_IsLeak
{
get { return this.m_9_IsLeak; }
set { this.m_9_IsLeak = value; }
}
public short _10_IsProcessing
{
get { return this.m_10_IsProcessing; }
set { this.m_10_IsProcessing = value; }
}
public short _10_IsLeak
{
get { return this.m_10_IsLeak; }
set { this.m_10_IsLeak = value; }
}
public string HexString_1_IsProcessing
{
get
{
string hexString = this._1_IsProcessing.ToString("X8");
return hexString;
}
}
public string HexString_1_IsLeak
{
get
{
string hexString = this._1_IsLeak.ToString("X8");
return hexString;
}
}
public string HexString_2_IsProcessing
{
get
{
string hexString = this._2_IsProcessing.ToString("X8");
return hexString;
}
}
public string HexString_2_IsLeak
{
get
{
string hexString = this._2_IsLeak.ToString("X8");
return hexString;
}
}
public string HexString_3_IsProcessing
{
get
{
string hexString = this._3_IsProcessing.ToString("X8");
return hexString;
}
}
public string HexString_3_IsLeak
{
get
{
string hexString = this._3_IsLeak.ToString("X8");
return hexString;
}
}
public string HexString_4_IsProcessing
{
get
{
string hexString = this._4_IsProcessing.ToString("X8");
return hexString;
}
}
public string HexString_4_IsLeak
{
get
{
string hexString = this._4_IsLeak.ToString("X8");
return hexString;
}
}
public string HexString_5_IsProcessing
{
get
{
string hexString = this._5_IsProcessing.ToString("X8");
return hexString;
}
}
public string HexString_5_IsLeak
{
get
{
string hexString = this._5_IsLeak.ToString("X8");
return hexString;
}
}
public string HexString_6_IsProcessing
{
get
{
string hexString = this._6_IsProcessing.ToString("X8");
return hexString;
}
}
public string HexString_6_IsLeak
{
get
{
string hexString = this._6_IsLeak.ToString("X8");
return hexString;
}
}
public string HexString_7_IsProcessing
{
get
{
string hexString = this._7_IsProcessing.ToString("X8");
return hexString;
}
}
public string HexString_7_IsLeak
{
get
{
string hexString = this._7_IsLeak.ToString("X8");
return hexString;
}
}
public string HexString_8_IsProcessing
{
get
{
string hexString = this._8_IsProcessing.ToString("X8");
return hexString;
}
}
public string HexString_8_IsLeak
{
get
{
string hexString = this._8_IsLeak.ToString("X8");
return hexString;
}
}
public string HexString_9_IsProcessing
{
get
{
string hexString = this._9_IsProcessing.ToString("X8");
return hexString;
}
}
public string HexString_9_IsLeak
{
get
{
string hexString = this._9_IsLeak.ToString("X8");
return hexString;
}
}
public string HexString_10_IsProcessing
{
get
{
string hexString = this._10_IsProcessing.ToString("X8");
return hexString;
}
}
public string HexString_10_IsLeak
{
get
{
string hexString = this._10_IsLeak.ToString("X8");
return hexString;
}
}
#endregion #endregion
#region Method #region Method
public void Initialization() public void Initialization()
{ {
this._1_IsProcessing = 0; this.CollectionIsProcessing = new Collection<short>();
this._1_IsLeak = 0; for (int i = 0; i < 10; i++)
this._2_IsProcessing = 0; this.CollectionIsProcessing.Add(0);
this._2_IsLeak = 0;
this._3_IsProcessing = 0; this.CollectionIsLeak = new Collection<short>();
this._3_IsLeak = 0; for (int i = 0; i < 10; i++)
this._4_IsProcessing = 0; this.CollectionIsLeak.Add(0);
this._4_IsLeak = 0;
this._5_IsProcessing = 0; this.CollectionIsProcessingHexa = new Collection<string>();
this._5_IsLeak = 0; for (int i = 0; i < 10; i++)
this._6_IsProcessing = 0; this.CollectionIsProcessingHexa.Add(this.CollectionIsProcessing[i].ToString("X8"));
this._6_IsLeak = 0;
this._7_IsProcessing = 0; this.CollectionIsLeakHexa = new Collection<string>();
this._7_IsLeak = 0; for (int i = 0; i < 10; i++)
this._8_IsProcessing = 0; this.CollectionIsLeakHexa.Add(this.CollectionIsLeak[i].ToString("X8"));
this._8_IsLeak = 0; }
this._9_IsProcessing = 0;
this._9_IsLeak = 0; public void SettingHexa()
this._10_IsProcessing = 0; {
this._10_IsLeak = 0; if(this.CollectionIsProcessingHexa.Count > 0)
this.CollectionIsProcessingHexa.Clear();
for (int i = 0; i < 10; i++)
this.CollectionIsProcessingHexa.Add(this.CollectionIsProcessing[i].ToString("X8"));
if (this.CollectionIsLeakHexa.Count > 0)
this.CollectionIsLeakHexa.Clear();
for (int i = 0; i < 10; i++)
this.CollectionIsLeakHexa.Add(this.CollectionIsLeak[i].ToString("X8"));
} }
#endregion #endregion
} }

View File

@ -141,7 +141,6 @@
public SmartX.SmartForm smartForm1; public SmartX.SmartForm smartForm1;
private SmartX.SmartSerialPort smartSerialPortLink; private SmartX.SmartSerialPort smartSerialPortLink;
private SmartX.SmartFile smartFileCommunicationLog;
private SmartX.SmartFile smartFileIO; private SmartX.SmartFile smartFileIO;
private System.Windows.Forms.Timer timerUserList; private System.Windows.Forms.Timer timerUserList;
private SmartX.SmartModbus smartModbus; private SmartX.SmartModbus smartModbus;
@ -149,6 +148,7 @@
public SmartX.SmartConfigs smartConfigs; public SmartX.SmartConfigs smartConfigs;
public SmartX.SmartTCPMultiServer smartTCPMultiServer; public SmartX.SmartTCPMultiServer smartTCPMultiServer;
public System.Windows.Forms.Timer timerSystem; public System.Windows.Forms.Timer timerSystem;
public SmartX.SmartFile smartFileCommunicationLog;
} }
} }

View File

@ -57,7 +57,7 @@ namespace INT_PT002.Forms
public Recipe CurrentRecipe; public Recipe CurrentRecipe;
// Leak Data // Leak Data
private LeakData CurrentLeakData; private LeakData CurrentLeakData;
private Collection<LeakData1> CurrentLeakDatas; public Collection<LeakData1> CurrentLeakDatas;
// Dll User_Name List // Dll User_Name List
public List<string> ListDllUserName; public List<string> ListDllUserName;
// IO Test - input data // IO Test - input data
@ -74,10 +74,6 @@ namespace INT_PT002.Forms
// Modbus Data // Modbus Data
public _30000_ModbusData Current30000ModbusData; public _30000_ModbusData Current30000ModbusData;
public _40000_ModbusData Current40000ModbusData; public _40000_ModbusData Current40000ModbusData;
// Modbus - 진행중 여부 확인
private Collection<short> CollectionIsProcessing;
private Collection<short> CollectionIsLeak;
// Ethernet // Ethernet
private bool IsEthernetThreadStop; private bool IsEthernetThreadStop;
@ -103,6 +99,8 @@ namespace INT_PT002.Forms
// Form // Form
public FormMainDisplay3 ChildFormMainDisplay; public FormMainDisplay3 ChildFormMainDisplay;
public FormMenu ChildFormMenu; public FormMenu ChildFormMenu;
private delegate void ModbusStatusCallback();
#endregion #endregion
#region Constructor #region Constructor
@ -219,28 +217,6 @@ namespace INT_PT002.Forms
this.Modbus = new Modbus(); this.Modbus = new Modbus();
this.Current30000ModbusData = new _30000_ModbusData(); this.Current30000ModbusData = new _30000_ModbusData();
this.Current40000ModbusData = new _40000_ModbusData(); this.Current40000ModbusData = new _40000_ModbusData();
this.CollectionIsProcessing = new Collection<short>();
this.CollectionIsProcessing.Add(this.Current30000ModbusData._1_IsProcessing);
this.CollectionIsProcessing.Add(this.Current30000ModbusData._2_IsProcessing);
this.CollectionIsProcessing.Add(this.Current30000ModbusData._3_IsProcessing);
this.CollectionIsProcessing.Add(this.Current30000ModbusData._4_IsProcessing);
this.CollectionIsProcessing.Add(this.Current30000ModbusData._5_IsProcessing);
this.CollectionIsProcessing.Add(this.Current30000ModbusData._6_IsProcessing);
this.CollectionIsProcessing.Add(this.Current30000ModbusData._7_IsProcessing);
this.CollectionIsProcessing.Add(this.Current30000ModbusData._8_IsProcessing);
this.CollectionIsProcessing.Add(this.Current30000ModbusData._9_IsProcessing);
this.CollectionIsProcessing.Add(this.Current30000ModbusData._10_IsProcessing);
this.CollectionIsLeak = new Collection<short>();
this.CollectionIsLeak.Add(this.Current30000ModbusData._1_IsLeak);
this.CollectionIsLeak.Add(this.Current30000ModbusData._2_IsLeak);
this.CollectionIsLeak.Add(this.Current30000ModbusData._3_IsLeak);
this.CollectionIsLeak.Add(this.Current30000ModbusData._4_IsLeak);
this.CollectionIsLeak.Add(this.Current30000ModbusData._5_IsLeak);
this.CollectionIsLeak.Add(this.Current30000ModbusData._6_IsLeak);
this.CollectionIsLeak.Add(this.Current30000ModbusData._7_IsLeak);
this.CollectionIsLeak.Add(this.Current30000ModbusData._8_IsLeak);
this.CollectionIsLeak.Add(this.Current30000ModbusData._9_IsLeak);
this.CollectionIsLeak.Add(this.Current30000ModbusData._10_IsLeak);
this.ColorLogOff = Color.Red; this.ColorLogOff = Color.Red;
this.ColorLogOn = Color.FromArgb(39, 200, 64); this.ColorLogOn = Color.FromArgb(39, 200, 64);
@ -1577,7 +1553,6 @@ namespace INT_PT002.Forms
// 화면 표시 // 화면 표시
this.ChildFormMainDisplay.UpdateDisplayJudgmentData10(this.CurrentLeakDatas[9]); this.ChildFormMainDisplay.UpdateDisplayJudgmentData10(this.CurrentLeakDatas[9]);
this.ChildFormMenu.UpdateDisplayEquipmentJudgmentData10(this.CurrentLeakDatas[9]); this.ChildFormMenu.UpdateDisplayEquipmentJudgmentData10(this.CurrentLeakDatas[9]);
this.ChildFormMainDisplay.UpdateDisplayJudgmentTrackingData(this.CurrentLeakData);
#endregion #endregion
break; break;
case "Z": case "Z":
@ -1592,8 +1567,6 @@ namespace INT_PT002.Forms
break; break;
} }
this.Update30000ModbusItem();
if (this.SystemConfig.MODBUS_TCP_SELECTFUNCTION == (int)Define.E_ModbusFunction._16_WriteMultipleRegister) if (this.SystemConfig.MODBUS_TCP_SELECTFUNCTION == (int)Define.E_ModbusFunction._16_WriteMultipleRegister)
{ {
byte[] sendData = this.Modbus.MakeTCPSendAllData(this.Transfer_1_Modbus_Write(), this.SystemConfig.MODBUS_TCP_START_ADDRESS); byte[] sendData = this.Modbus.MakeTCPSendAllData(this.Transfer_1_Modbus_Write(), this.SystemConfig.MODBUS_TCP_START_ADDRESS);
@ -1700,10 +1673,7 @@ namespace INT_PT002.Forms
break; break;
default: default:
break; break;
} }
this.Update30000ModbusItem();
} }
catch catch
{ {
@ -2274,11 +2244,11 @@ namespace INT_PT002.Forms
for (int j = 0; j < this.SystemConfig.EQUIPMENT_LANE; j++) for (int j = 0; j < this.SystemConfig.EQUIPMENT_LANE; j++)
{ {
Length2Value = GetBytes(this.CollectionIsProcessing[j]); Length2Value = GetBytes(this.Current30000ModbusData.CollectionIsProcessing[j]);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
madeData[i] = Length2Value[2 - i]; madeData[i] = Length2Value[2 - i];
Length2Value = GetBytes(this.CollectionIsLeak[j]); Length2Value = GetBytes(this.Current30000ModbusData.CollectionIsLeak[j]);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
madeData[i] = Length2Value[2 - i]; madeData[i] = Length2Value[2 - i];
} }
@ -2307,102 +2277,102 @@ namespace INT_PT002.Forms
{ {
#region Make data #region Make data
case _30000_ModbusAddress._01_1_IsProcessing: case _30000_ModbusAddress._01_1_IsProcessing:
length2Value = GetBytes(this.CollectionIsProcessing[0]); length2Value = GetBytes(this.Current30000ModbusData.CollectionIsProcessing[0]);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
madeData[madeDataIndex + i] = length2Value[2 - i]; madeData[madeDataIndex + i] = length2Value[2 - i];
break; break;
case _30000_ModbusAddress._02_1_IsLeak: case _30000_ModbusAddress._02_1_IsLeak:
length2Value = GetBytes(this.CollectionIsLeak[0]); length2Value = GetBytes(this.Current30000ModbusData.CollectionIsLeak[0]);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
madeData[madeDataIndex + i] = length2Value[2 - i]; madeData[madeDataIndex + i] = length2Value[2 - i];
break; break;
case _30000_ModbusAddress._03_2_IsProcessing: case _30000_ModbusAddress._03_2_IsProcessing:
length2Value = GetBytes(this.CollectionIsProcessing[1]); length2Value = GetBytes(this.Current30000ModbusData.CollectionIsProcessing[1]);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
madeData[madeDataIndex + i] = length2Value[2 - i]; madeData[madeDataIndex + i] = length2Value[2 - i];
break; break;
case _30000_ModbusAddress._04_2_IsLeak: case _30000_ModbusAddress._04_2_IsLeak:
length2Value = GetBytes(this.CollectionIsLeak[1]); length2Value = GetBytes(this.Current30000ModbusData.CollectionIsLeak[1]);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
madeData[madeDataIndex + i] = length2Value[2 - i]; madeData[madeDataIndex + i] = length2Value[2 - i];
break; break;
case _30000_ModbusAddress._05_3_IsProcessing: case _30000_ModbusAddress._05_3_IsProcessing:
length2Value = GetBytes(this.CollectionIsProcessing[2]); length2Value = GetBytes(this.Current30000ModbusData.CollectionIsProcessing[2]);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
madeData[madeDataIndex + i] = length2Value[2 - i]; madeData[madeDataIndex + i] = length2Value[2 - i];
break; break;
case _30000_ModbusAddress._06_3_IsLeak: case _30000_ModbusAddress._06_3_IsLeak:
length2Value = GetBytes(this.CollectionIsLeak[2]); length2Value = GetBytes(this.Current30000ModbusData.CollectionIsLeak[2]);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
madeData[madeDataIndex + i] = length2Value[2 - i]; madeData[madeDataIndex + i] = length2Value[2 - i];
break; break;
case _30000_ModbusAddress._07_4_IsProcessing: case _30000_ModbusAddress._07_4_IsProcessing:
length2Value = GetBytes(this.CollectionIsProcessing[3]); length2Value = GetBytes(this.Current30000ModbusData.CollectionIsProcessing[3]);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
madeData[madeDataIndex + i] = length2Value[2 - i]; madeData[madeDataIndex + i] = length2Value[2 - i];
break; break;
case _30000_ModbusAddress._08_4_IsLeak: case _30000_ModbusAddress._08_4_IsLeak:
length2Value = GetBytes(this.CollectionIsLeak[3]); length2Value = GetBytes(this.Current30000ModbusData.CollectionIsLeak[3]);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
madeData[madeDataIndex + i] = length2Value[2 - i]; madeData[madeDataIndex + i] = length2Value[2 - i];
break; break;
case _30000_ModbusAddress._09_5_IsProcessing: case _30000_ModbusAddress._09_5_IsProcessing:
length2Value = GetBytes(this.CollectionIsProcessing[4]); length2Value = GetBytes(this.Current30000ModbusData.CollectionIsProcessing[4]);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
madeData[madeDataIndex + i] = length2Value[2 - i]; madeData[madeDataIndex + i] = length2Value[2 - i];
break; break;
case _30000_ModbusAddress._10_5_IsLeak: case _30000_ModbusAddress._10_5_IsLeak:
length2Value = GetBytes(this.CollectionIsLeak[4]); length2Value = GetBytes(this.Current30000ModbusData.CollectionIsLeak[4]);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
madeData[madeDataIndex + i] = length2Value[2 - i]; madeData[madeDataIndex + i] = length2Value[2 - i];
break; break;
case _30000_ModbusAddress._11_6_IsProcessing: case _30000_ModbusAddress._11_6_IsProcessing:
length2Value = GetBytes(this.CollectionIsProcessing[5]); length2Value = GetBytes(this.Current30000ModbusData.CollectionIsProcessing[5]);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
madeData[madeDataIndex + i] = length2Value[2 - i]; madeData[madeDataIndex + i] = length2Value[2 - i];
break; break;
case _30000_ModbusAddress._12_6_IsLeak: case _30000_ModbusAddress._12_6_IsLeak:
length2Value = GetBytes(this.CollectionIsLeak[5]); length2Value = GetBytes(this.Current30000ModbusData.CollectionIsLeak[5]);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
madeData[madeDataIndex + i] = length2Value[2 - i]; madeData[madeDataIndex + i] = length2Value[2 - i];
break; break;
case _30000_ModbusAddress._13_7_IsProcessing: case _30000_ModbusAddress._13_7_IsProcessing:
length2Value = GetBytes(this.CollectionIsProcessing[6]); length2Value = GetBytes(this.Current30000ModbusData.CollectionIsProcessing[6]);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
madeData[madeDataIndex + i] = length2Value[2 - i]; madeData[madeDataIndex + i] = length2Value[2 - i];
break; break;
case _30000_ModbusAddress._14_7_IsLeak: case _30000_ModbusAddress._14_7_IsLeak:
length2Value = GetBytes(this.CollectionIsLeak[6]); length2Value = GetBytes(this.Current30000ModbusData.CollectionIsLeak[6]);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
madeData[madeDataIndex + i] = length2Value[2 - i]; madeData[madeDataIndex + i] = length2Value[2 - i];
break; break;
case _30000_ModbusAddress._15_8_IsProcessing: case _30000_ModbusAddress._15_8_IsProcessing:
length2Value = GetBytes(this.CollectionIsProcessing[7]); length2Value = GetBytes(this.Current30000ModbusData.CollectionIsProcessing[7]);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
madeData[madeDataIndex + i] = length2Value[2 - i]; madeData[madeDataIndex + i] = length2Value[2 - i];
break; break;
case _30000_ModbusAddress._16_8_IsLeak: case _30000_ModbusAddress._16_8_IsLeak:
length2Value = GetBytes(this.CollectionIsLeak[7]); length2Value = GetBytes(this.Current30000ModbusData.CollectionIsLeak[7]);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
madeData[madeDataIndex + i] = length2Value[2 - i]; madeData[madeDataIndex + i] = length2Value[2 - i];
break; break;
case _30000_ModbusAddress._17_9_IsProcessing: case _30000_ModbusAddress._17_9_IsProcessing:
length2Value = GetBytes(this.CollectionIsProcessing[8]); length2Value = GetBytes(this.Current30000ModbusData.CollectionIsProcessing[8]);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
madeData[madeDataIndex + i] = length2Value[2 - i]; madeData[madeDataIndex + i] = length2Value[2 - i];
break; break;
case _30000_ModbusAddress._18_9_IsLeak: case _30000_ModbusAddress._18_9_IsLeak:
length2Value = GetBytes(this.CollectionIsLeak[8]); length2Value = GetBytes(this.Current30000ModbusData.CollectionIsLeak[8]);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
madeData[madeDataIndex + i] = length2Value[2 - i]; madeData[madeDataIndex + i] = length2Value[2 - i];
break; break;
case _30000_ModbusAddress._19_10_IsProcessing: case _30000_ModbusAddress._19_10_IsProcessing:
length2Value = GetBytes(this.CollectionIsProcessing[9]); length2Value = GetBytes(this.Current30000ModbusData.CollectionIsProcessing[9]);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
madeData[madeDataIndex + i] = length2Value[2 - i]; madeData[madeDataIndex + i] = length2Value[2 - i];
break; break;
case _30000_ModbusAddress._20_10_IsLeak: case _30000_ModbusAddress._20_10_IsLeak:
length2Value = GetBytes(this.CollectionIsLeak[9]); length2Value = GetBytes(this.Current30000ModbusData.CollectionIsLeak[9]);
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
madeData[madeDataIndex + i] = length2Value[2 - i]; madeData[madeDataIndex + i] = length2Value[2 - i];
break; break;
@ -2448,45 +2418,39 @@ namespace INT_PT002.Forms
case Define.E_ProcessStatus._0_None: case Define.E_ProcessStatus._0_None:
case Define.E_ProcessStatus._1_Ready: case Define.E_ProcessStatus._1_Ready:
case Define.E_ProcessStatus._2_ProductEntry: case Define.E_ProcessStatus._2_ProductEntry:
this.CollectionIsProcessing[i] = 0; this.Current30000ModbusData.CollectionIsProcessing[i] = 0;
break; break;
case Define.E_ProcessStatus._3_MoveToLeak: case Define.E_ProcessStatus._3_MoveToLeak:
case Define.E_ProcessStatus._4_MoveToCheck: case Define.E_ProcessStatus._4_MoveToCheck:
this.Current30000ModbusData.CollectionIsProcessing[i] = 1;
break;
case Define.E_ProcessStatus._5_ChamberMerge: case Define.E_ProcessStatus._5_ChamberMerge:
case Define.E_ProcessStatus._6_VacuumStart: case Define.E_ProcessStatus._6_VacuumStart:
case Define.E_ProcessStatus._7_VacuumHold: case Define.E_ProcessStatus._7_VacuumHold:
case Define.E_ProcessStatus._8_Judgment: case Define.E_ProcessStatus._8_Judgment:
case Define.E_ProcessStatus._9_VacuumBreak: case Define.E_ProcessStatus._9_VacuumBreak:
case Define.E_ProcessStatus._10_ChamberRelease: this.Current30000ModbusData.CollectionIsProcessing[i] = 2;
this.CollectionIsProcessing[i] = 1;
break; break;
case Define.E_ProcessStatus._10_ChamberRelease:
case Define.E_ProcessStatus._11_MoveToReady: case Define.E_ProcessStatus._11_MoveToReady:
this.CollectionIsProcessing[i] = 2; this.Current30000ModbusData.CollectionIsProcessing[i] = 3;
break; break;
default: default:
break; break;
} }
switch (this.CurrentLeakDatas[i].Judgment) this.Current30000ModbusData.CollectionIsLeak[i] = (short)this.CurrentLeakDatas[i].Judgment;
{
case Define.E_JudgmentStatus.None:
this.CollectionIsLeak[i] = 0;
break;
case Define.E_JudgmentStatus.Ng:
this.CollectionIsLeak[i] = 1;
break;
case Define.E_JudgmentStatus.Pass:
this.CollectionIsLeak[i] = 2;
break;
case Define.E_JudgmentStatus.Error:
this.CollectionIsLeak[i] = 3;
break;
default:
break;
}
} }
this.ChildFormMainDisplay.ChildModbus.UpdateData(this.Current30000ModbusData); this.ChildFormMainDisplay.ChildModbus.UpdateData(this.Current30000ModbusData);
//this.DelegateModbusStatus();
// 로그
if (this.IsCommunicationLogOpen == true)
{
this.smartFileCommunicationLog.StringType.Write(string.Format("Update30000ModbusItem ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, this.Current30000ModbusData.CollectionIsProcessing[0].ToString()));
this.smartFileCommunicationLog.StringType.Write(string.Format("Update30000ModbusItem ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, this.Current30000ModbusData.CollectionIsLeak[0]));
}
} }
/// <summary> /// <summary>
/// Modbus TCP - Write Multiple Register에 대한 Manage 메소드 /// Modbus TCP - Write Multiple Register에 대한 Manage 메소드

View File

@ -1513,9 +1513,9 @@ namespace INT_PT002.Forms
this.CollectionLabelResult[9].Visible = true; this.CollectionLabelResult[9].Visible = true;
} }
} }
public void UpdateDisplayJudgmentTrackingData(LeakData datas) public void UpdateDisplayJudgmentTrackingData(Collection<LeakData1> items)
{ {
this.ParentForm.TrackingInspectionData(datas); this.ParentForm.TrackingInspectionData(items);
} }
public void UpdateDisplayRecipeData(Recipe data) public void UpdateDisplayRecipeData(Recipe data)

View File

@ -897,6 +897,22 @@ namespace INT_PT002.Forms
{ {
this.Child_System_Status.UpdateDisplayProcessStatus(status); this.Child_System_Status.UpdateDisplayProcessStatus(status);
this.Child_System_Status1.UpdateDisplayProcessStatus(status); this.Child_System_Status1.UpdateDisplayProcessStatus(status);
if (status == Define.E_ProcessStatus._2_ProductEntry)
{
this.ParentForm.Current30000ModbusData.Initialization();
for (int i = 0; i < this.ParentForm.SystemConfig.EQUIPMENT_LANE; i++)
{
this.ParentForm.Current30000ModbusData.CollectionIsProcessing[i] = 0;
this.ParentForm.Current30000ModbusData.CollectionIsLeak[i] = 0;
this.ParentForm.CurrentLeakDatas[i].Initialize();
}
}
else if (status == Define.E_ProcessStatus._11_MoveToReady)
this.ParentForm.ChildFormMainDisplay.UpdateDisplayJudgmentTrackingData(this.ParentForm.CurrentLeakDatas);
this.ParentForm.Update30000ModbusItem();
} }
public void UpdateDisplay_Equipment1_ProcessStatusMeasuring1(Define.E_ProcessStatus status, string lane) public void UpdateDisplay_Equipment1_ProcessStatusMeasuring1(Define.E_ProcessStatus status, string lane)
{ {