diff --git a/Form1.Designer.cs b/Form1.Designer.cs index 4f536e7..cb750a4 100644 --- a/Form1.Designer.cs +++ b/Form1.Designer.cs @@ -69,7 +69,7 @@ private void InitializeComponent() this.autoScroll = new System.Windows.Forms.CheckBox(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.timer1 = new System.Windows.Forms.Timer(this.components); + this.timerReadSerial = new System.Windows.Forms.Timer(this.components); this.timerReconnect = new System.Windows.Forms.Timer(this.components); this.grpSetting.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -589,11 +589,11 @@ private void InitializeComponent() this.contextMenuStrip2.Name = "contextMenuStrip2"; this.contextMenuStrip2.Size = new System.Drawing.Size(61, 4); // - // timer1 + // timerReadSerial // - this.timer1.Enabled = true; - this.timer1.Interval = 20; - this.timer1.Tick += new System.EventHandler(this.timer1_Tick); + this.timerReadSerial.Enabled = true; + this.timerReadSerial.Interval = 20; + this.timerReadSerial.Tick += new System.EventHandler(this.timerReadSerial_Tick); // // timerReconnect // @@ -656,7 +656,7 @@ private void InitializeComponent() private System.Windows.Forms.ContextMenuStrip contextMenuStrip2; private System.Windows.Forms.CheckBox checkEnter; private System.Windows.Forms.CheckBox reconnect; - private System.Windows.Forms.Timer timer1; + private System.Windows.Forms.Timer timerReadSerial; private System.Windows.Forms.Button reload_COM; private System.Windows.Forms.ComboBox cmbCRLF; private System.Windows.Forms.Button btnSaveRcv; diff --git a/Form1.cs b/Form1.cs index 116a404..50199c9 100644 --- a/Form1.cs +++ b/Form1.cs @@ -258,8 +258,8 @@ private void RcvDataToTextBox(string data) } bool last_is_newline=false; - bool first_timestamp = false; - private void timer1_Tick(object sender, EventArgs e) + bool first_timestamp = true; + private void timerReadSerial_Tick(object sender, EventArgs e) { //https://atmarkit.itmedia.co.jp/ait/articles/0511/11/news117.html if (serialPort1.IsOpen == false) @@ -275,7 +275,10 @@ private void timer1_Tick(object sender, EventArgs e) if (checkBIN.Checked) { - new_text.Append(timestamp); + if (check_timestamp.Checked) + { + new_text.Append(timestamp); + } while (serialPort1.BytesToRead>0) { diff --git a/Form1.resx b/Form1.resx index f406b44..07b8aec 100644 --- a/Form1.resx +++ b/Form1.resx @@ -118,19 +118,19 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 17, 17 + 9, 8 - 204, 17 + 102, 8 - 483, 17 + 242, 8 - + 759, 15 - 1043, 16 + 522, 8 130 diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index e291d13..50065a4 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます // 既定値にすることができます: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("6.0.0.0")] -[assembly: AssemblyFileVersion("6.0.0.0")] +[assembly: AssemblyVersion("7.0.0.0")] +[assembly: AssemblyFileVersion("7.0.0.0")]