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

- Disconnect Detection기능 On/Off 추가

master V2.1.3
DESKTOP-999R8N3\CJY 2023-03-05 23:12:20 +09:00
parent c5eb23c4b1
commit e7c63b8a07
8 changed files with 75 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
ITC81DB_0H/Controls/CenterConfiguration/ControlCenterConfiEthernet.Designer.cs generated
View File

@ -30,6 +30,7 @@
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControlCenterConfiEthernet));
this.smartGroupBox1 = new SmartX.SmartGroupBox();
this.buttonDisconnectDetection = new SmartX.SmartButton();
this.buttonAddon = new SmartX.SmartButton();
this.buttonLocalIP = new SmartX.SmartButton();
this.labelReceive = new SmartX.SmartLabel();
@ -57,7 +58,6 @@
this.buttonStop = new SmartX.SmartButton();
this.buttonStart = new SmartX.SmartButton();
this.timerServer = new System.Windows.Forms.Timer();
this.buttonPingTimer = new SmartX.SmartButton();
this.smartGroupBox1.SuspendLayout();
this.SuspendLayout();
//
@ -65,7 +65,7 @@
//
this.smartGroupBox1.BackPictureBox = null;
this.smartGroupBox1.BackPictureBox1 = null;
this.smartGroupBox1.Controls.Add(this.buttonPingTimer);
this.smartGroupBox1.Controls.Add(this.buttonDisconnectDetection);
this.smartGroupBox1.Controls.Add(this.buttonAddon);
this.smartGroupBox1.Controls.Add(this.buttonLocalIP);
this.smartGroupBox1.Controls.Add(this.labelReceive);
@ -106,6 +106,39 @@
this.smartGroupBox1.Text = "smartGroupBox1";
this.smartGroupBox1.TextColor = System.Drawing.Color.Black;
//
// buttonDisconnectDetection
//
this.buttonDisconnectDetection.BackPictureBox = null;
this.buttonDisconnectDetection.BackPictureBox1 = null;
this.buttonDisconnectDetection.BackPictureBox2 = null;
this.buttonDisconnectDetection.ButtonColor = System.Drawing.Color.Gray;
this.buttonDisconnectDetection.ButtonImageAutoSize = true;
this.buttonDisconnectDetection.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonDisconnectDetection.DisableImage = null;
this.buttonDisconnectDetection.DownImage = null;
this.buttonDisconnectDetection.GroupID = 0;
this.buttonDisconnectDetection.InitVisible = true;
this.buttonDisconnectDetection.Location = new System.Drawing.Point(400, 298);
this.buttonDisconnectDetection.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonDisconnectDetection.Name = "buttonDisconnectDetection";
this.buttonDisconnectDetection.NestedClickEventPrevent = false;
this.buttonDisconnectDetection.OutlinePixel = 1;
this.buttonDisconnectDetection.RepeatInterval = 200;
this.buttonDisconnectDetection.RepeatIntervalAccelerate = null;
this.buttonDisconnectDetection.SafeInterval = 200;
this.buttonDisconnectDetection.Size = new System.Drawing.Size(189, 29);
this.buttonDisconnectDetection.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
this.buttonDisconnectDetection.TabIndex = 185;
this.buttonDisconnectDetection.Text = "Disconnect Detection ON";
this.buttonDisconnectDetection.TextColor = System.Drawing.Color.Black;
this.buttonDisconnectDetection.TextDownColor = System.Drawing.Color.White;
this.buttonDisconnectDetection.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
this.buttonDisconnectDetection.TextLocation = new System.Drawing.Point(0, 0);
this.buttonDisconnectDetection.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonDisconnectDetection.UpImage = null;
this.buttonDisconnectDetection.Visible = false;
this.buttonDisconnectDetection.Click += new System.EventHandler(this.buttonDisconnectDetection_Click);
//
// buttonAddon
//
this.buttonAddon.BackPictureBox = null;
@ -710,39 +743,6 @@
this.timerServer.Interval = 1000;
this.timerServer.Tick += new System.EventHandler(this.timerServer_Tick);
//
// buttonPingTimer
//
this.buttonPingTimer.BackPictureBox = null;
this.buttonPingTimer.BackPictureBox1 = null;
this.buttonPingTimer.BackPictureBox2 = null;
this.buttonPingTimer.ButtonColor = System.Drawing.Color.Gray;
this.buttonPingTimer.ButtonImageAutoSize = true;
this.buttonPingTimer.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonPingTimer.DisableImage = null;
this.buttonPingTimer.DownImage = null;
this.buttonPingTimer.GroupID = 0;
this.buttonPingTimer.InitVisible = true;
this.buttonPingTimer.Location = new System.Drawing.Point(499, 284);
this.buttonPingTimer.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonPingTimer.Name = "buttonPingTimer";
this.buttonPingTimer.NestedClickEventPrevent = false;
this.buttonPingTimer.OutlinePixel = 1;
this.buttonPingTimer.RepeatInterval = 200;
this.buttonPingTimer.RepeatIntervalAccelerate = null;
this.buttonPingTimer.SafeInterval = 200;
this.buttonPingTimer.Size = new System.Drawing.Size(91, 43);
this.buttonPingTimer.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
this.buttonPingTimer.TabIndex = 185;
this.buttonPingTimer.Text = "Ping Open";
this.buttonPingTimer.TextColor = System.Drawing.Color.Black;
this.buttonPingTimer.TextDownColor = System.Drawing.Color.White;
this.buttonPingTimer.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
this.buttonPingTimer.TextLocation = new System.Drawing.Point(0, 0);
this.buttonPingTimer.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonPingTimer.UpImage = null;
this.buttonPingTimer.Visible = false;
this.buttonPingTimer.Click += new System.EventHandler(this.buttonPingTimer_Click);
//
// ControlCenterConfiEthernet
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@ -785,6 +785,6 @@
private SmartX.SmartLabel labelFormat;
private SmartX.SmartButton buttonLocalIP;
private SmartX.SmartButton buttonAddon;
private SmartX.SmartButton buttonPingTimer;
private SmartX.SmartButton buttonDisconnectDetection;
}
}

