From d708e6e01fb61a037168c0c687787b3722ce102a Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 29 Jul 2019 11:21:23 +0200 Subject: [PATCH] Ambiet.Comet : 'Set DTR to 1' property, ver. 2.18.1277 --- TBF/BenchControl/Ambient/Comet/Ambient.cs | 4 + TBF/BenchControl/Ambient/Comet/AmbientCfg.cs | 2 + .../Ambient/Comet/AmbientCfgCtrl.Designer.cs | 360 +++++++++--------- .../Ambient/Comet/AmbientCfgCtrl.cs | 3 + TBF/Properties/AssemblyInfo.cs | 4 +- 5 files changed, 198 insertions(+), 175 deletions(-) diff --git a/TBF/BenchControl/Ambient/Comet/Ambient.cs b/TBF/BenchControl/Ambient/Comet/Ambient.cs index c7d6b7c26..235da0292 100644 --- a/TBF/BenchControl/Ambient/Comet/Ambient.cs +++ b/TBF/BenchControl/Ambient/Comet/Ambient.cs @@ -71,6 +71,10 @@ namespace TBF.BenchControl.Ambient.Comet serialPort = new SerialPort(comPortName, ambientCfg.BaudRate, ambientCfg.Parity, ambientCfg.DataBits, ambientCfg.StopBits); serialPort.Handshake = ambientCfg.Handshake; serialPort.Open(); + if (ambientCfg.SetDtrToOne) + { + serialPort.DtrEnable = true; + } msrmntTimeStamp = 0; msrmntState = MsrmntState.Busy; diff --git a/TBF/BenchControl/Ambient/Comet/AmbientCfg.cs b/TBF/BenchControl/Ambient/Comet/AmbientCfg.cs index 43564b4d5..6102d4439 100644 --- a/TBF/BenchControl/Ambient/Comet/AmbientCfg.cs +++ b/TBF/BenchControl/Ambient/Comet/AmbientCfg.cs @@ -25,6 +25,7 @@ namespace TBF.BenchControl.Ambient.Comet public int DataBits; public StopBits StopBits; public Handshake Handshake; + public bool SetDtrToOne; /// Private parameterless constructor invoked by all other (public) constructors AmbientCfg() @@ -37,6 +38,7 @@ namespace TBF.BenchControl.Ambient.Comet DataBits = 8; StopBits = System.IO.Ports.StopBits.Two; Handshake = System.IO.Ports.Handshake.None; + SetDtrToOne = false; } public AmbientCfg(IComponentFactory factory) diff --git a/TBF/BenchControl/Ambient/Comet/AmbientCfgCtrl.Designer.cs b/TBF/BenchControl/Ambient/Comet/AmbientCfgCtrl.Designer.cs index 9a724f81c..83df0916e 100644 --- a/TBF/BenchControl/Ambient/Comet/AmbientCfgCtrl.Designer.cs +++ b/TBF/BenchControl/Ambient/Comet/AmbientCfgCtrl.Designer.cs @@ -31,179 +31,192 @@ namespace TBF.BenchControl.Ambient.Comet /// private void InitializeComponent() { - this.comPortNrTextBox = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.baudRateLabel = new System.Windows.Forms.Label(); - this.baudRateTextBox = new System.Windows.Forms.TextBox(); - this.partityLabel = new System.Windows.Forms.Label(); - this.dataBitsLabel = new System.Windows.Forms.Label(); - this.dataBitsTextBox = new System.Windows.Forms.TextBox(); - this.stopBitsLabel = new System.Windows.Forms.Label(); - this.handshakeLabel = new System.Windows.Forms.Label(); - this.nameTextBox = new System.Windows.Forms.TextBox(); - this.nameLabel = new System.Windows.Forms.Label(); - this.classNameLabel = new System.Windows.Forms.Label(); - this.parityComboBox = new System.Windows.Forms.ComboBox(); - this.stopBitsComboBox = new System.Windows.Forms.ComboBox(); - this.handshakeComboBox = new System.Windows.Forms.ComboBox(); - this.SuspendLayout(); - // - // comPortNrTextBox - // - this.comPortNrTextBox.Enabled = false; - this.comPortNrTextBox.Location = new System.Drawing.Point(140, 52); - this.comPortNrTextBox.Name = "comPortNrTextBox"; - this.comPortNrTextBox.Size = new System.Drawing.Size(34, 20); - this.comPortNrTextBox.TabIndex = 4; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(29, 55); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(98, 13); - this.label1.TabIndex = 3; - this.label1.Text = "Serial Port Number:"; - // - // baudRateLabel - // - this.baudRateLabel.AutoSize = true; - this.baudRateLabel.Location = new System.Drawing.Point(29, 79); - this.baudRateLabel.Name = "baudRateLabel"; - this.baudRateLabel.Size = new System.Drawing.Size(58, 13); - this.baudRateLabel.TabIndex = 5; - this.baudRateLabel.Text = "Baud Rate"; - // - // baudRateTextBox - // - this.baudRateTextBox.Enabled = false; - this.baudRateTextBox.Location = new System.Drawing.Point(140, 76); - this.baudRateTextBox.Name = "baudRateTextBox"; - this.baudRateTextBox.Size = new System.Drawing.Size(130, 20); - this.baudRateTextBox.TabIndex = 6; - // - // partityLabel - // - this.partityLabel.AutoSize = true; - this.partityLabel.Location = new System.Drawing.Point(29, 103); - this.partityLabel.Name = "partityLabel"; - this.partityLabel.Size = new System.Drawing.Size(33, 13); - this.partityLabel.TabIndex = 7; - this.partityLabel.Text = "Parity"; - // - // dataBitsLabel - // - this.dataBitsLabel.AutoSize = true; - this.dataBitsLabel.Location = new System.Drawing.Point(29, 127); - this.dataBitsLabel.Name = "dataBitsLabel"; - this.dataBitsLabel.Size = new System.Drawing.Size(50, 13); - this.dataBitsLabel.TabIndex = 9; - this.dataBitsLabel.Text = "Data Bits"; - // - // dataBitsTextBox - // - this.dataBitsTextBox.Enabled = false; - this.dataBitsTextBox.Location = new System.Drawing.Point(140, 124); - this.dataBitsTextBox.Name = "dataBitsTextBox"; - this.dataBitsTextBox.Size = new System.Drawing.Size(34, 20); - this.dataBitsTextBox.TabIndex = 10; - // - // stopBitsLabel - // - this.stopBitsLabel.AutoSize = true; - this.stopBitsLabel.Location = new System.Drawing.Point(29, 151); - this.stopBitsLabel.Name = "stopBitsLabel"; - this.stopBitsLabel.Size = new System.Drawing.Size(49, 13); - this.stopBitsLabel.TabIndex = 11; - this.stopBitsLabel.Text = "Stop Bits"; - // - // handshakeLabel - // - this.handshakeLabel.AutoSize = true; - this.handshakeLabel.Location = new System.Drawing.Point(29, 175); - this.handshakeLabel.Name = "handshakeLabel"; - this.handshakeLabel.Size = new System.Drawing.Size(62, 13); - this.handshakeLabel.TabIndex = 13; - this.handshakeLabel.Text = "Handshake"; - // - // nameTextBox - // - this.nameTextBox.Enabled = false; - this.nameTextBox.Location = new System.Drawing.Point(140, 28); - this.nameTextBox.Name = "nameTextBox"; - this.nameTextBox.Size = new System.Drawing.Size(130, 20); - this.nameTextBox.TabIndex = 2; - // - // nameLabel - // - this.nameLabel.AutoSize = true; - this.nameLabel.Location = new System.Drawing.Point(30, 31); - this.nameLabel.Name = "nameLabel"; - this.nameLabel.Size = new System.Drawing.Size(35, 13); - this.nameLabel.TabIndex = 1; - this.nameLabel.Text = "Name"; - // - // classNameLabel - // - this.classNameLabel.AutoSize = true; - this.classNameLabel.Location = new System.Drawing.Point(137, 7); - this.classNameLabel.Name = "classNameLabel"; - this.classNameLabel.Size = new System.Drawing.Size(83, 13); - this.classNameLabel.TabIndex = 0; - this.classNameLabel.Text = "ComonentName"; - // - // parityComboBox - // - this.parityComboBox.Enabled = false; - this.parityComboBox.FormattingEnabled = true; - this.parityComboBox.Location = new System.Drawing.Point(140, 100); - this.parityComboBox.Name = "parityComboBox"; - this.parityComboBox.Size = new System.Drawing.Size(130, 21); - this.parityComboBox.TabIndex = 8; - // - // stopBitsComboBox - // - this.stopBitsComboBox.Enabled = false; - this.stopBitsComboBox.FormattingEnabled = true; - this.stopBitsComboBox.Location = new System.Drawing.Point(140, 148); - this.stopBitsComboBox.Name = "stopBitsComboBox"; - this.stopBitsComboBox.Size = new System.Drawing.Size(130, 21); - this.stopBitsComboBox.TabIndex = 12; - // - // handshakeComboBox - // - this.handshakeComboBox.Enabled = false; - this.handshakeComboBox.FormattingEnabled = true; - this.handshakeComboBox.Location = new System.Drawing.Point(140, 172); - this.handshakeComboBox.Name = "handshakeComboBox"; - this.handshakeComboBox.Size = new System.Drawing.Size(130, 21); - this.handshakeComboBox.TabIndex = 14; - // - // AmbientCfgCtrl - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; - this.Controls.Add(this.handshakeComboBox); - this.Controls.Add(this.stopBitsComboBox); - this.Controls.Add(this.parityComboBox); - this.Controls.Add(this.nameTextBox); - this.Controls.Add(this.nameLabel); - this.Controls.Add(this.classNameLabel); - this.Controls.Add(this.handshakeLabel); - this.Controls.Add(this.stopBitsLabel); - this.Controls.Add(this.dataBitsTextBox); - this.Controls.Add(this.dataBitsLabel); - this.Controls.Add(this.partityLabel); - this.Controls.Add(this.baudRateTextBox); - this.Controls.Add(this.baudRateLabel); - this.Controls.Add(this.comPortNrTextBox); - this.Controls.Add(this.label1); - this.Name = "AmbientCfgCtrl"; - this.Size = new System.Drawing.Size(300, 240); - this.Load += new System.EventHandler(this.AbbientCfgCtrl_Load); - this.ResumeLayout(false); - this.PerformLayout(); + this.comPortNrTextBox = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.baudRateLabel = new System.Windows.Forms.Label(); + this.baudRateTextBox = new System.Windows.Forms.TextBox(); + this.partityLabel = new System.Windows.Forms.Label(); + this.dataBitsLabel = new System.Windows.Forms.Label(); + this.dataBitsTextBox = new System.Windows.Forms.TextBox(); + this.stopBitsLabel = new System.Windows.Forms.Label(); + this.handshakeLabel = new System.Windows.Forms.Label(); + this.nameTextBox = new System.Windows.Forms.TextBox(); + this.nameLabel = new System.Windows.Forms.Label(); + this.classNameLabel = new System.Windows.Forms.Label(); + this.parityComboBox = new System.Windows.Forms.ComboBox(); + this.stopBitsComboBox = new System.Windows.Forms.ComboBox(); + this.handshakeComboBox = new System.Windows.Forms.ComboBox(); + this.setDtrCheckBox = new System.Windows.Forms.CheckBox(); + this.SuspendLayout(); + // + // comPortNrTextBox + // + this.comPortNrTextBox.Enabled = false; + this.comPortNrTextBox.Location = new System.Drawing.Point(140, 52); + this.comPortNrTextBox.Name = "comPortNrTextBox"; + this.comPortNrTextBox.Size = new System.Drawing.Size(34, 20); + this.comPortNrTextBox.TabIndex = 4; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(29, 55); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(98, 13); + this.label1.TabIndex = 3; + this.label1.Text = "Serial Port Number:"; + // + // baudRateLabel + // + this.baudRateLabel.AutoSize = true; + this.baudRateLabel.Location = new System.Drawing.Point(29, 79); + this.baudRateLabel.Name = "baudRateLabel"; + this.baudRateLabel.Size = new System.Drawing.Size(58, 13); + this.baudRateLabel.TabIndex = 5; + this.baudRateLabel.Text = "Baud Rate"; + // + // baudRateTextBox + // + this.baudRateTextBox.Enabled = false; + this.baudRateTextBox.Location = new System.Drawing.Point(140, 76); + this.baudRateTextBox.Name = "baudRateTextBox"; + this.baudRateTextBox.Size = new System.Drawing.Size(130, 20); + this.baudRateTextBox.TabIndex = 6; + // + // partityLabel + // + this.partityLabel.AutoSize = true; + this.partityLabel.Location = new System.Drawing.Point(29, 103); + this.partityLabel.Name = "partityLabel"; + this.partityLabel.Size = new System.Drawing.Size(33, 13); + this.partityLabel.TabIndex = 7; + this.partityLabel.Text = "Parity"; + // + // dataBitsLabel + // + this.dataBitsLabel.AutoSize = true; + this.dataBitsLabel.Location = new System.Drawing.Point(29, 127); + this.dataBitsLabel.Name = "dataBitsLabel"; + this.dataBitsLabel.Size = new System.Drawing.Size(50, 13); + this.dataBitsLabel.TabIndex = 9; + this.dataBitsLabel.Text = "Data Bits"; + // + // dataBitsTextBox + // + this.dataBitsTextBox.Enabled = false; + this.dataBitsTextBox.Location = new System.Drawing.Point(140, 124); + this.dataBitsTextBox.Name = "dataBitsTextBox"; + this.dataBitsTextBox.Size = new System.Drawing.Size(34, 20); + this.dataBitsTextBox.TabIndex = 10; + // + // stopBitsLabel + // + this.stopBitsLabel.AutoSize = true; + this.stopBitsLabel.Location = new System.Drawing.Point(29, 151); + this.stopBitsLabel.Name = "stopBitsLabel"; + this.stopBitsLabel.Size = new System.Drawing.Size(49, 13); + this.stopBitsLabel.TabIndex = 11; + this.stopBitsLabel.Text = "Stop Bits"; + // + // handshakeLabel + // + this.handshakeLabel.AutoSize = true; + this.handshakeLabel.Location = new System.Drawing.Point(29, 175); + this.handshakeLabel.Name = "handshakeLabel"; + this.handshakeLabel.Size = new System.Drawing.Size(62, 13); + this.handshakeLabel.TabIndex = 13; + this.handshakeLabel.Text = "Handshake"; + // + // nameTextBox + // + this.nameTextBox.Enabled = false; + this.nameTextBox.Location = new System.Drawing.Point(140, 28); + this.nameTextBox.Name = "nameTextBox"; + this.nameTextBox.Size = new System.Drawing.Size(130, 20); + this.nameTextBox.TabIndex = 2; + // + // nameLabel + // + this.nameLabel.AutoSize = true; + this.nameLabel.Location = new System.Drawing.Point(30, 31); + this.nameLabel.Name = "nameLabel"; + this.nameLabel.Size = new System.Drawing.Size(35, 13); + this.nameLabel.TabIndex = 1; + this.nameLabel.Text = "Name"; + // + // classNameLabel + // + this.classNameLabel.AutoSize = true; + this.classNameLabel.Location = new System.Drawing.Point(137, 7); + this.classNameLabel.Name = "classNameLabel"; + this.classNameLabel.Size = new System.Drawing.Size(83, 13); + this.classNameLabel.TabIndex = 0; + this.classNameLabel.Text = "ComonentName"; + // + // parityComboBox + // + this.parityComboBox.Enabled = false; + this.parityComboBox.FormattingEnabled = true; + this.parityComboBox.Location = new System.Drawing.Point(140, 100); + this.parityComboBox.Name = "parityComboBox"; + this.parityComboBox.Size = new System.Drawing.Size(130, 21); + this.parityComboBox.TabIndex = 8; + // + // stopBitsComboBox + // + this.stopBitsComboBox.Enabled = false; + this.stopBitsComboBox.FormattingEnabled = true; + this.stopBitsComboBox.Location = new System.Drawing.Point(140, 148); + this.stopBitsComboBox.Name = "stopBitsComboBox"; + this.stopBitsComboBox.Size = new System.Drawing.Size(130, 21); + this.stopBitsComboBox.TabIndex = 12; + // + // handshakeComboBox + // + this.handshakeComboBox.Enabled = false; + this.handshakeComboBox.FormattingEnabled = true; + this.handshakeComboBox.Location = new System.Drawing.Point(140, 172); + this.handshakeComboBox.Name = "handshakeComboBox"; + this.handshakeComboBox.Size = new System.Drawing.Size(130, 21); + this.handshakeComboBox.TabIndex = 14; + // + // setDtrCheckBox + // + this.setDtrCheckBox.AutoSize = true; + this.setDtrCheckBox.Enabled = false; + this.setDtrCheckBox.Location = new System.Drawing.Point(140, 201); + this.setDtrCheckBox.Name = "setDtrCheckBox"; + this.setDtrCheckBox.Size = new System.Drawing.Size(89, 17); + this.setDtrCheckBox.TabIndex = 15; + this.setDtrCheckBox.Text = "Set DTR to 1"; + this.setDtrCheckBox.UseVisualStyleBackColor = true; + // + // AmbientCfgCtrl + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.Control; + this.Controls.Add(this.setDtrCheckBox); + this.Controls.Add(this.handshakeComboBox); + this.Controls.Add(this.stopBitsComboBox); + this.Controls.Add(this.parityComboBox); + this.Controls.Add(this.nameTextBox); + this.Controls.Add(this.nameLabel); + this.Controls.Add(this.classNameLabel); + this.Controls.Add(this.handshakeLabel); + this.Controls.Add(this.stopBitsLabel); + this.Controls.Add(this.dataBitsTextBox); + this.Controls.Add(this.dataBitsLabel); + this.Controls.Add(this.partityLabel); + this.Controls.Add(this.baudRateTextBox); + this.Controls.Add(this.baudRateLabel); + this.Controls.Add(this.comPortNrTextBox); + this.Controls.Add(this.label1); + this.Name = "AmbientCfgCtrl"; + this.Size = new System.Drawing.Size(300, 240); + this.Load += new System.EventHandler(this.AbbientCfgCtrl_Load); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -224,6 +237,7 @@ namespace TBF.BenchControl.Ambient.Comet private System.Windows.Forms.ComboBox parityComboBox; private System.Windows.Forms.ComboBox stopBitsComboBox; private System.Windows.Forms.ComboBox handshakeComboBox; + private System.Windows.Forms.CheckBox setDtrCheckBox; } } diff --git a/TBF/BenchControl/Ambient/Comet/AmbientCfgCtrl.cs b/TBF/BenchControl/Ambient/Comet/AmbientCfgCtrl.cs index 776d32b93..ce07e2d72 100644 --- a/TBF/BenchControl/Ambient/Comet/AmbientCfgCtrl.cs +++ b/TBF/BenchControl/Ambient/Comet/AmbientCfgCtrl.cs @@ -110,6 +110,7 @@ namespace TBF.BenchControl.Ambient.Comet dataBitsTextBox.Text = config.DataBits.ToString(); stopBitsComboBox.Text = config.StopBits.ToString(); handshakeComboBox.Text = config.Handshake.ToString(); + setDtrCheckBox.Checked = config.SetDtrToOne; } public void Unlock() @@ -121,6 +122,7 @@ namespace TBF.BenchControl.Ambient.Comet dataBitsTextBox.Enabled = true; stopBitsComboBox.Enabled = true; handshakeComboBox.Enabled = true; + setDtrCheckBox.Enabled = true; } public CfgUpdateFlags UpdateCfg() @@ -136,6 +138,7 @@ namespace TBF.BenchControl.Ambient.Comet config.DataBits = int.Parse(dataBitsTextBox.Text); config.StopBits = GetStopBits(stopBitsComboBox.SelectedItem.ToString()); config.Handshake = GetHandshake(handshakeComboBox.SelectedItem.ToString()); + config.SetDtrToOne = setDtrCheckBox.Checked; return flags; } diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index e3b52aa82..44ee00d05 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.1275.0")] -[assembly: AssemblyFileVersion("2.18.1275.0")] +[assembly: AssemblyVersion("2.18.1277.0")] +[assembly: AssemblyFileVersion("2.18.1277.0")]