diff --git a/INT_PT002/Controls/System/ControlMenuSystemInformation.cs b/INT_PT002/Controls/System/ControlMenuSystemInformation.cs
index bedc648..cabbfde 100644
--- a/INT_PT002/Controls/System/ControlMenuSystemInformation.cs
+++ b/INT_PT002/Controls/System/ControlMenuSystemInformation.cs
@@ -354,8 +354,8 @@ namespace INT_PT002.Controls
private void buttonTimeSetting_Click(object sender, EventArgs e)
{
- if (this.ParentForm.ParentForm.smartTimerSystem.IsStart == true)
- this.ParentForm.ParentForm.smartTimerSystem.Stop();
+ if (this.ParentForm.ParentForm.timerSystem.Enabled == true)
+ this.ParentForm.ParentForm.timerSystem.Enabled = false;
this.buttonSave.Visible = true;
}
private void buttonSave_Click(object sender, EventArgs e)
@@ -373,7 +373,7 @@ namespace INT_PT002.Controls
}
this.ParentForm.ParentForm.SetCurrentTime(time);
- this.ParentForm.ParentForm.smartTimerSystem.Start();
+ this.ParentForm.ParentForm.timerSystem.Enabled = true;
this.buttonSave.Visible = false;
}
#endregion
diff --git a/INT_PT002/Forms/FormMain.Designer.cs b/INT_PT002/Forms/FormMain.Designer.cs
index 0a48124..f4dc1f0 100644
--- a/INT_PT002/Forms/FormMain.Designer.cs
+++ b/INT_PT002/Forms/FormMain.Designer.cs
@@ -39,7 +39,7 @@
this.smartModbus = new SmartX.SmartModbus();
this.smartTCPMultiServer = new SmartX.SmartTCPMultiServer(this.components);
this.timerClientTryConnect = new System.Windows.Forms.Timer();
- this.smartTimerSystem = new SmartX.SmartTimer();
+ this.timerSystem = new System.Windows.Forms.Timer();
this.SuspendLayout();
//
// smartForm1
@@ -118,14 +118,10 @@
this.timerClientTryConnect.Interval = 2000;
this.timerClientTryConnect.Tick += new System.EventHandler(this.timerClientTryConnect_Tick);
//
- // smartTimerSystem
+ // timerSystem
//
- this.smartTimerSystem.CounterMode = SmartX.SmartTimer.CounterModes.Up_Counter;
- this.smartTimerSystem.Interval = 1000;
- this.smartTimerSystem.IntervalSeries = null;
- this.smartTimerSystem.TimeCount = ((long)(1000000));
- this.smartTimerSystem.TimeFormStringSeparator = ":";
- this.smartTimerSystem.Tick += new System.EventHandler(this.smartTimerSystem_Tick);
+ this.timerSystem.Interval = 1000;
+ this.timerSystem.Tick += new System.EventHandler(this.timerSystem_Tick);
//
// FormMain
//
@@ -152,7 +148,7 @@
private System.Windows.Forms.Timer timerClientTryConnect;
public SmartX.SmartConfigs smartConfigs;
public SmartX.SmartTCPMultiServer smartTCPMultiServer;
- public SmartX.SmartTimer smartTimerSystem;
+ public System.Windows.Forms.Timer timerSystem;
}
}
\ No newline at end of file
diff --git a/INT_PT002/Forms/FormMain.cs b/INT_PT002/Forms/FormMain.cs
index 2e8e375..6134cee 100644
--- a/INT_PT002/Forms/FormMain.cs
+++ b/INT_PT002/Forms/FormMain.cs
@@ -917,8 +917,8 @@ namespace INT_PT002.Forms
#region Test 용 통신 로그
fullPath = this.PathDataBackupFolder + "Communicationlog.txt";
this.smartFileCommunicationLog.FilePathName = fullPath;
- this.smartFileCommunicationLog.Open();
- this.IsCommunicationLogOpen = true;
+ //this.smartFileCommunicationLog.Open();
+ //this.IsCommunicationLogOpen = true;
#endregion
}
public void CloseSmartUartLink()
@@ -4133,7 +4133,7 @@ namespace INT_PT002.Forms
this.timerUserList.Enabled = true;
// System Timer
- this.smartTimerSystem.Start();
+ this.timerSystem.Enabled = true;
this.ModbusOpen();
}
@@ -4309,7 +4309,7 @@ namespace INT_PT002.Forms
this.DelegateTimerTryConnect(false);
this.EthernetClientConnect();
}
- private void smartTimerSystem_Tick(object sender, EventArgs e)
+ private void timerSystem_Tick(object sender, EventArgs e)
{
DateTime time = DateTime.Now;
diff --git a/INT_PT002/Forms/FormMain.resx b/INT_PT002/Forms/FormMain.resx
index 16789d4..dd7e0e9 100644
--- a/INT_PT002/Forms/FormMain.resx
+++ b/INT_PT002/Forms/FormMain.resx
@@ -233,7 +233,7 @@
1047, 17
-
+
17, 56