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

- 통합 전송 

IsUpdate 통합
   timer 통합
master
DESKTOP-999R8N3\CJY 2023-08-31 16:21:36 +09:00
parent 8b29dc7a9f
commit cc1648e0fb
5 changed files with 298 additions and 1028 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
INT69DC_7C/DataStore.cs
View File

@ -1612,10 +1612,7 @@ namespace INT69DC_7C
private bool m_IsADCError;
private bool m_IsBypassMode;
private bool m_IsUpdate_COM3;
private bool m_IsUpdate_Ethernet;
private bool m_IsUpdate1;
private bool m_IsUpdate_DataBackup;
private bool m_IsUpdate;
private int m_ContinuousNG;
private bool m_IsContinuousNG;
@ -1841,39 +1838,11 @@ namespace INT69DC_7C
/// <summary>
/// 스틱2모드에서 데이터 갱신이 되었으면 true, 안되었으면 false
/// COM3 사용
/// </summary>
public bool IsUpdate_COM3
public bool IsUpdate
{
get { return this.m_IsUpdate_COM3; }
set { this.m_IsUpdate_COM3 = value; }
}
/// <summary>
/// 스틱2모드에서 데이터 갱신이 되었으면 true, 안되었으면 false
/// Ethernet 사용
/// </summary>
public bool IsUpdate_Ethernet
{
get { return this.m_IsUpdate_Ethernet; }
set { this.m_IsUpdate_Ethernet = value; }
}
/// <summary>
/// 스틱2모드에서 데이터 갱신이 되었으면 true, 안되었으면 false
/// Alarm Total Pass Count 에서 사용
/// </summary>
public bool IsUpdate_ATPC
{
get { return this.m_IsUpdate1; }
set { this.m_IsUpdate1 = value; }
}
/// <summary>
/// 스틱2모드에서 데이터 갱신이 되었으면 true, 안되었으면 false
/// Databackup 사용
/// </summary>
public bool IsUpdate_DataBackup
{
get { return this.m_IsUpdate_DataBackup; }
set { this.m_IsUpdate_DataBackup = value; }
get { return this.m_IsUpdate; }
set { this.m_IsUpdate = value; }
}
/// <summary>
@ -1920,10 +1889,7 @@ namespace INT69DC_7C
this.WeightString = "0";
this.IsADCError = false;
this.IsBypassMode = false;
this.IsUpdate_COM3 = false;
this.IsUpdate_Ethernet = false;
this.IsUpdate_ATPC = false;
this.IsUpdate_DataBackup = false;
this.IsUpdate = false;
this.IsContinuousNG = false;
this.ContinuousNG = 0;
this.UpdateCount = 0;
@ -4142,7 +4108,7 @@ namespace INT69DC_7C
for (int i = 0; i < datas.Count; i++)
{
if (datas[i].IsUpdate_ATPC == true)
if (datas[i].IsUpdate == true)
{
if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Pass)
this.CurrentTotalPass++;

31
INT69DC_7C/Forms/FormMain.Designer.cs generated
View File

@ -47,11 +47,8 @@
this.timerTimeoutOPT4_OnlineCheck = new System.Windows.Forms.Timer();
this.smartSerialPortCom3 = new SmartX.SmartSerialPort();
this.smartTCPMultiServer = new SmartX.SmartTCPMultiServer();
this.timerTimeOutCOM3 = new System.Windows.Forms.Timer();
this.timerTimeOutEthernet = new System.Windows.Forms.Timer();
this.timerTimeOutATPC = new System.Windows.Forms.Timer();
this.timerTimeOutTransmission = new System.Windows.Forms.Timer();
this.timerUserList = new System.Windows.Forms.Timer();
this.timerTimeOutDB = new System.Windows.Forms.Timer();
((System.ComponentModel.ISupportInitialize)(this.smartForm)).BeginInit();
this.SuspendLayout();
//
@ -191,31 +188,16 @@
this.smartTCPMultiServer.ReceiveTimeout = 3000;
this.smartTCPMultiServer.OnReceiveHandler += new SmartX.SmartTCPMultiServer.ReceiveHandler(this.smartTCPMultiServer_OnReceiveHandler);
//
// timerTimeOutCOM3
// timerTimeOutTransmission
//
this.timerTimeOutCOM3.Interval = 300;
this.timerTimeOutCOM3.Tick += new System.EventHandler(this.timerTimeOutCOM3_Tick);
//
// timerTimeOutEthernet
//
this.timerTimeOutEthernet.Interval = 300;
this.timerTimeOutEthernet.Tick += new System.EventHandler(this.timerTimeOutEthernet_Tick);
//
// timerTimeOutATPC
//
this.timerTimeOutATPC.Interval = 300;
this.timerTimeOutATPC.Tick += new System.EventHandler(this.timerTimeOutATPC_Tick);
this.timerTimeOutTransmission.Interval = 300;
this.timerTimeOutTransmission.Tick += new System.EventHandler(this.timerTimeOutTransmission_Tick);
//
// timerUserList
//
this.timerUserList.Interval = 1000;
this.timerUserList.Tick += new System.EventHandler(this.timerUserList_Tick);
//
// timerTimeOutDB
//
this.timerTimeOutDB.Interval = 300;
this.timerTimeOutDB.Tick += new System.EventHandler(this.timerTimeOutDB_Tick);
//
// FormMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@ -250,10 +232,7 @@
private System.Windows.Forms.Timer timerTimeoutOPT4_OnlineCheck;
public SmartX.SmartSerialPort smartSerialPortCom3;
public SmartX.SmartTCPMultiServer smartTCPMultiServer;
public System.Windows.Forms.Timer timerTimeOutCOM3;
public System.Windows.Forms.Timer timerTimeOutEthernet;
public System.Windows.Forms.Timer timerTimeOutATPC;
public System.Windows.Forms.Timer timerTimeOutTransmission;
private System.Windows.Forms.Timer timerUserList;
public System.Windows.Forms.Timer timerTimeOutDB;
}
}

