diff --git a/.gitignore b/.gitignore index 0575da0..7142250 100644 --- a/.gitignore +++ b/.gitignore @@ -365,5 +365,6 @@ FodyWeavers.xsd *.drawio secret.txt SocialPreview.png +version.txt SetupSerialMonitorEssential/ diff --git a/App.config b/App.config index 56efbc7..60667ea 100644 --- a/App.config +++ b/App.config @@ -1,6 +1,63 @@  + + +
+ + + + + + 5 + + + 0 + + + True + + + False + + + True + + + True + + + 0 + + + False + + + False + + + 0 + + + 1 + + + 0 + + + False + + + True + + + False + + + 0 + + + \ No newline at end of file diff --git a/Form1.Designer.cs b/Form1.Designer.cs index 63843e3..d6021f1 100644 --- a/Form1.Designer.cs +++ b/Form1.Designer.cs @@ -46,11 +46,13 @@ private void InitializeComponent() this.connectButton = new System.Windows.Forms.Button(); this.rcvTextBox = new System.Windows.Forms.RichTextBox(); this.grpSend = new System.Windows.Forms.GroupBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.sndTextBox = new System.Windows.Forms.TextBox(); this.cmbCRLF = new System.Windows.Forms.ComboBox(); this.checkEnter = new System.Windows.Forms.CheckBox(); this.btnSend = new System.Windows.Forms.Button(); - this.sndTextBox = new System.Windows.Forms.TextBox(); this.grpRecv = new System.Windows.Forms.GroupBox(); + this.panel1 = new System.Windows.Forms.Panel(); this.rcvTextBoxScroll = new System.Windows.Forms.TextBox(); this.checkWrap = new System.Windows.Forms.CheckBox(); this.btnCopy = new System.Windows.Forms.Button(); @@ -68,7 +70,9 @@ private void InitializeComponent() this.grpSetting.SuspendLayout(); this.groupBox1.SuspendLayout(); this.grpSend.SuspendLayout(); + this.panel2.SuspendLayout(); this.grpRecv.SuspendLayout(); + this.panel1.SuspendLayout(); this.SuspendLayout(); // // serialPort1 @@ -267,13 +271,11 @@ private void InitializeComponent() // // rcvTextBox // - this.rcvTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.rcvTextBox.Location = new System.Drawing.Point(9, 42); + this.rcvTextBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.rcvTextBox.Location = new System.Drawing.Point(0, 0); this.rcvTextBox.Name = "rcvTextBox"; this.rcvTextBox.ReadOnly = true; - this.rcvTextBox.Size = new System.Drawing.Size(1064, 461); + this.rcvTextBox.Size = new System.Drawing.Size(1067, 461); this.rcvTextBox.TabIndex = 11; this.rcvTextBox.Text = ""; this.rcvTextBox.WordWrap = false; @@ -282,10 +284,10 @@ private void InitializeComponent() // this.grpSend.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.grpSend.Controls.Add(this.panel2); this.grpSend.Controls.Add(this.cmbCRLF); this.grpSend.Controls.Add(this.checkEnter); this.grpSend.Controls.Add(this.btnSend); - this.grpSend.Controls.Add(this.sndTextBox); this.grpSend.Location = new System.Drawing.Point(28, 249); this.grpSend.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); this.grpSend.Name = "grpSend"; @@ -295,6 +297,28 @@ private void InitializeComponent() this.grpSend.TabStop = false; this.grpSend.Text = "Send"; // + // panel2 + // + this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.panel2.Controls.Add(this.sndTextBox); + this.panel2.Location = new System.Drawing.Point(9, 42); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(814, 157); + this.panel2.TabIndex = 8; + // + // sndTextBox + // + this.sndTextBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.sndTextBox.Location = new System.Drawing.Point(0, 0); + this.sndTextBox.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); + this.sndTextBox.Multiline = true; + this.sndTextBox.Name = "sndTextBox"; + this.sndTextBox.Size = new System.Drawing.Size(814, 157); + this.sndTextBox.TabIndex = 0; + this.sndTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sndTextBox_KeyDown); + // // cmbCRLF // this.cmbCRLF.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -338,25 +362,12 @@ private void InitializeComponent() this.btnSend.UseVisualStyleBackColor = true; this.btnSend.Click += new System.EventHandler(this.btnSend_Click); // - // sndTextBox - // - this.sndTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.sndTextBox.Location = new System.Drawing.Point(12, 47); - this.sndTextBox.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); - this.sndTextBox.Multiline = true; - this.sndTextBox.Name = "sndTextBox"; - this.sndTextBox.Size = new System.Drawing.Size(808, 150); - this.sndTextBox.TabIndex = 0; - this.sndTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sndTextBox_KeyDown); - // // grpRecv // this.grpRecv.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.grpRecv.Controls.Add(this.rcvTextBoxScroll); - this.grpRecv.Controls.Add(this.rcvTextBox); + this.grpRecv.Controls.Add(this.panel1); this.grpRecv.Controls.Add(this.checkWrap); this.grpRecv.Controls.Add(this.btnCopy); this.grpRecv.Controls.Add(this.checkCRLF); @@ -375,17 +386,27 @@ private void InitializeComponent() this.grpRecv.TabStop = false; this.grpRecv.Text = "Recieve"; // - // rcvTextBoxScroll + // panel1 // - this.rcvTextBoxScroll.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.rcvTextBoxScroll.Location = new System.Drawing.Point(9, 42); + this.panel1.Controls.Add(this.rcvTextBox); + this.panel1.Controls.Add(this.rcvTextBoxScroll); + this.panel1.Location = new System.Drawing.Point(9, 42); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(1067, 461); + this.panel1.TabIndex = 15; + // + // rcvTextBoxScroll + // + this.rcvTextBoxScroll.Dock = System.Windows.Forms.DockStyle.Fill; + this.rcvTextBoxScroll.Location = new System.Drawing.Point(0, 0); this.rcvTextBoxScroll.Multiline = true; this.rcvTextBoxScroll.Name = "rcvTextBoxScroll"; this.rcvTextBoxScroll.ReadOnly = true; this.rcvTextBoxScroll.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.rcvTextBoxScroll.Size = new System.Drawing.Size(1064, 461); + this.rcvTextBoxScroll.Size = new System.Drawing.Size(1067, 461); this.rcvTextBoxScroll.TabIndex = 12; this.rcvTextBoxScroll.WordWrap = false; // @@ -542,6 +563,7 @@ private void InitializeComponent() this.Name = "Form1"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Serial Monitor Essential"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing); this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Form1_FormClosed); this.Load += new System.EventHandler(this.Form1_Load); this.ResizeBegin += new System.EventHandler(this.Form1_ResizeBegin); @@ -552,8 +574,12 @@ private void InitializeComponent() this.groupBox1.PerformLayout(); this.grpSend.ResumeLayout(false); this.grpSend.PerformLayout(); + this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); this.grpRecv.ResumeLayout(false); this.grpRecv.PerformLayout(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); this.ResumeLayout(false); } @@ -595,6 +621,8 @@ private void InitializeComponent() private System.Windows.Forms.TextBox rcvTextBoxScroll; private System.Windows.Forms.Button btnCopy; private System.Windows.Forms.CheckBox checkWrap; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel panel1; } } diff --git a/Form1.cs b/Form1.cs index 007237b..3b34d14 100644 --- a/Form1.cs +++ b/Form1.cs @@ -37,7 +37,30 @@ private void Form1_Load(object sender, EventArgs e) setEnabled(true); } - + + private void Form1_FormClosing(object sender, FormClosingEventArgs e) + { + //https://dobon.net/vb/dotnet/programing/mysettings.html + Properties.Settings.Default.setting_BaudRate= cmbBaudRate.SelectedIndex; + Properties.Settings.Default.setting_Handshake = cmbHandshake.SelectedIndex; + Properties.Settings.Default.setting_Enter = checkEnter.Checked; + Properties.Settings.Default.setting_reconnect = reconnect.Checked; + Properties.Settings.Default.setting_timestamp = check_timestamp.Checked; + Properties.Settings.Default.setting_autoScroll = autoScroll.Checked; + Properties.Settings.Default.setting_timestamp_string = cmbTimestamp.SelectedIndex; + Properties.Settings.Default.setting_NULL=checkNULL.Checked; + Properties.Settings.Default.setting_CRLF = checkCRLF.Checked; + Properties.Settings.Default.setting_StopBits=cmbStopBits.SelectedIndex; + Properties.Settings.Default.setting_DataBits=cmbDataBits.SelectedIndex; + Properties.Settings.Default.setting_Parity=cmbParity.SelectedIndex; + Properties.Settings.Default.setting_RtsEnable=checkRtsEnable.Checked; + Properties.Settings.Default.setting_DtrEnable=checkDtrEnable.Checked; + Properties.Settings.Default.setting_Wrap=checkWrap.Checked; + Properties.Settings.Default.setting_sendCRLF = cmbCRLF.SelectedIndex; + + Properties.Settings.Default.Save(); + + } private void Form1_FormClosed(object sender, FormClosedEventArgs e) { if (serialPort1.IsOpen) @@ -45,7 +68,7 @@ private void Form1_FormClosed(object sender, FormClosedEventArgs e) serialPort1.Close(); } } - + private void connectButton_Click(object sender, EventArgs e) { if (serialPort1.IsOpen) @@ -357,21 +380,44 @@ private void timerReconnect_Tick(object sender, EventArgs e) } } - private void initSettings() { - checkDtrEnable.Checked = true; - checkRtsEnable.Checked = false; - + private void initSettings() { //https://learn.microsoft.com/ja-jp/dotnet/api/system.io.ports.serialport?view=dotnet-plat-ext-7.0 - cmbDataBits.SelectedIndex= 1;//8bit - cmbParity.SelectedIndex = 0;//None - cmbStopBits.SelectedIndex = 0;//one - cmbHandshake.SelectedIndex = 0;//none + cmbBaudRate.SelectedIndex = Properties.Settings.Default.setting_BaudRate; + cmbDataBits.SelectedIndex = Properties.Settings.Default.setting_DataBits; + cmbParity.SelectedIndex = Properties.Settings.Default.setting_Parity; + checkRtsEnable.Checked = Properties.Settings.Default.setting_RtsEnable; + checkDtrEnable.Checked = Properties.Settings.Default.setting_DtrEnable; + cmbStopBits.SelectedIndex = Properties.Settings.Default.setting_StopBits; + cmbHandshake.SelectedIndex = Properties.Settings.Default.setting_Handshake; + + reconnect.Checked = Properties.Settings.Default.setting_reconnect; + + cmbCRLF.SelectedIndex = Properties.Settings.Default.setting_sendCRLF; + checkEnter.Checked= Properties.Settings.Default.setting_Enter; + + checkWrap.Checked = Properties.Settings.Default.setting_Wrap; + checkCRLF.Checked = Properties.Settings.Default.setting_CRLF; + checkNULL.Checked = Properties.Settings.Default.setting_NULL; + autoScroll.Checked = Properties.Settings.Default.setting_autoScroll; + check_timestamp.Checked = Properties.Settings.Default.setting_timestamp; + cmbTimestamp.SelectedIndex = Properties.Settings.Default.setting_timestamp_string; - cmbTimestamp.SelectedIndex = 0; - cmbBaudRate.SelectedIndex = 5;//115200 - cmbCRLF.SelectedIndex = 0;//no CRLF + serialPort1.RtsEnable = checkRtsEnable.Checked; + serialPort1.DtrEnable= checkDtrEnable.Checked; sndTextBox.AcceptsReturn = !checkEnter.Checked; + + + rcvTextBox.WordWrap = checkWrap.Checked; + rcvTextBoxScroll.WordWrap = checkWrap.Checked; + if (autoScroll.Checked) + { + rcvTextBoxScroll.BringToFront(); + } + else + { + rcvTextBox.BringToFront(); + } } private void checkDtrEnable_CheckedChanged(object sender, EventArgs e) @@ -519,6 +565,7 @@ private void Form1_ResizeEnd(object sender, EventArgs e) rcvTextBox.AppendText(resizing_buf.ToString()); rcvTextBoxScroll.AppendText(resizing_buf.ToString()); } + } //https://ehbtj.com/info/think-about-improving-performance-of-serial-monitor/ diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 55ecfef..b349167 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます // 既定値にすることができます: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("2.0.0.0")] +[assembly: AssemblyFileVersion("2.0.0.0")] diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs index 18cca79..9ad7bcc 100644 --- a/Properties/Settings.Designer.cs +++ b/Properties/Settings.Designer.cs @@ -1,30 +1,218 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// このコードはツールによって生成されました。 +// ランタイム バージョン:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 +// コードが再生成されるときに損失したりします。 // //------------------------------------------------------------------------------ -namespace SerialMonitorEssential.Properties -{ - - +namespace SerialMonitorEssential.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("5")] + public int setting_BaudRate { + get { + return ((int)(this["setting_BaudRate"])); + } + set { + this["setting_BaudRate"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public int setting_Handshake { + get { + return ((int)(this["setting_Handshake"])); + } + set { + this["setting_Handshake"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool setting_Enter { + get { + return ((bool)(this["setting_Enter"])); + } + set { + this["setting_Enter"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool setting_reconnect { + get { + return ((bool)(this["setting_reconnect"])); + } + set { + this["setting_reconnect"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool setting_timestamp { + get { + return ((bool)(this["setting_timestamp"])); + } + set { + this["setting_timestamp"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool setting_autoScroll { + get { + return ((bool)(this["setting_autoScroll"])); + } + set { + this["setting_autoScroll"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public int setting_timestamp_string { + get { + return ((int)(this["setting_timestamp_string"])); + } + set { + this["setting_timestamp_string"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool setting_NULL { + get { + return ((bool)(this["setting_NULL"])); + } + set { + this["setting_NULL"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool setting_CRLF { + get { + return ((bool)(this["setting_CRLF"])); + } + set { + this["setting_CRLF"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public int setting_StopBits { + get { + return ((int)(this["setting_StopBits"])); + } + set { + this["setting_StopBits"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("1")] + public int setting_DataBits { + get { + return ((int)(this["setting_DataBits"])); + } + set { + this["setting_DataBits"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public int setting_Parity { + get { + return ((int)(this["setting_Parity"])); + } + set { + this["setting_Parity"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool setting_RtsEnable { + get { + return ((bool)(this["setting_RtsEnable"])); + } + set { + this["setting_RtsEnable"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool setting_DtrEnable { + get { + return ((bool)(this["setting_DtrEnable"])); + } + set { + this["setting_DtrEnable"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool setting_Wrap { + get { + return ((bool)(this["setting_Wrap"])); + } + set { + this["setting_Wrap"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public int setting_sendCRLF { + get { + return ((int)(this["setting_sendCRLF"])); + } + set { + this["setting_sendCRLF"] = value; + } + } } } diff --git a/Properties/Settings.settings b/Properties/Settings.settings index 3964565..ed46069 100644 --- a/Properties/Settings.settings +++ b/Properties/Settings.settings @@ -1,7 +1,54 @@  - - - - - - + + + + + 5 + + + 0 + + + True + + + False + + + True + + + True + + + 0 + + + False + + + False + + + 0 + + + 1 + + + 0 + + + False + + + True + + + False + + + 0 + + + \ No newline at end of file diff --git a/SerialMonitorEssential.csproj b/SerialMonitorEssential.csproj index bb2765c..717407e 100644 --- a/SerialMonitorEssential.csproj +++ b/SerialMonitorEssential.csproj @@ -12,6 +12,21 @@ 512 true true + false + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + true AnyCPU @@ -80,8 +95,6 @@ True - - SettingsSingleFileGenerator Settings.Designer.cs @@ -98,5 +111,17 @@ + + + False + Microsoft .NET Framework 4.7.2 %28x86 および x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + \ No newline at end of file