diff --git a/HTOLHAST/Form1.Designer.cs b/HTOLHAST/Form1.Designer.cs
index f47de99..3c210cb 100644
--- a/HTOLHAST/Form1.Designer.cs
+++ b/HTOLHAST/Form1.Designer.cs
@@ -73,11 +73,7 @@ namespace HTOLHAST
this.cbCH1 = new System.Windows.Forms.CheckBox();
this.label15 = new System.Windows.Forms.Label();
this.dgvPowerDownSequence = new System.Windows.Forms.DataGridView();
- this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dgvPowerUpSequence = new System.Windows.Forms.DataGridView();
- this.Channel = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.Delay = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.label14 = new System.Windows.Forms.Label();
this.dgvPowerSupplies = new System.Windows.Forms.DataGridView();
this.tabPageHeader = new System.Windows.Forms.TabPage();
@@ -120,11 +116,11 @@ namespace HTOLHAST
this.tabControl1.Controls.Add(this.tabPagePSUSettings);
this.tabControl1.Controls.Add(this.tabPageHeader);
this.tabControl1.Controls.Add(this.tabPageMeasurement);
- this.tabControl1.Location = new System.Drawing.Point(12, 12);
- this.tabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tabControl1.Location = new System.Drawing.Point(9, 10);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(1581, 684);
+ this.tabControl1.Size = new System.Drawing.Size(1186, 556);
this.tabControl1.TabIndex = 0;
//
// tabPageInstruments
@@ -150,21 +146,20 @@ namespace HTOLHAST
this.tabPageInstruments.Controls.Add(this.pictureBox2);
this.tabPageInstruments.Controls.Add(this.label1);
this.tabPageInstruments.Controls.Add(this.pictureBox1);
- this.tabPageInstruments.Location = new System.Drawing.Point(4, 25);
- this.tabPageInstruments.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tabPageInstruments.Location = new System.Drawing.Point(4, 22);
+ this.tabPageInstruments.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tabPageInstruments.Name = "tabPageInstruments";
- this.tabPageInstruments.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.tabPageInstruments.Size = new System.Drawing.Size(1573, 655);
+ this.tabPageInstruments.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.tabPageInstruments.Size = new System.Drawing.Size(1178, 530);
this.tabPageInstruments.TabIndex = 0;
this.tabPageInstruments.Text = "Instruments";
this.tabPageInstruments.UseVisualStyleBackColor = true;
//
// btnInitializeInstruments
//
- this.btnInitializeInstruments.Location = new System.Drawing.Point(1033, 539);
- this.btnInitializeInstruments.Margin = new System.Windows.Forms.Padding(4);
+ this.btnInitializeInstruments.Location = new System.Drawing.Point(775, 438);
this.btnInitializeInstruments.Name = "btnInitializeInstruments";
- this.btnInitializeInstruments.Size = new System.Drawing.Size(156, 58);
+ this.btnInitializeInstruments.Size = new System.Drawing.Size(117, 47);
this.btnInitializeInstruments.TabIndex = 23;
this.btnInitializeInstruments.Text = "Initialize Instruments";
this.btnInitializeInstruments.UseVisualStyleBackColor = true;
@@ -173,10 +168,10 @@ namespace HTOLHAST
// cbPAMEnabled
//
this.cbPAMEnabled.AutoSize = true;
- this.cbPAMEnabled.Location = new System.Drawing.Point(824, 334);
- this.cbPAMEnabled.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.cbPAMEnabled.Location = new System.Drawing.Point(618, 271);
+ this.cbPAMEnabled.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.cbPAMEnabled.Name = "cbPAMEnabled";
- this.cbPAMEnabled.Size = new System.Drawing.Size(74, 21);
+ this.cbPAMEnabled.Size = new System.Drawing.Size(68, 19);
this.cbPAMEnabled.TabIndex = 22;
this.cbPAMEnabled.Text = "Enable";
this.cbPAMEnabled.UseVisualStyleBackColor = true;
@@ -184,10 +179,10 @@ namespace HTOLHAST
// cbPSU2Enabled
//
this.cbPSU2Enabled.AutoSize = true;
- this.cbPSU2Enabled.Location = new System.Drawing.Point(349, 334);
- this.cbPSU2Enabled.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.cbPSU2Enabled.Location = new System.Drawing.Point(262, 271);
+ this.cbPSU2Enabled.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.cbPSU2Enabled.Name = "cbPSU2Enabled";
- this.cbPSU2Enabled.Size = new System.Drawing.Size(74, 21);
+ this.cbPSU2Enabled.Size = new System.Drawing.Size(68, 19);
this.cbPSU2Enabled.TabIndex = 21;
this.cbPSU2Enabled.Text = "Enable";
this.cbPSU2Enabled.UseVisualStyleBackColor = true;
@@ -195,9 +190,10 @@ namespace HTOLHAST
// label11
//
this.label11.AutoSize = true;
- this.label11.Location = new System.Drawing.Point(1029, 34);
+ this.label11.Location = new System.Drawing.Point(772, 28);
+ this.label11.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(113, 17);
+ this.label11.Size = new System.Drawing.Size(100, 15);
this.label11.TabIndex = 18;
this.label11.Text = "CURRENT LIMIT";
//
@@ -212,178 +208,187 @@ namespace HTOLHAST
this.panel1.Controls.Add(this.textBox6);
this.panel1.Controls.Add(this.textBox5);
this.panel1.Controls.Add(this.label9);
- this.panel1.Location = new System.Drawing.Point(1032, 54);
- this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.panel1.Location = new System.Drawing.Point(774, 44);
+ this.panel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(464, 183);
+ this.panel1.Size = new System.Drawing.Size(348, 149);
this.panel1.TabIndex = 17;
//
// tbPamMaxCurrent
//
- this.tbPamMaxCurrent.Location = new System.Drawing.Point(355, 78);
- this.tbPamMaxCurrent.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tbPamMaxCurrent.Location = new System.Drawing.Point(266, 63);
+ this.tbPamMaxCurrent.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tbPamMaxCurrent.Name = "tbPamMaxCurrent";
- this.tbPamMaxCurrent.Size = new System.Drawing.Size(100, 22);
+ this.tbPamMaxCurrent.Size = new System.Drawing.Size(76, 20);
this.tbPamMaxCurrent.TabIndex = 23;
this.tbPamMaxCurrent.Text = "0.02";
//
// textBox8
//
- this.textBox8.Location = new System.Drawing.Point(355, 49);
- this.textBox8.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.textBox8.Location = new System.Drawing.Point(266, 40);
+ this.textBox8.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.textBox8.Name = "textBox8";
- this.textBox8.Size = new System.Drawing.Size(100, 22);
+ this.textBox8.Size = new System.Drawing.Size(76, 20);
this.textBox8.TabIndex = 22;
//
// label13
//
this.label13.AutoSize = true;
- this.label13.Location = new System.Drawing.Point(387, 18);
+ this.label13.Location = new System.Drawing.Point(290, 15);
+ this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(37, 17);
+ this.label13.Size = new System.Drawing.Size(33, 15);
this.label13.TabIndex = 21;
this.label13.Text = "MAX";
//
// label10
//
this.label10.AutoSize = true;
- this.label10.Location = new System.Drawing.Point(259, 18);
+ this.label10.Location = new System.Drawing.Point(194, 15);
+ this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(32, 17);
+ this.label10.Size = new System.Drawing.Size(30, 15);
this.label10.TabIndex = 20;
this.label10.Text = "MIN";
//
// label12
//
this.label12.AutoSize = true;
- this.label12.Location = new System.Drawing.Point(3, 78);
+ this.label12.Location = new System.Drawing.Point(2, 63);
+ this.label12.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(172, 17);
+ this.label12.Size = new System.Drawing.Size(150, 15);
this.label12.TabIndex = 19;
this.label12.Text = "PICOAM MAX CURRENT: ";
//
// button3
//
- this.button3.Location = new System.Drawing.Point(355, 135);
- this.button3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button3.Location = new System.Drawing.Point(266, 110);
+ this.button3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(100, 34);
+ this.button3.Size = new System.Drawing.Size(75, 28);
this.button3.TabIndex = 18;
this.button3.Text = "CONFIG";
this.button3.UseVisualStyleBackColor = true;
//
// textBox6
//
- this.textBox6.Location = new System.Drawing.Point(227, 78);
- this.textBox6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.textBox6.Location = new System.Drawing.Point(170, 63);
+ this.textBox6.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.textBox6.Name = "textBox6";
- this.textBox6.Size = new System.Drawing.Size(100, 22);
+ this.textBox6.Size = new System.Drawing.Size(76, 20);
this.textBox6.TabIndex = 3;
//
// textBox5
//
- this.textBox5.Location = new System.Drawing.Point(227, 49);
- this.textBox5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.textBox5.Location = new System.Drawing.Point(170, 40);
+ this.textBox5.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.textBox5.Name = "textBox5";
- this.textBox5.Size = new System.Drawing.Size(100, 22);
+ this.textBox5.Size = new System.Drawing.Size(76, 20);
this.textBox5.TabIndex = 2;
//
// label9
//
this.label9.AutoSize = true;
- this.label9.Location = new System.Drawing.Point(3, 49);
+ this.label9.Location = new System.Drawing.Point(2, 40);
+ this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(217, 17);
+ this.label9.Size = new System.Drawing.Size(185, 15);
this.label9.TabIndex = 0;
this.label9.Text = "DATALOGGER MAX CURRENT: ";
//
// tbResourceStringPAM
//
- this.tbResourceStringPAM.Location = new System.Drawing.Point(653, 572);
- this.tbResourceStringPAM.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tbResourceStringPAM.Location = new System.Drawing.Point(490, 465);
+ this.tbResourceStringPAM.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tbResourceStringPAM.Name = "tbResourceStringPAM";
- this.tbResourceStringPAM.Size = new System.Drawing.Size(244, 22);
+ this.tbResourceStringPAM.Size = new System.Drawing.Size(184, 20);
this.tbResourceStringPAM.TabIndex = 15;
this.tbResourceStringPAM.Text = "ASRL3::INSTR";
//
// label8
//
this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(525, 572);
+ this.label8.Location = new System.Drawing.Point(394, 465);
+ this.label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(108, 17);
+ this.label8.Size = new System.Drawing.Size(93, 15);
this.label8.TabIndex = 14;
this.label8.Text = "VISA ADDRESS";
//
// tbResourceStringDAQ
//
- this.tbResourceStringDAQ.Location = new System.Drawing.Point(653, 266);
- this.tbResourceStringDAQ.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tbResourceStringDAQ.Location = new System.Drawing.Point(490, 216);
+ this.tbResourceStringDAQ.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tbResourceStringDAQ.Name = "tbResourceStringDAQ";
- this.tbResourceStringDAQ.Size = new System.Drawing.Size(244, 22);
+ this.tbResourceStringDAQ.Size = new System.Drawing.Size(184, 20);
this.tbResourceStringDAQ.TabIndex = 13;
this.tbResourceStringDAQ.Text = "ASRL9::INSTR";
//
// label7
//
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(525, 266);
+ this.label7.Location = new System.Drawing.Point(394, 216);
+ this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(108, 17);
+ this.label7.Size = new System.Drawing.Size(93, 15);
this.label7.TabIndex = 12;
this.label7.Text = "VISA ADDRESS";
//
// tbResourceStringPSU2
//
- this.tbResourceStringPSU2.Location = new System.Drawing.Point(179, 572);
- this.tbResourceStringPSU2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tbResourceStringPSU2.Location = new System.Drawing.Point(134, 465);
+ this.tbResourceStringPSU2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tbResourceStringPSU2.Name = "tbResourceStringPSU2";
- this.tbResourceStringPSU2.Size = new System.Drawing.Size(244, 22);
+ this.tbResourceStringPSU2.Size = new System.Drawing.Size(184, 20);
this.tbResourceStringPSU2.TabIndex = 11;
//
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(51, 572);
+ this.label6.Location = new System.Drawing.Point(38, 465);
+ this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(108, 17);
+ this.label6.Size = new System.Drawing.Size(93, 15);
this.label6.TabIndex = 10;
this.label6.Text = "VISA ADDRESS";
//
// tbResourceStringPSU1
//
- this.tbResourceStringPSU1.Location = new System.Drawing.Point(179, 266);
- this.tbResourceStringPSU1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tbResourceStringPSU1.Location = new System.Drawing.Point(134, 216);
+ this.tbResourceStringPSU1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tbResourceStringPSU1.Name = "tbResourceStringPSU1";
- this.tbResourceStringPSU1.Size = new System.Drawing.Size(244, 22);
+ this.tbResourceStringPSU1.Size = new System.Drawing.Size(184, 20);
this.tbResourceStringPSU1.TabIndex = 9;
this.tbResourceStringPSU1.Text = "ASRL4::INSTR";
//
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(51, 266);
+ this.label5.Location = new System.Drawing.Point(38, 216);
+ this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(108, 17);
+ this.label5.Size = new System.Drawing.Size(93, 15);
this.label5.TabIndex = 8;
this.label5.Text = "VISA ADDRESS";
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(525, 340);
+ this.label4.Location = new System.Drawing.Point(394, 276);
+ this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(108, 17);
+ this.label4.Size = new System.Drawing.Size(96, 15);
this.label4.TabIndex = 7;
this.label4.Text = "PICOAMMETER";
//
// pictureBox4
//
this.pictureBox4.Image = global::HTOLHAST.Properties.Resources.Keithley6485;
- this.pictureBox4.Location = new System.Drawing.Point(528, 359);
- this.pictureBox4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.pictureBox4.Location = new System.Drawing.Point(396, 292);
+ this.pictureBox4.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.pictureBox4.Name = "pictureBox4";
- this.pictureBox4.Size = new System.Drawing.Size(371, 209);
+ this.pictureBox4.Size = new System.Drawing.Size(278, 170);
this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox4.TabIndex = 6;
this.pictureBox4.TabStop = false;
@@ -391,19 +396,20 @@ namespace HTOLHAST
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(525, 34);
+ this.label3.Location = new System.Drawing.Point(394, 28);
+ this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(105, 17);
+ this.label3.Size = new System.Drawing.Size(88, 15);
this.label3.TabIndex = 5;
this.label3.Text = "DATALOGGER";
//
// pictureBox3
//
this.pictureBox3.Image = global::HTOLHAST.Properties.Resources.Agilent34970A;
- this.pictureBox3.Location = new System.Drawing.Point(528, 54);
- this.pictureBox3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.pictureBox3.Location = new System.Drawing.Point(396, 44);
+ this.pictureBox3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.pictureBox3.Name = "pictureBox3";
- this.pictureBox3.Size = new System.Drawing.Size(371, 209);
+ this.pictureBox3.Size = new System.Drawing.Size(278, 170);
this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox3.TabIndex = 4;
this.pictureBox3.TabStop = false;
@@ -411,19 +417,20 @@ namespace HTOLHAST
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(51, 340);
+ this.label2.Location = new System.Drawing.Point(38, 276);
+ this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(122, 17);
+ this.label2.Size = new System.Drawing.Size(106, 15);
this.label2.TabIndex = 3;
this.label2.Text = "POWERSUPPLY2";
//
// pictureBox2
//
this.pictureBox2.Image = global::HTOLHAST.Properties.Resources.HMP4040;
- this.pictureBox2.Location = new System.Drawing.Point(53, 359);
- this.pictureBox2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.pictureBox2.Location = new System.Drawing.Point(40, 292);
+ this.pictureBox2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.pictureBox2.Name = "pictureBox2";
- this.pictureBox2.Size = new System.Drawing.Size(371, 209);
+ this.pictureBox2.Size = new System.Drawing.Size(278, 170);
this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox2.TabIndex = 2;
this.pictureBox2.TabStop = false;
@@ -431,19 +438,20 @@ namespace HTOLHAST
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(51, 34);
+ this.label1.Location = new System.Drawing.Point(38, 28);
+ this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(122, 17);
+ this.label1.Size = new System.Drawing.Size(106, 15);
this.label1.TabIndex = 1;
this.label1.Text = "POWERSUPPLY1";
//
// pictureBox1
//
this.pictureBox1.Image = global::HTOLHAST.Properties.Resources.HMP4040;
- this.pictureBox1.Location = new System.Drawing.Point(53, 54);
- this.pictureBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.pictureBox1.Location = new System.Drawing.Point(40, 44);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(371, 209);
+ this.pictureBox1.Size = new System.Drawing.Size(278, 170);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
@@ -464,21 +472,20 @@ namespace HTOLHAST
this.tabPagePSUSettings.Controls.Add(this.dgvPowerUpSequence);
this.tabPagePSUSettings.Controls.Add(this.label14);
this.tabPagePSUSettings.Controls.Add(this.dgvPowerSupplies);
- this.tabPagePSUSettings.Location = new System.Drawing.Point(4, 25);
- this.tabPagePSUSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tabPagePSUSettings.Location = new System.Drawing.Point(4, 22);
+ this.tabPagePSUSettings.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tabPagePSUSettings.Name = "tabPagePSUSettings";
- this.tabPagePSUSettings.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.tabPagePSUSettings.Size = new System.Drawing.Size(1573, 655);
+ this.tabPagePSUSettings.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.tabPagePSUSettings.Size = new System.Drawing.Size(1178, 530);
this.tabPagePSUSettings.TabIndex = 1;
this.tabPagePSUSettings.Text = "PSUSettings";
this.tabPagePSUSettings.UseVisualStyleBackColor = true;
//
// btnSendPsuSettings
//
- this.btnSendPsuSettings.Location = new System.Drawing.Point(427, 534);
- this.btnSendPsuSettings.Margin = new System.Windows.Forms.Padding(4);
+ this.btnSendPsuSettings.Location = new System.Drawing.Point(320, 434);
this.btnSendPsuSettings.Name = "btnSendPsuSettings";
- this.btnSendPsuSettings.Size = new System.Drawing.Size(185, 59);
+ this.btnSendPsuSettings.Size = new System.Drawing.Size(139, 48);
this.btnSendPsuSettings.TabIndex = 42;
this.btnSendPsuSettings.Text = "SEND";
this.btnSendPsuSettings.UseVisualStyleBackColor = true;
@@ -487,10 +494,9 @@ namespace HTOLHAST
// cbCH8
//
this.cbCH8.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbCH8.Location = new System.Drawing.Point(1209, 126);
- this.cbCH8.Margin = new System.Windows.Forms.Padding(4);
+ this.cbCH8.Location = new System.Drawing.Point(907, 102);
this.cbCH8.Name = "cbCH8";
- this.cbCH8.Size = new System.Drawing.Size(179, 84);
+ this.cbCH8.Size = new System.Drawing.Size(134, 68);
this.cbCH8.TabIndex = 41;
this.cbCH8.Text = "CH8";
this.cbCH8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -499,10 +505,9 @@ namespace HTOLHAST
// cbCH7
//
this.cbCH7.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbCH7.Location = new System.Drawing.Point(1021, 126);
- this.cbCH7.Margin = new System.Windows.Forms.Padding(4);
+ this.cbCH7.Location = new System.Drawing.Point(766, 102);
this.cbCH7.Name = "cbCH7";
- this.cbCH7.Size = new System.Drawing.Size(179, 84);
+ this.cbCH7.Size = new System.Drawing.Size(134, 68);
this.cbCH7.TabIndex = 40;
this.cbCH7.Text = "CH7";
this.cbCH7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -511,10 +516,9 @@ namespace HTOLHAST
// cbCH6
//
this.cbCH6.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbCH6.Location = new System.Drawing.Point(835, 126);
- this.cbCH6.Margin = new System.Windows.Forms.Padding(4);
+ this.cbCH6.Location = new System.Drawing.Point(626, 102);
this.cbCH6.Name = "cbCH6";
- this.cbCH6.Size = new System.Drawing.Size(179, 84);
+ this.cbCH6.Size = new System.Drawing.Size(134, 68);
this.cbCH6.TabIndex = 39;
this.cbCH6.Text = "CH6";
this.cbCH6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -523,10 +527,9 @@ namespace HTOLHAST
// cbCH5
//
this.cbCH5.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbCH5.Location = new System.Drawing.Point(648, 126);
- this.cbCH5.Margin = new System.Windows.Forms.Padding(4);
+ this.cbCH5.Location = new System.Drawing.Point(486, 102);
this.cbCH5.Name = "cbCH5";
- this.cbCH5.Size = new System.Drawing.Size(179, 84);
+ this.cbCH5.Size = new System.Drawing.Size(134, 68);
this.cbCH5.TabIndex = 38;
this.cbCH5.Text = "CH5";
this.cbCH5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -535,10 +538,9 @@ namespace HTOLHAST
// cbCH4
//
this.cbCH4.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbCH4.Location = new System.Drawing.Point(1209, 18);
- this.cbCH4.Margin = new System.Windows.Forms.Padding(4);
+ this.cbCH4.Location = new System.Drawing.Point(907, 15);
this.cbCH4.Name = "cbCH4";
- this.cbCH4.Size = new System.Drawing.Size(179, 84);
+ this.cbCH4.Size = new System.Drawing.Size(134, 68);
this.cbCH4.TabIndex = 37;
this.cbCH4.Text = "CH4";
this.cbCH4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -547,10 +549,9 @@ namespace HTOLHAST
// cbCH3
//
this.cbCH3.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbCH3.Location = new System.Drawing.Point(1021, 18);
- this.cbCH3.Margin = new System.Windows.Forms.Padding(4);
+ this.cbCH3.Location = new System.Drawing.Point(766, 15);
this.cbCH3.Name = "cbCH3";
- this.cbCH3.Size = new System.Drawing.Size(179, 84);
+ this.cbCH3.Size = new System.Drawing.Size(134, 68);
this.cbCH3.TabIndex = 36;
this.cbCH3.Text = "CH3";
this.cbCH3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -559,10 +560,9 @@ namespace HTOLHAST
// cbCH2
//
this.cbCH2.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbCH2.Location = new System.Drawing.Point(835, 18);
- this.cbCH2.Margin = new System.Windows.Forms.Padding(4);
+ this.cbCH2.Location = new System.Drawing.Point(626, 15);
this.cbCH2.Name = "cbCH2";
- this.cbCH2.Size = new System.Drawing.Size(179, 84);
+ this.cbCH2.Size = new System.Drawing.Size(134, 68);
this.cbCH2.TabIndex = 35;
this.cbCH2.Text = "CH2";
this.cbCH2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -571,10 +571,9 @@ namespace HTOLHAST
// cbCH1
//
this.cbCH1.Appearance = System.Windows.Forms.Appearance.Button;
- this.cbCH1.Location = new System.Drawing.Point(648, 18);
- this.cbCH1.Margin = new System.Windows.Forms.Padding(4);
+ this.cbCH1.Location = new System.Drawing.Point(486, 15);
this.cbCH1.Name = "cbCH1";
- this.cbCH1.Size = new System.Drawing.Size(179, 84);
+ this.cbCH1.Size = new System.Drawing.Size(134, 68);
this.cbCH1.TabIndex = 34;
this.cbCH1.Text = "CH1";
this.cbCH1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -583,96 +582,64 @@ namespace HTOLHAST
// label15
//
this.label15.AutoSize = true;
- this.label15.Location = new System.Drawing.Point(1079, 283);
+ this.label15.Location = new System.Drawing.Point(809, 230);
+ this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(189, 17);
+ this.label15.Size = new System.Drawing.Size(164, 15);
this.label15.TabIndex = 27;
this.label15.Text = "POWER-DOWN SEQUENCE";
//
// dgvPowerDownSequence
//
this.dgvPowerDownSequence.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.dgvPowerDownSequence.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
- this.dataGridViewTextBoxColumn1,
- this.dataGridViewTextBoxColumn2});
- this.dgvPowerDownSequence.Location = new System.Drawing.Point(1083, 316);
- this.dgvPowerDownSequence.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.dgvPowerDownSequence.Location = new System.Drawing.Point(812, 257);
+ this.dgvPowerDownSequence.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.dgvPowerDownSequence.Name = "dgvPowerDownSequence";
this.dgvPowerDownSequence.RowHeadersWidth = 51;
this.dgvPowerDownSequence.RowTemplate.Height = 24;
- this.dgvPowerDownSequence.Size = new System.Drawing.Size(305, 193);
+ this.dgvPowerDownSequence.Size = new System.Drawing.Size(278, 157);
this.dgvPowerDownSequence.TabIndex = 26;
//
- // dataGridViewTextBoxColumn1
- //
- this.dataGridViewTextBoxColumn1.HeaderText = "Channel";
- this.dataGridViewTextBoxColumn1.MinimumWidth = 6;
- this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
- this.dataGridViewTextBoxColumn1.Width = 125;
- //
- // dataGridViewTextBoxColumn2
- //
- this.dataGridViewTextBoxColumn2.HeaderText = "Delay";
- this.dataGridViewTextBoxColumn2.MinimumWidth = 6;
- this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
- this.dataGridViewTextBoxColumn2.Width = 125;
- //
// dgvPowerUpSequence
//
this.dgvPowerUpSequence.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.dgvPowerUpSequence.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
- this.Channel,
- this.Delay});
- this.dgvPowerUpSequence.Location = new System.Drawing.Point(648, 316);
- this.dgvPowerUpSequence.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.dgvPowerUpSequence.Location = new System.Drawing.Point(486, 257);
+ this.dgvPowerUpSequence.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.dgvPowerUpSequence.Name = "dgvPowerUpSequence";
this.dgvPowerUpSequence.RowHeadersWidth = 51;
this.dgvPowerUpSequence.RowTemplate.Height = 24;
- this.dgvPowerUpSequence.Size = new System.Drawing.Size(305, 193);
+ this.dgvPowerUpSequence.Size = new System.Drawing.Size(274, 157);
this.dgvPowerUpSequence.TabIndex = 25;
//
- // Channel
- //
- this.Channel.HeaderText = "Channel";
- this.Channel.MinimumWidth = 6;
- this.Channel.Name = "Channel";
- this.Channel.Width = 125;
- //
- // Delay
- //
- this.Delay.HeaderText = "Delay";
- this.Delay.MinimumWidth = 6;
- this.Delay.Name = "Delay";
- this.Delay.Width = 125;
- //
// label14
//
this.label14.AutoSize = true;
- this.label14.Location = new System.Drawing.Point(645, 283);
+ this.label14.Location = new System.Drawing.Point(484, 230);
+ this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(164, 17);
+ this.label14.Size = new System.Drawing.Size(143, 15);
this.label14.TabIndex = 24;
this.label14.Text = "POWER-UP SEQUENCE";
//
// dgvPowerSupplies
//
this.dgvPowerSupplies.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.dgvPowerSupplies.Location = new System.Drawing.Point(15, 18);
- this.dgvPowerSupplies.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.dgvPowerSupplies.Location = new System.Drawing.Point(11, 15);
+ this.dgvPowerSupplies.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.dgvPowerSupplies.Name = "dgvPowerSupplies";
this.dgvPowerSupplies.RowHeadersWidth = 51;
this.dgvPowerSupplies.RowTemplate.Height = 24;
- this.dgvPowerSupplies.Size = new System.Drawing.Size(597, 491);
+ this.dgvPowerSupplies.Size = new System.Drawing.Size(448, 399);
this.dgvPowerSupplies.TabIndex = 0;
//
// tabPageHeader
//
this.tabPageHeader.Controls.Add(this.dgvHeaderSettings);
- this.tabPageHeader.Location = new System.Drawing.Point(4, 25);
- this.tabPageHeader.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tabPageHeader.Location = new System.Drawing.Point(4, 22);
+ this.tabPageHeader.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tabPageHeader.Name = "tabPageHeader";
- this.tabPageHeader.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.tabPageHeader.Size = new System.Drawing.Size(1573, 655);
+ this.tabPageHeader.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.tabPageHeader.Size = new System.Drawing.Size(1178, 530);
this.tabPageHeader.TabIndex = 3;
this.tabPageHeader.Text = "Header";
this.tabPageHeader.UseVisualStyleBackColor = true;
@@ -680,12 +647,12 @@ namespace HTOLHAST
// dgvHeaderSettings
//
this.dgvHeaderSettings.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.dgvHeaderSettings.Location = new System.Drawing.Point(5, 6);
- this.dgvHeaderSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.dgvHeaderSettings.Location = new System.Drawing.Point(4, 5);
+ this.dgvHeaderSettings.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.dgvHeaderSettings.Name = "dgvHeaderSettings";
this.dgvHeaderSettings.RowHeadersWidth = 51;
this.dgvHeaderSettings.RowTemplate.Height = 24;
- this.dgvHeaderSettings.Size = new System.Drawing.Size(744, 642);
+ this.dgvHeaderSettings.Size = new System.Drawing.Size(558, 522);
this.dgvHeaderSettings.TabIndex = 1;
//
// tabPageMeasurement
@@ -704,10 +671,10 @@ namespace HTOLHAST
this.tabPageMeasurement.Controls.Add(this.btnMeasure);
this.tabPageMeasurement.Controls.Add(this.tbProject);
this.tabPageMeasurement.Controls.Add(this.dgvMeasurements);
- this.tabPageMeasurement.Location = new System.Drawing.Point(4, 25);
- this.tabPageMeasurement.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tabPageMeasurement.Location = new System.Drawing.Point(4, 22);
+ this.tabPageMeasurement.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tabPageMeasurement.Name = "tabPageMeasurement";
- this.tabPageMeasurement.Size = new System.Drawing.Size(1573, 655);
+ this.tabPageMeasurement.Size = new System.Drawing.Size(1178, 530);
this.tabPageMeasurement.TabIndex = 2;
this.tabPageMeasurement.Text = "Measurement";
this.tabPageMeasurement.UseVisualStyleBackColor = true;
@@ -715,36 +682,38 @@ namespace HTOLHAST
// tbStepDescription
//
this.tbStepDescription.AutoSize = true;
- this.tbStepDescription.Location = new System.Drawing.Point(17, 81);
+ this.tbStepDescription.Location = new System.Drawing.Point(13, 66);
+ this.tbStepDescription.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.tbStepDescription.Name = "tbStepDescription";
- this.tbStepDescription.Size = new System.Drawing.Size(120, 17);
+ this.tbStepDescription.Size = new System.Drawing.Size(103, 15);
this.tbStepDescription.TabIndex = 14;
this.tbStepDescription.Text = "Step Description :";
//
// tbSubProjectDescription
//
this.tbSubProjectDescription.AutoSize = true;
- this.tbSubProjectDescription.Location = new System.Drawing.Point(17, 65);
+ this.tbSubProjectDescription.Location = new System.Drawing.Point(13, 53);
+ this.tbSubProjectDescription.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.tbSubProjectDescription.Name = "tbSubProjectDescription";
- this.tbSubProjectDescription.Size = new System.Drawing.Size(160, 17);
+ this.tbSubProjectDescription.Size = new System.Drawing.Size(138, 15);
this.tbSubProjectDescription.TabIndex = 13;
this.tbSubProjectDescription.Text = "SubProject Description :";
//
// tbProjectDescription
//
this.tbProjectDescription.AutoSize = true;
- this.tbProjectDescription.Location = new System.Drawing.Point(17, 49);
+ this.tbProjectDescription.Location = new System.Drawing.Point(13, 40);
+ this.tbProjectDescription.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.tbProjectDescription.Name = "tbProjectDescription";
- this.tbProjectDescription.Size = new System.Drawing.Size(135, 17);
+ this.tbProjectDescription.Size = new System.Drawing.Size(116, 15);
this.tbProjectDescription.TabIndex = 12;
this.tbProjectDescription.Text = "Project Description :";
//
// btnSelectProject
//
- this.btnSelectProject.Location = new System.Drawing.Point(231, 103);
- this.btnSelectProject.Margin = new System.Windows.Forms.Padding(4);
+ this.btnSelectProject.Location = new System.Drawing.Point(173, 84);
this.btnSelectProject.Name = "btnSelectProject";
- this.btnSelectProject.Size = new System.Drawing.Size(196, 55);
+ this.btnSelectProject.Size = new System.Drawing.Size(147, 45);
this.btnSelectProject.TabIndex = 11;
this.btnSelectProject.Text = "Select Project";
this.btnSelectProject.UseVisualStyleBackColor = true;
@@ -752,48 +721,43 @@ namespace HTOLHAST
//
// tbCurrentPosition
//
- this.tbCurrentPosition.Location = new System.Drawing.Point(1433, 4);
- this.tbCurrentPosition.Margin = new System.Windows.Forms.Padding(4);
+ this.tbCurrentPosition.Location = new System.Drawing.Point(1075, 3);
this.tbCurrentPosition.Name = "tbCurrentPosition";
- this.tbCurrentPosition.Size = new System.Drawing.Size(132, 22);
+ this.tbCurrentPosition.Size = new System.Drawing.Size(100, 20);
this.tbCurrentPosition.TabIndex = 10;
this.tbCurrentPosition.Text = "1";
//
// tbPositionIncrement
//
- this.tbPositionIncrement.Location = new System.Drawing.Point(1143, 4);
- this.tbPositionIncrement.Margin = new System.Windows.Forms.Padding(4);
+ this.tbPositionIncrement.Location = new System.Drawing.Point(857, 3);
this.tbPositionIncrement.Name = "tbPositionIncrement";
- this.tbPositionIncrement.Size = new System.Drawing.Size(132, 22);
+ this.tbPositionIncrement.Size = new System.Drawing.Size(100, 20);
this.tbPositionIncrement.TabIndex = 9;
this.tbPositionIncrement.Text = "1";
//
// label18
//
this.label18.AutoSize = true;
- this.label18.Location = new System.Drawing.Point(992, 12);
- this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label18.Location = new System.Drawing.Point(744, 10);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(124, 17);
+ this.label18.Size = new System.Drawing.Size(109, 15);
this.label18.TabIndex = 8;
this.label18.Text = "Position Increment";
//
// label17
//
this.label17.AutoSize = true;
- this.label17.Location = new System.Drawing.Point(1319, 12);
- this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label17.Location = new System.Drawing.Point(989, 10);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(109, 17);
+ this.label17.Size = new System.Drawing.Size(94, 15);
this.label17.TabIndex = 7;
this.label17.Text = "Current Position";
//
// btnClear
//
- this.btnClear.Location = new System.Drawing.Point(919, 524);
- this.btnClear.Margin = new System.Windows.Forms.Padding(4);
+ this.btnClear.Location = new System.Drawing.Point(689, 426);
this.btnClear.Name = "btnClear";
- this.btnClear.Size = new System.Drawing.Size(219, 97);
+ this.btnClear.Size = new System.Drawing.Size(164, 79);
this.btnClear.TabIndex = 6;
this.btnClear.Text = "CLEAR";
this.btnClear.UseVisualStyleBackColor = true;
@@ -801,10 +765,10 @@ namespace HTOLHAST
//
// btnExport
//
- this.btnExport.Location = new System.Drawing.Point(1323, 524);
- this.btnExport.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.btnExport.Location = new System.Drawing.Point(992, 426);
+ this.btnExport.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnExport.Name = "btnExport";
- this.btnExport.Size = new System.Drawing.Size(221, 97);
+ this.btnExport.Size = new System.Drawing.Size(166, 79);
this.btnExport.TabIndex = 5;
this.btnExport.Text = "EXPORT";
this.btnExport.UseVisualStyleBackColor = true;
@@ -812,10 +776,10 @@ namespace HTOLHAST
//
// btnNextPosition
//
- this.btnNextPosition.Location = new System.Drawing.Point(688, 524);
- this.btnNextPosition.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.btnNextPosition.Location = new System.Drawing.Point(516, 426);
+ this.btnNextPosition.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnNextPosition.Name = "btnNextPosition";
- this.btnNextPosition.Size = new System.Drawing.Size(221, 97);
+ this.btnNextPosition.Size = new System.Drawing.Size(166, 79);
this.btnNextPosition.TabIndex = 4;
this.btnNextPosition.Text = "NEXT POSITION";
this.btnNextPosition.UseVisualStyleBackColor = true;
@@ -823,10 +787,10 @@ namespace HTOLHAST
//
// btnMeasure
//
- this.btnMeasure.Location = new System.Drawing.Point(461, 524);
- this.btnMeasure.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.btnMeasure.Location = new System.Drawing.Point(346, 426);
+ this.btnMeasure.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnMeasure.Name = "btnMeasure";
- this.btnMeasure.Size = new System.Drawing.Size(221, 97);
+ this.btnMeasure.Size = new System.Drawing.Size(166, 79);
this.btnMeasure.TabIndex = 3;
this.btnMeasure.Text = "MEASURE";
this.btnMeasure.UseVisualStyleBackColor = true;
@@ -835,30 +799,31 @@ namespace HTOLHAST
// tbProject
//
this.tbProject.AutoSize = true;
- this.tbProject.Location = new System.Drawing.Point(17, 33);
+ this.tbProject.Location = new System.Drawing.Point(13, 27);
+ this.tbProject.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.tbProject.Name = "tbProject";
- this.tbProject.Size = new System.Drawing.Size(138, 17);
+ this.tbProject.Size = new System.Drawing.Size(123, 15);
this.tbProject.TabIndex = 1;
this.tbProject.Text = "Project: Pxxxxx Sub x";
//
// dgvMeasurements
//
this.dgvMeasurements.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.dgvMeasurements.Location = new System.Drawing.Point(461, 33);
- this.dgvMeasurements.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.dgvMeasurements.Location = new System.Drawing.Point(346, 27);
+ this.dgvMeasurements.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.dgvMeasurements.Name = "dgvMeasurements";
this.dgvMeasurements.RowHeadersWidth = 51;
this.dgvMeasurements.RowTemplate.Height = 24;
- this.dgvMeasurements.Size = new System.Drawing.Size(1083, 441);
+ this.dgvMeasurements.Size = new System.Drawing.Size(812, 358);
this.dgvMeasurements.TabIndex = 0;
//
// Form1
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1597, 700);
+ this.ClientSize = new System.Drawing.Size(1198, 569);
this.Controls.Add(this.tabControl1);
- this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.Name = "Form1";
this.Text = "Form1";
this.tabControl1.ResumeLayout(false);
@@ -921,11 +886,7 @@ namespace HTOLHAST
private System.Windows.Forms.CheckBox cbPSU2Enabled;
private System.Windows.Forms.Label label15;
private System.Windows.Forms.DataGridView dgvPowerDownSequence;
- private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
- private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
private System.Windows.Forms.DataGridView dgvPowerUpSequence;
- private System.Windows.Forms.DataGridViewTextBoxColumn Channel;
- private System.Windows.Forms.DataGridViewTextBoxColumn Delay;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.TabPage tabPageMeasurement;
private System.Windows.Forms.Button btnExport;
diff --git a/HTOLHAST/Form1.cs b/HTOLHAST/Form1.cs
index 31728c1..53bd6a6 100644
--- a/HTOLHAST/Form1.cs
+++ b/HTOLHAST/Form1.cs
@@ -104,13 +104,15 @@ namespace HTOLHAST
//InitializeDataTablePowerSupplySettings();
//InitializeDgvPowerSupplySettings();
//KeithleyValidationOfMethods();
- InitializeButtons();
+ InitializeButtons(false);
InitDgvPowersupply();
InitDgvHeaderSetting();
InitDgvMeasurements();
- InitDgvPowerSequences();
+
InitSwitchMatrix();
InitializePowerupSequence();
+ InitializePowerDownSequence();
+ InitDgvPowerSequences();
}
@@ -119,18 +121,21 @@ namespace HTOLHAST
// Bind powerup sequences to datagridviews
bindingSourcePowerUpSequence.DataSource = powerUpSequences;
dgvPowerUpSequence.DataSource = bindingSourcePowerUpSequence;
+ dgvPowerUpSequence.Refresh();
bindingSourcePowerDownSequence.DataSource = powerDownSequences;
- dgvPowerDownSequence.DataSource = bindingSourcePowerDownSequence;
+ dgvPowerDownSequence.DataSource = bindingSourcePowerDownSequence;
+ dgvPowerDownSequence.Refresh();
+
}
#region INITIALIZATION
- private void InitializeButtons()
+ private void InitializeButtons( bool state)
{
- btnClear.Enabled = false;
- btnMeasure.Enabled = false;
- btnNextPosition.Enabled = false;
+ btnClear.Enabled = state;
+ btnMeasure.Enabled = state;
+ btnNextPosition.Enabled = state;
- btnSendPsuSettings.Enabled = false;
+ btnSendPsuSettings.Enabled = state;
}
private void InitDgvMeasurements()
{
@@ -236,19 +241,21 @@ namespace HTOLHAST
{
// Mandatory instruments:
- Task.Run(() => InitializePSU1(tbResourceStringPSU1.Text));
- Task.Run(() => InitializeDAQ(tbResourceStringDAQ.Text));
+ InitializePSU1(tbResourceStringPSU1.Text);
+ InitializeDAQ(tbResourceStringDAQ.Text);
// Optional Instruments check if to be used
if (cbPSU2Enabled.Checked)
{
- Task.Run(() => InitializePSU2(tbResourceStringPSU2.Text));
+ InitializePSU2(tbResourceStringPSU2.Text);
}
if (cbPAMEnabled.Checked)
{
- Task.Run(() => InitializePAM(tbResourceStringPAM.Text));
+ InitializePAM(tbResourceStringPAM.Text);
}
+
+ InitializeButtons(true);
}
public void InitializePSU1(string resourceString)
{
@@ -395,6 +402,8 @@ namespace HTOLHAST
private void btnInitializeInstruments_Click(object sender, EventArgs e)
{
InitializeInstruments();
+
+
}
#endregion
@@ -441,7 +450,7 @@ namespace HTOLHAST
MeasurePSUVoltage();
MeasureHeaderVoltage();
MeasureCurrent();
- PowerDownPSU(powerUpSequences);
+ PowerDownPSU(powerDownSequences);
// Timestamp, Position, Device, Measurement, Voltage, Current
// 2025-01-09, 1, HAMEG1, CH1, 1.0, 0.1
@@ -544,6 +553,7 @@ namespace HTOLHAST
{
if (powersupply.Channel <= 4)
{
+ // Meet eerst de stroom met de HAMEG
HMP4040Sample current = (HMP4040Sample) PSU1.MeasureCurrent(powersupply.Channel);
if (PAM == null) { return; }
diff --git a/HTOLHAST/Form1.resx b/HTOLHAST/Form1.resx
index 024ecca..1af7de1 100644
--- a/HTOLHAST/Form1.resx
+++ b/HTOLHAST/Form1.resx
@@ -117,22 +117,4 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
\ No newline at end of file