29
ITC81DB_0H/Controls/CenterConfiguration/ControlCenterConfiEthernet.cs
View File

@ -397,11 +397,11 @@ namespace ITC81DB_0H.Controls
{
if (bValue == true)
{
this.buttonPingTimer.Visible = true;
this.buttonDisconnectDetection.Visible = true;
}
else
{
this.buttonPingTimer.Visible = false;
this.buttonDisconnectDetection.Visible = false;
}
}
@ -535,6 +535,17 @@ namespace ITC81DB_0H.Controls
}
this.labelLocalPort.Text = this.ParentForm.ParentForm.SystemConfig2.EthernetLocalPort.ToString();
if (this.ParentForm.ParentForm.SystemConfig2.IsDisconnectDetection == true)
{
this.buttonDisconnectDetection.Text = "Disconnect Detection OFF";
this.buttonDisconnectDetection.ButtonDown();
}
else
{
this.buttonDisconnectDetection.Text = "Disconnect Detection ON";
this.buttonDisconnectDetection.ButtonUp();
}
this.ButtonAddOnDisplay();
this.buttonSave.Enabled = false;
}
@ -1262,18 +1273,20 @@ namespace ITC81DB_0H.Controls
this.ControlEthernetLocalIP.DisplayRefresh();
}
private void buttonPingTimer_Click(object sender, EventArgs e)
private void buttonDisconnectDetection_Click(object sender, EventArgs e)
{
if (this.buttonPingTimer.ButtonStatus == SmartButton.BUTSTATUS.DOWN)
if (this.buttonDisconnectDetection.ButtonStatus == SmartButton.BUTSTATUS.DOWN)
{
this.ParentForm.ParentForm.SystemConfig2.IsEthernetPingTimer = true;
this.buttonPingTimer.Text = "Ping Close";
this.ParentForm.ParentForm.SystemConfig2.IsDisconnectDetection = true;
this.buttonDisconnectDetection.Text = "Disconnect Detection OFF";
}
else
{
this.ParentForm.ParentForm.SystemConfig2.IsEthernetPingTimer = false;
this.buttonPingTimer.Text = "Ping Open";
this.ParentForm.ParentForm.SystemConfig2.IsDisconnectDetection = false;
this.buttonDisconnectDetection.Text = "Disconnect Detection ON";
}
this.ParentForm.ParentForm.SaveSystemConfigurationFile2(this.ParentForm.ParentForm.SystemConfig2);
}
private void comboBoxEthernetMode_SelectedIndexChanged(object sender, EventArgs e)

2
ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem.cs
View File

@ -66,7 +66,7 @@ namespace ITC81DB_0H.Controls
private void DefaultSetting()
{
this.labelSerialNo.Text = this.ParentForm.ParentForm.SystemConfig1.SerialNumber;
this.labelDisplayVer.Text = "2.1.2";
this.labelDisplayVer.Text = "2.1.3";
}
public void UpdateMainBoardVersionDisplay(string version)

19
ITC81DB_0H/DataStore.cs
View File