1228
INT69DC_7C/Forms/FormMain.cs
View File

File diff suppressed because it is too large Load Diff

11
INT69DC_7C/Forms/FormMain.resx
View File

@ -168,21 +168,12 @@
<metadata name="smartTCPMultiServer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1063, 54</value>
</metadata>
<metadata name="timerTimeOutCOM3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="timerTimeOutTransmission.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>141, 93</value>
</metadata>
<metadata name="timerTimeOutEthernet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>293, 93</value>
</metadata>
<metadata name="timerTimeOutATPC.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1231, 54</value>
</metadata>
<metadata name="timerUserList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 93</value>
</metadata>
<metadata name="timerTimeOutDB.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>469, 93</value>
</metadata>
<metadata name="$this.FormFactorShadowProperty" xml:space="preserve">
<value>WEBPAD</value>
</metadata>

6
INT69DC_7C/Forms/FormMainDisplay.cs
View File

@ -1283,10 +1283,8 @@ namespace INT69DC_7C.Forms
this.timerTimeout.Enabled = false;
this.labelTimeroutCount.Visible = false;
this.ParentForm.timerTimeOutCOM3.Enabled = false;
this.ParentForm.timerTimeOutCOM3.Interval = jItem.JudgmentDelayTime - 100;
this.ParentForm.timerTimeOutEthernet.Enabled = false;
this.ParentForm.timerTimeOutEthernet.Interval = jItem.JudgmentDelayTime - 100;
this.ParentForm.timerTimeOutTransmission.Enabled = false;
this.ParentForm.timerTimeOutTransmission.Interval = jItem.JudgmentDelayTime - 100;
value = pItem.Number.ToString();
if (this.buttonProductNo.Text != value)