@ -2291,8 +2291,7 @@ namespace ITC81DB_0H
private int m_BLDCTotalMotorNum;
private bool m_IsPingTimerUsing;
private bool m_IsEthernetPingTimer;
private bool m_IsDisconnectDetection;
private int m_HitachiRoomNumberEthernet;
private int m_MarkoprintLineNumberEthernet;
@ -2532,15 +2531,10 @@ namespace ITC81DB_0H
set { this.m_FileNameExtension = value; }
}
public bool IsPingTimerUsing
public bool IsDisconnectDetection
{
get { return this.m_IsPingTimerUsing; }
set { this.m_IsPingTimerUsing = value; }
}
public bool IsEthernetPingTimer
{
get { return this.m_IsEthernetPingTimer; }
set { this.m_IsEthernetPingTimer = value; }
get { return this.m_IsDisconnectDetection; }
set { this.m_IsDisconnectDetection = value; }
}
public int BLDCTotalMotorNum
@ -2761,8 +2755,7 @@ namespace ITC81DB_0H
this.IsBypassOnce = true;
this.IsCommunicationOption = false;
this.IsPingTimerUsing = true;
this.IsEthernetPingTimer = true;
this.IsDisconnectDetection = true;
this.ModbusTCPStartAddress = 10;
this.ModbusRTUStartAddressCOM1 = 10;
this.ModbusRTUStartAddressCOM3 = 10;
@ -2784,7 +2777,7 @@ namespace ITC81DB_0H
public bool IsAlarm2BuzzerOn;
public bool IsAlarm2ExternalOutput;
public bool IsPingTimerUsing;
public bool IsDisconnectDetection;
public bool IsCommunicationOption;
public bool IsBypassOnce;
public bool IsBypassDirectionPass;

12
ITC81DB_0H/Forms/FormMain.cs
View File

@ -7805,7 +7805,7 @@ namespace ITC81DB_0H.Forms
}
public void TimerPingEnabled(int interval, bool bValue)
{
if (this.SystemConfig2.IsPingTimerUsing == false)
if (this.SystemConfig2.IsDisconnectDetection == false)
return;
if (bValue == true)
@ -7828,7 +7828,7 @@ namespace ITC81DB_0H.Forms
}
public void TimerPingDisabled()
{
if (this.SystemConfig2.IsPingTimerUsing == false)
if (this.SystemConfig2.IsDisconnectDetection == false)
return;
if (this.IsTimerPingEnableTrue == true)
@ -7839,7 +7839,7 @@ namespace ITC81DB_0H.Forms
}
public void TimerWaitResponseEnabled(bool bValue)
{
if (this.SystemConfig2.IsPingTimerUsing == false)
if (this.SystemConfig2.IsDisconnectDetection == false)
return;
if (bValue == true)
@ -8658,7 +8658,7 @@ namespace ITC81DB_0H.Forms
structItem.IsAlarm2BuzzerOn = this.SystemConfig2.IsCountingOutput2BuzzerOn;
structItem.IsAlarm2ExternalOutput = this.SystemConfig2.IsCountingOutput2ExternalOutput;
structItem.IsPingTimerUsing = this.SystemConfig2.IsPingTimerUsing;
structItem.IsDisconnectDetection = this.SystemConfig2.IsDisconnectDetection;
structItem.IsCommunicationOption = this.SystemConfig2.IsCommunicationOption;
structItem.IsBypassOnce = this.SystemConfig2.IsBypassOnce;
structItem.IsBypassDirectionPass = this.SystemConfig2.IsBypassDirectionPass;
@ -8763,7 +8763,7 @@ namespace ITC81DB_0H.Forms
structItem.IsAlarm2BuzzerOn = item.IsCountingOutput2BuzzerOn;
structItem.IsAlarm2ExternalOutput = item.IsCountingOutput2ExternalOutput;
structItem.IsPingTimerUsing = item.IsPingTimerUsing;
structItem.IsDisconnectDetection = item.IsDisconnectDetection;
structItem.IsCommunicationOption = item.IsCommunicationOption;
structItem.IsBypassOnce = item.IsBypassOnce;
structItem.IsBypassDirectionPass = item.IsBypassDirectionPass;
@ -8904,7 +8904,7 @@ namespace ITC81DB_0H.Forms
this.SystemConfig2.Barcode = structItem.Barcode;
this.SystemConfig2.FileNameExtension = structItem.FileNameExtension;
this.SystemConfig2.IsPingTimerUsing = structItem.IsPingTimerUsing;
this.SystemConfig2.IsDisconnectDetection = structItem.IsDisconnectDetection;
this.SystemConfig2.EthernetPort = structItem.EthernetPort;
this.SystemConfig2.EthernetCommMode = structItem.EthernetCommMode;

5
ITC81DB_0H/Version.txt
View File

@ -12,6 +12,11 @@
기본형 컨베어 고정밀센서 계량기
*/
@ Ver 2.1.3 by CJY
- 2023.03.04
- Ver 2.1.2 Modify
- Disconnect Detection기능 On/Off 추가
@ Ver 2.1.2 by CJY
- 2023.03.03
- Ver 2.1.1 Modify

BIN
ITC81DB_0H/bin/Release/ITC81DB_2H.exe
View File

Binary file not shown.

BIN
ITC81DB_0H/obj/Release/ITC81DB_2H.exe
View File

Binary file not shown.