diff --git a/Tester/SW/designtest_control/QUA_2475_designtest.suo b/Tester/SW/designtest_control/QUA_2475_designtest.suo index 82801cf..2623601 100644 Binary files a/Tester/SW/designtest_control/QUA_2475_designtest.suo and b/Tester/SW/designtest_control/QUA_2475_designtest.suo differ diff --git a/Tester/SW/designtest_control/QUA_2475_designtest/Master.cs b/Tester/SW/designtest_control/QUA_2475_designtest/Master.cs index 96ee3c1..1d67970 100644 --- a/Tester/SW/designtest_control/QUA_2475_designtest/Master.cs +++ b/Tester/SW/designtest_control/QUA_2475_designtest/Master.cs @@ -40,6 +40,18 @@ namespace QUA_2475_designtest { public partial class mainWindow { + private void remoteRTCset() + { + string sendString; + + sendString = String.Format("setrtc 2 {0} {1}\r", DateTime.Now.ToString("MMddHHmm"), DateTime.Now.ToString("yyyy")); + com1.Write(sendString); + } + + private void calibrateAnalogue() + { + com1.Write("cslave 4\r"); + } private void T_MasterInput_TextChanged(object sender, EventArgs e) @@ -81,25 +93,38 @@ namespace QUA_2475_designtest else { /* Calling Function is in same Thread */ + try + { + /* Search for Text fragments in Input String */ + if (text.LastIndexOf("PASSED") != -1) + { + /* "PASSED" indecates that Device successfully + * finished a Test Script or Routine + */ + activeTest = false; + TestResult[actualTest] = true; + TestIsPassed(actualTest); + } + if (text.LastIndexOf("FAILED") != -1) + { + /* "FAILED" indecates that Device finished + * a Test Script or Routine with Errors + */ + activeTest = false; + TestResult[actualTest] = false; + TestIsFailed(actualTest); + } + if (text.LastIndexOf("CALIBRATION PART FINISHED") != -1) + { + activeTest = false; + TestResult[actualTest] = true; + CalibrationFinished(); + } - /* Search for Text fragments in Input String */ - if (text.LastIndexOf("test: PASSED") != -1) - { - /* "test: PASSED" indecates that Device successfully - * finished a Test Script or Routine - */ - activeTest = false; - TestResult[actualTest] = true; - TestIsPassed(actualTest); } - if (text.LastIndexOf("test: FAILED") != -1) + catch { - /* "test: FAILED" indecates that Device finished - * a Test Script or Routine with Errors - */ activeTest = false; - TestResult[actualTest] = false; - TestIsFailed(actualTest); } } } @@ -160,9 +185,9 @@ namespace QUA_2475_designtest * corresponding Test and send the String afterwards * to CehckForKeyword to find specific Keyword */ - CheckForSlaveKeyword(new string(buffer)); - //TestMessage[actualTest] += new string(buffer); - //CheckForSlaveKeyword(TestMessage[actualTest]); +// CheckForSlaveKeyword(new string(buffer)); + TestMessage[actualTest] += new string(buffer); + CheckForSlaveKeyword(TestMessage[actualTest]); } nrOfBytes = com1.BytesToRead; /* Actualise Inputlength*/ } diff --git a/Tester/SW/designtest_control/QUA_2475_designtest/bin/Debug/QUA_2475_designtest.exe b/Tester/SW/designtest_control/QUA_2475_designtest/bin/Debug/QUA_2475_designtest.exe index c7c90d7..48353d3 100644 Binary files a/Tester/SW/designtest_control/QUA_2475_designtest/bin/Debug/QUA_2475_designtest.exe and b/Tester/SW/designtest_control/QUA_2475_designtest/bin/Debug/QUA_2475_designtest.exe differ diff --git a/Tester/SW/designtest_control/QUA_2475_designtest/bin/Debug/QUA_2475_designtest.pdb b/Tester/SW/designtest_control/QUA_2475_designtest/bin/Debug/QUA_2475_designtest.pdb index 2ac16db..b3bcf0a 100644 Binary files a/Tester/SW/designtest_control/QUA_2475_designtest/bin/Debug/QUA_2475_designtest.pdb and b/Tester/SW/designtest_control/QUA_2475_designtest/bin/Debug/QUA_2475_designtest.pdb differ diff --git a/Tester/SW/designtest_control/QUA_2475_designtest/initialisation.cs b/Tester/SW/designtest_control/QUA_2475_designtest/initialisation.cs index a4b216b..d67c70d 100644 --- a/Tester/SW/designtest_control/QUA_2475_designtest/initialisation.cs +++ b/Tester/SW/designtest_control/QUA_2475_designtest/initialisation.cs @@ -50,7 +50,7 @@ namespace QUA_2475_designtest Thread TestTimeoutThread; /* Test Timeout Thread */ /* INTEGER DEFINITION */ - const int NrOfTests = 15; /* Indicates number of single Test */ + const int NrOfTests = 23; /* Indicates number of single Test */ uint actualTest = 0; /* Indicates number of actual Test */ uint TotalTestNumber = 1; /* Number of total Tests */ uint TotalPassedNumber = 1; /* Number of passed Tests */ @@ -61,6 +61,10 @@ namespace QUA_2475_designtest private bool Master_receiveMessages = true; /* Allow COM2 to read */ private bool activeTest = false; /* Indicates an active Test */ private bool activeAutomatictest = false; /* autoTest is active */ + private bool AllTestResult; /* Shows the autoTest Result */ + private bool setRTC = false; + + /* ARRAY DEFINITION */ /* Array of all available Textboxes for Tests */ @@ -71,6 +75,10 @@ namespace QUA_2475_designtest public string[] Testfiles = new string[NrOfTests]; /* Array to contain each Test Result */ public bool[] TestResult = new bool[NrOfTests]; + /* Array to enable individual tests */ + public bool[] ActivateTest = new bool[NrOfTests]; + /* Array for all test messages of single Test */ + public string[] TestMessage = new String[NrOfTests]; private string MasterInputString; /* bound to T_MasterInput */ @@ -81,45 +89,58 @@ namespace QUA_2475_designtest */ public enum TestType { - MB_LED = 0, - MB_EEPROM = 1, - ETH1 = 2, - ETH0 = 3, - CF = 4, - USB = 5, - MB_DIO = 6, - MB_AIO = 7, - MB_RLY = 8, - CAN = 9, - EB_LED = 10, - EB_EEPROM = 11, - EB_DIO = 12, - EB_AIO = 13, - EB_RLY = 14 + VCC = 0, + VDDAT = 1, + VBAT = 2, + VCORE = 3, + TEMP = 4, + REVNUM = 5, + LED_MB = 6, + EEPROM_MB = 7, + ETH0 = 8, + ETH1 = 9, + USB = 10, + DIO_MB = 11, + AIO_MB = 12, + RLY_MB = 13, + LED_EB = 14, + EEPROM_EB = 15, + DIO_EB = 16, + AIO_EB = 17, + RLY_EB = 18, + CAL_AOMB = 19, + CAL_AIMB = 20, + CAL_AOEB = 21, + CAL_AIEB = 22 }; public void initialise() { - com1.PortName = "COM1"; /* Bind com1 to COM1 */ + com1.PortName = "COM9"; /* Bind com1 to COM1 */ com1.Open(); /* Open com1 */ com1.BaudRate = 115200; /* Set com1 Baudrate */ /* Capture corresponding Textboxes to TextBox Array */ - TestTextBoxes[(int)TestType.MB_LED] = T_test_MB_LED; - TestTextBoxes[(int)TestType.MB_EEPROM] = T_test_MB_EEPROM; - TestTextBoxes[(int)TestType.ETH1] = T_test_eth1; + TestTextBoxes[(int)TestType.VCC] = T_test_VCC; + TestTextBoxes[(int)TestType.VDDAT] = T_test_VDDAT; + TestTextBoxes[(int)TestType.VBAT] = T_test_VBAT; + TestTextBoxes[(int)TestType.VCORE] = T_test_VCORE; + TestTextBoxes[(int)TestType.TEMP] = T_test_TEMP; + TestTextBoxes[(int)TestType.REVNUM] = T_test_REVNUM; + TestTextBoxes[(int)TestType.LED_MB] = T_test_MB_LED; + TestTextBoxes[(int)TestType.EEPROM_MB] = T_test_MB_EEPROM; TestTextBoxes[(int)TestType.ETH0] = T_test_eth0; - TestTextBoxes[(int)TestType.CF] = T_test_CF; + TestTextBoxes[(int)TestType.ETH1] = T_test_eth1; TestTextBoxes[(int)TestType.USB] = T_test_USB; - TestTextBoxes[(int)TestType.MB_DIO] = T_test_MB_DIO; - TestTextBoxes[(int)TestType.MB_AIO] = T_test_MB_AIO; - TestTextBoxes[(int)TestType.MB_RLY] = T_test_MB_RLY; - TestTextBoxes[(int)TestType.CAN] = T_test_CAN; - TestTextBoxes[(int)TestType.EB_LED] = T_test_EB_LED; - TestTextBoxes[(int)TestType.EB_EEPROM] = T_test_EB_EEPROM; - TestTextBoxes[(int)TestType.EB_DIO] = T_test_EB_DIO; - TestTextBoxes[(int)TestType.EB_AIO] = T_test_EB_AIO; - TestTextBoxes[(int)TestType.EB_RLY] = T_test_EB_RLY; + TestTextBoxes[(int)TestType.DIO_MB] = T_test_MB_DIO; + TestTextBoxes[(int)TestType.AIO_MB] = T_test_MB_AIO; + TestTextBoxes[(int)TestType.RLY_MB] = T_test_MB_RLY; + TestTextBoxes[(int)TestType.LED_EB] = T_test_EB_LED; + TestTextBoxes[(int)TestType.EEPROM_EB] = T_test_EB_EEPROM; + TestTextBoxes[(int)TestType.DIO_EB] = T_test_EB_DIO; + TestTextBoxes[(int)TestType.AIO_EB] = T_test_EB_AIO; + TestTextBoxes[(int)TestType.RLY_EB] = T_test_EB_RLY; + /* Reset all Test Results */ TestResult[0] = false; @@ -137,28 +158,48 @@ namespace QUA_2475_designtest TestResult[12] = false; TestResult[13] = false; TestResult[14] = false; + TestResult[15] = false; + TestResult[16] = false; + TestResult[17] = false; + TestResult[18] = false; + TestResult[19] = false; + TestResult[20] = false; + TestResult[21] = false; + TestResult[22] = false; + /* Define Commands (path and filename) for test-script calls */ - TestCallCommands[0] = "ledtest 2\r"; - TestCallCommands[1] = "eeprom 2\r"; - TestCallCommands[2] = "\r"; - TestCallCommands[3] = "\r"; - TestCallCommands[4] = "\r"; - TestCallCommands[5] = "\r"; - TestCallCommands[6] = "dio 2\r"; - TestCallCommands[7] = "\r"; - TestCallCommands[8] = "\r"; - TestCallCommands[9] = "\r"; - TestCallCommands[10] = "\r"; - TestCallCommands[11] = "\r"; - TestCallCommands[12] = "\r"; - TestCallCommands[13] = "\r"; - TestCallCommands[14] = "\r"; + TestCallCommands[0] = "test_vcc 2\r"; + TestCallCommands[1] = "test_vddat 2\r"; + TestCallCommands[2] = "test_vbat 2\r"; + TestCallCommands[3] = "test_vcore 2\r"; + TestCallCommands[4] = "test_temp 2\r"; + TestCallCommands[5] = "test_revnum 2\r"; + TestCallCommands[6] = "test_led 2 0\r"; + TestCallCommands[7] = "test_eeprom 2 0\r"; + TestCallCommands[8] = "test_eth 2 0\r"; + TestCallCommands[9] = "test_eth 2 1\r"; + TestCallCommands[10] = "test_usb 2\r"; + TestCallCommands[11] = "test_dio 2 0\r"; + TestCallCommands[12] = "test_aio 2 0\r"; + TestCallCommands[13] = "test_rly 2 0\r"; + TestCallCommands[14] = "test_led 2 1\r"; + TestCallCommands[15] = "test_eeprom 2 1\r"; + TestCallCommands[16] = "test_dio 2 1\r"; + TestCallCommands[17] = "test_aio 2 1\r"; + TestCallCommands[18] = "test_rly 2 1\r"; + TestCallCommands[19] = "cslave 0\r"; + TestCallCommands[20] = "cslave 1\r"; + TestCallCommands[21] = "cslave 2\r"; + TestCallCommands[22] = "cslave 3\r"; + /* Define and start com1 reading Thread */ com1GetMessage = new Thread(new ThreadStart(com1_DataReceived)); com1GetMessage.Start(); + + } } } diff --git a/Tester/SW/designtest_control/QUA_2475_designtest/mainWindow.Designer.cs b/Tester/SW/designtest_control/QUA_2475_designtest/mainWindow.Designer.cs index 76008b9..29af6db 100644 --- a/Tester/SW/designtest_control/QUA_2475_designtest/mainWindow.Designer.cs +++ b/Tester/SW/designtest_control/QUA_2475_designtest/mainWindow.Designer.cs @@ -31,11 +31,39 @@ this.exit = new System.Windows.Forms.Button(); this.T_MasterOutput = new System.Windows.Forms.TextBox(); this.G_Tester = new System.Windows.Forms.GroupBox(); + this.B_master_ENTER = new System.Windows.Forms.Button(); + this.B_master_N = new System.Windows.Forms.Button(); + this.B_masterY = new System.Windows.Forms.Button(); + this.B_master_init = new System.Windows.Forms.Button(); this.L_master_input = new System.Windows.Forms.Label(); this.B_master_send = new System.Windows.Forms.Button(); this.T_MasterInput = new System.Windows.Forms.TextBox(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tab_control = new System.Windows.Forms.TabPage(); + this.L_test_REVNUM = new System.Windows.Forms.Label(); + this.T_test_REVNUM = new System.Windows.Forms.TextBox(); + this.C_test_REVNUM = new System.Windows.Forms.CheckBox(); + this.B_test_REVNUM = new System.Windows.Forms.Button(); + this.L_test_TEMP = new System.Windows.Forms.Label(); + this.T_test_TEMP = new System.Windows.Forms.TextBox(); + this.C_test_TEMP = new System.Windows.Forms.CheckBox(); + this.B_test_TEMP = new System.Windows.Forms.Button(); + this.L_test_VCORE = new System.Windows.Forms.Label(); + this.T_test_VCORE = new System.Windows.Forms.TextBox(); + this.C_test_VCORE = new System.Windows.Forms.CheckBox(); + this.B_test_VCORE = new System.Windows.Forms.Button(); + this.L_test_VBAT = new System.Windows.Forms.Label(); + this.T_test_VBAT = new System.Windows.Forms.TextBox(); + this.C_test_VBAT = new System.Windows.Forms.CheckBox(); + this.B_test_VBAT = new System.Windows.Forms.Button(); + this.L_test_VDDAT = new System.Windows.Forms.Label(); + this.T_test_VDDAT = new System.Windows.Forms.TextBox(); + this.C_test_VDDAT = new System.Windows.Forms.CheckBox(); + this.B_test_VDDAT = new System.Windows.Forms.Button(); + this.L_test_VCC = new System.Windows.Forms.Label(); + this.T_test_VCC = new System.Windows.Forms.TextBox(); + this.C_test_VCC = new System.Windows.Forms.CheckBox(); + this.B_test_VCC = new System.Windows.Forms.Button(); this.B_test_clear = new System.Windows.Forms.Button(); this.B_test_STOP = new System.Windows.Forms.Button(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); @@ -60,17 +88,9 @@ this.C_test_EB_LED = new System.Windows.Forms.CheckBox(); this.B_test_EB_EEPROM = new System.Windows.Forms.Button(); this.B_test_EB_LED = new System.Windows.Forms.Button(); - this.L_test_CAN = new System.Windows.Forms.Label(); - this.T_test_CAN = new System.Windows.Forms.TextBox(); - this.C_test_CAN = new System.Windows.Forms.CheckBox(); - this.B_test_CAN = new System.Windows.Forms.Button(); - this.L_test_CF = new System.Windows.Forms.Label(); this.L_test_USB = new System.Windows.Forms.Label(); - this.T_test_CF = new System.Windows.Forms.TextBox(); this.T_test_USB = new System.Windows.Forms.TextBox(); - this.C_test_CF = new System.Windows.Forms.CheckBox(); this.C_test_USB = new System.Windows.Forms.CheckBox(); - this.B_test_CF = new System.Windows.Forms.Button(); this.B_test_USB = new System.Windows.Forms.Button(); this.L_test_eth1 = new System.Windows.Forms.Label(); this.L_test_eth0 = new System.Windows.Forms.Label(); @@ -101,6 +121,12 @@ this.B_test_MB_EEPROM = new System.Windows.Forms.Button(); this.B_test_MB_LED = new System.Windows.Forms.Button(); this.tab_config = new System.Windows.Forms.TabPage(); + this.G_conf_calibration = new System.Windows.Forms.GroupBox(); + this.C_conf_cal_AIEB = new System.Windows.Forms.CheckBox(); + this.C_conf_cal_AOEB = new System.Windows.Forms.CheckBox(); + this.C_conf_cal_AIMB = new System.Windows.Forms.CheckBox(); + this.G_conf_settings = new System.Windows.Forms.GroupBox(); + this.C_conf_settings_RTC = new System.Windows.Forms.CheckBox(); this.G_conf_sect = new System.Windows.Forms.GroupBox(); this.L_conf_EB = new System.Windows.Forms.Label(); this.L_conf_MB = new System.Windows.Forms.Label(); @@ -120,10 +146,13 @@ this.L_stats_numberpassed = new System.Windows.Forms.Label(); this.L_stats_numberfailed = new System.Windows.Forms.Label(); this.L_stats_numbertotal = new System.Windows.Forms.Label(); + this.C_conf_cal_AOMB = new System.Windows.Forms.CheckBox(); this.G_Tester.SuspendLayout(); this.tabControl1.SuspendLayout(); this.tab_control.SuspendLayout(); this.tab_config.SuspendLayout(); + this.G_conf_calibration.SuspendLayout(); + this.G_conf_settings.SuspendLayout(); this.G_conf_sect.SuspendLayout(); this.G_conf_stat.SuspendLayout(); this.G_statistics.SuspendLayout(); @@ -152,6 +181,10 @@ // // G_Tester // + this.G_Tester.Controls.Add(this.B_master_ENTER); + this.G_Tester.Controls.Add(this.B_master_N); + this.G_Tester.Controls.Add(this.B_masterY); + this.G_Tester.Controls.Add(this.B_master_init); this.G_Tester.Controls.Add(this.L_master_input); this.G_Tester.Controls.Add(this.B_master_send); this.G_Tester.Controls.Add(this.T_MasterOutput); @@ -163,6 +196,46 @@ this.G_Tester.TabStop = false; this.G_Tester.Text = "Tester Communication"; // + // B_master_ENTER + // + this.B_master_ENTER.Location = new System.Drawing.Point(279, 568); + this.B_master_ENTER.Name = "B_master_ENTER"; + this.B_master_ENTER.Size = new System.Drawing.Size(83, 23); + this.B_master_ENTER.TabIndex = 8; + this.B_master_ENTER.Text = "send \'ENTER\'"; + this.B_master_ENTER.UseVisualStyleBackColor = true; + this.B_master_ENTER.Click += new System.EventHandler(this.B_master_ENTER_Click); + // + // B_master_N + // + this.B_master_N.Location = new System.Drawing.Point(173, 568); + this.B_master_N.Name = "B_master_N"; + this.B_master_N.Size = new System.Drawing.Size(75, 23); + this.B_master_N.TabIndex = 7; + this.B_master_N.Text = "send \'N\'"; + this.B_master_N.UseVisualStyleBackColor = true; + this.B_master_N.Click += new System.EventHandler(this.B_master_N_Click); + // + // B_masterY + // + this.B_masterY.Location = new System.Drawing.Point(173, 539); + this.B_masterY.Name = "B_masterY"; + this.B_masterY.Size = new System.Drawing.Size(75, 23); + this.B_masterY.TabIndex = 6; + this.B_masterY.Text = "send \'Y\'"; + this.B_masterY.UseVisualStyleBackColor = true; + this.B_masterY.Click += new System.EventHandler(this.B_masterY_Click); + // + // B_master_init + // + this.B_master_init.Location = new System.Drawing.Point(6, 568); + this.B_master_init.Name = "B_master_init"; + this.B_master_init.Size = new System.Drawing.Size(75, 23); + this.B_master_init.TabIndex = 5; + this.B_master_init.Text = "Init Tester"; + this.B_master_init.UseVisualStyleBackColor = true; + this.B_master_init.Click += new System.EventHandler(this.B_master_init_Click); + // // L_master_input // this.L_master_input.AutoSize = true; @@ -204,6 +277,30 @@ // tab_control // this.tab_control.BackColor = System.Drawing.SystemColors.Control; + this.tab_control.Controls.Add(this.L_test_REVNUM); + this.tab_control.Controls.Add(this.T_test_REVNUM); + this.tab_control.Controls.Add(this.C_test_REVNUM); + this.tab_control.Controls.Add(this.B_test_REVNUM); + this.tab_control.Controls.Add(this.L_test_TEMP); + this.tab_control.Controls.Add(this.T_test_TEMP); + this.tab_control.Controls.Add(this.C_test_TEMP); + this.tab_control.Controls.Add(this.B_test_TEMP); + this.tab_control.Controls.Add(this.L_test_VCORE); + this.tab_control.Controls.Add(this.T_test_VCORE); + this.tab_control.Controls.Add(this.C_test_VCORE); + this.tab_control.Controls.Add(this.B_test_VCORE); + this.tab_control.Controls.Add(this.L_test_VBAT); + this.tab_control.Controls.Add(this.T_test_VBAT); + this.tab_control.Controls.Add(this.C_test_VBAT); + this.tab_control.Controls.Add(this.B_test_VBAT); + this.tab_control.Controls.Add(this.L_test_VDDAT); + this.tab_control.Controls.Add(this.T_test_VDDAT); + this.tab_control.Controls.Add(this.C_test_VDDAT); + this.tab_control.Controls.Add(this.B_test_VDDAT); + this.tab_control.Controls.Add(this.L_test_VCC); + this.tab_control.Controls.Add(this.T_test_VCC); + this.tab_control.Controls.Add(this.C_test_VCC); + this.tab_control.Controls.Add(this.B_test_VCC); this.tab_control.Controls.Add(this.B_test_clear); this.tab_control.Controls.Add(this.B_test_STOP); this.tab_control.Controls.Add(this.progressBar1); @@ -228,17 +325,9 @@ this.tab_control.Controls.Add(this.C_test_EB_LED); this.tab_control.Controls.Add(this.B_test_EB_EEPROM); this.tab_control.Controls.Add(this.B_test_EB_LED); - this.tab_control.Controls.Add(this.L_test_CAN); - this.tab_control.Controls.Add(this.T_test_CAN); - this.tab_control.Controls.Add(this.C_test_CAN); - this.tab_control.Controls.Add(this.B_test_CAN); - this.tab_control.Controls.Add(this.L_test_CF); this.tab_control.Controls.Add(this.L_test_USB); - this.tab_control.Controls.Add(this.T_test_CF); this.tab_control.Controls.Add(this.T_test_USB); - this.tab_control.Controls.Add(this.C_test_CF); this.tab_control.Controls.Add(this.C_test_USB); - this.tab_control.Controls.Add(this.B_test_CF); this.tab_control.Controls.Add(this.B_test_USB); this.tab_control.Controls.Add(this.L_test_eth1); this.tab_control.Controls.Add(this.L_test_eth0); @@ -275,6 +364,240 @@ this.tab_control.TabIndex = 0; this.tab_control.Text = "Test Control"; // + // L_test_REVNUM + // + this.L_test_REVNUM.AutoSize = true; + this.L_test_REVNUM.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.L_test_REVNUM.Location = new System.Drawing.Point(5, 156); + this.L_test_REVNUM.Name = "L_test_REVNUM"; + this.L_test_REVNUM.Size = new System.Drawing.Size(64, 13); + this.L_test_REVNUM.TabIndex = 107; + this.L_test_REVNUM.Text = "REVNUM:"; + // + // T_test_REVNUM + // + this.T_test_REVNUM.Location = new System.Drawing.Point(122, 153); + this.T_test_REVNUM.Name = "T_test_REVNUM"; + this.T_test_REVNUM.Size = new System.Drawing.Size(74, 20); + this.T_test_REVNUM.TabIndex = 106; + this.T_test_REVNUM.Text = "untested"; + this.T_test_REVNUM.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // C_test_REVNUM + // + this.C_test_REVNUM.AutoSize = true; + this.C_test_REVNUM.Location = new System.Drawing.Point(217, 156); + this.C_test_REVNUM.Name = "C_test_REVNUM"; + this.C_test_REVNUM.Size = new System.Drawing.Size(15, 14); + this.C_test_REVNUM.TabIndex = 105; + this.C_test_REVNUM.UseVisualStyleBackColor = true; + this.C_test_REVNUM.CheckedChanged += new System.EventHandler(this.C_test_REVNUM_CheckedChanged); + // + // B_test_REVNUM + // + this.B_test_REVNUM.Location = new System.Drawing.Point(251, 151); + this.B_test_REVNUM.Name = "B_test_REVNUM"; + this.B_test_REVNUM.Size = new System.Drawing.Size(75, 23); + this.B_test_REVNUM.TabIndex = 104; + this.B_test_REVNUM.Text = "test now"; + this.B_test_REVNUM.UseVisualStyleBackColor = true; + this.B_test_REVNUM.Click += new System.EventHandler(this.B_test_REVNUM_Click); + // + // L_test_TEMP + // + this.L_test_TEMP.AutoSize = true; + this.L_test_TEMP.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.L_test_TEMP.Location = new System.Drawing.Point(5, 129); + this.L_test_TEMP.Name = "L_test_TEMP"; + this.L_test_TEMP.Size = new System.Drawing.Size(82, 13); + this.L_test_TEMP.TabIndex = 103; + this.L_test_TEMP.Text = "Temperature:"; + // + // T_test_TEMP + // + this.T_test_TEMP.Location = new System.Drawing.Point(122, 126); + this.T_test_TEMP.Name = "T_test_TEMP"; + this.T_test_TEMP.Size = new System.Drawing.Size(74, 20); + this.T_test_TEMP.TabIndex = 102; + this.T_test_TEMP.Text = "untested"; + this.T_test_TEMP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // C_test_TEMP + // + this.C_test_TEMP.AutoSize = true; + this.C_test_TEMP.Location = new System.Drawing.Point(217, 129); + this.C_test_TEMP.Name = "C_test_TEMP"; + this.C_test_TEMP.Size = new System.Drawing.Size(15, 14); + this.C_test_TEMP.TabIndex = 101; + this.C_test_TEMP.UseVisualStyleBackColor = true; + this.C_test_TEMP.CheckedChanged += new System.EventHandler(this.C_test_TEMP_CheckedChanged); + // + // B_test_TEMP + // + this.B_test_TEMP.Location = new System.Drawing.Point(251, 124); + this.B_test_TEMP.Name = "B_test_TEMP"; + this.B_test_TEMP.Size = new System.Drawing.Size(75, 23); + this.B_test_TEMP.TabIndex = 100; + this.B_test_TEMP.Text = "test now"; + this.B_test_TEMP.UseVisualStyleBackColor = true; + this.B_test_TEMP.Click += new System.EventHandler(this.B_test_TEMP_Click); + // + // L_test_VCORE + // + this.L_test_VCORE.AutoSize = true; + this.L_test_VCORE.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.L_test_VCORE.Location = new System.Drawing.Point(5, 102); + this.L_test_VCORE.Name = "L_test_VCORE"; + this.L_test_VCORE.Size = new System.Drawing.Size(53, 13); + this.L_test_VCORE.TabIndex = 99; + this.L_test_VCORE.Text = "VCORE:"; + // + // T_test_VCORE + // + this.T_test_VCORE.Location = new System.Drawing.Point(122, 99); + this.T_test_VCORE.Name = "T_test_VCORE"; + this.T_test_VCORE.Size = new System.Drawing.Size(74, 20); + this.T_test_VCORE.TabIndex = 98; + this.T_test_VCORE.Text = "untested"; + this.T_test_VCORE.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // C_test_VCORE + // + this.C_test_VCORE.AutoSize = true; + this.C_test_VCORE.Location = new System.Drawing.Point(217, 102); + this.C_test_VCORE.Name = "C_test_VCORE"; + this.C_test_VCORE.Size = new System.Drawing.Size(15, 14); + this.C_test_VCORE.TabIndex = 97; + this.C_test_VCORE.UseVisualStyleBackColor = true; + this.C_test_VCORE.CheckedChanged += new System.EventHandler(this.C_test_VCORE_CheckedChanged); + // + // B_test_VCORE + // + this.B_test_VCORE.Location = new System.Drawing.Point(251, 97); + this.B_test_VCORE.Name = "B_test_VCORE"; + this.B_test_VCORE.Size = new System.Drawing.Size(75, 23); + this.B_test_VCORE.TabIndex = 96; + this.B_test_VCORE.Text = "test now"; + this.B_test_VCORE.UseVisualStyleBackColor = true; + this.B_test_VCORE.Click += new System.EventHandler(this.B_test_VCORE_Click); + // + // L_test_VBAT + // + this.L_test_VBAT.AutoSize = true; + this.L_test_VBAT.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.L_test_VBAT.Location = new System.Drawing.Point(5, 72); + this.L_test_VBAT.Name = "L_test_VBAT"; + this.L_test_VBAT.Size = new System.Drawing.Size(43, 13); + this.L_test_VBAT.TabIndex = 95; + this.L_test_VBAT.Text = "VBAT:"; + // + // T_test_VBAT + // + this.T_test_VBAT.Location = new System.Drawing.Point(122, 69); + this.T_test_VBAT.Name = "T_test_VBAT"; + this.T_test_VBAT.Size = new System.Drawing.Size(74, 20); + this.T_test_VBAT.TabIndex = 94; + this.T_test_VBAT.Text = "untested"; + this.T_test_VBAT.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // C_test_VBAT + // + this.C_test_VBAT.AutoSize = true; + this.C_test_VBAT.Location = new System.Drawing.Point(217, 72); + this.C_test_VBAT.Name = "C_test_VBAT"; + this.C_test_VBAT.Size = new System.Drawing.Size(15, 14); + this.C_test_VBAT.TabIndex = 93; + this.C_test_VBAT.UseVisualStyleBackColor = true; + this.C_test_VBAT.CheckedChanged += new System.EventHandler(this.C_test_VBAT_CheckedChanged); + // + // B_test_VBAT + // + this.B_test_VBAT.Location = new System.Drawing.Point(251, 67); + this.B_test_VBAT.Name = "B_test_VBAT"; + this.B_test_VBAT.Size = new System.Drawing.Size(75, 23); + this.B_test_VBAT.TabIndex = 92; + this.B_test_VBAT.Text = "test now"; + this.B_test_VBAT.UseVisualStyleBackColor = true; + this.B_test_VBAT.Click += new System.EventHandler(this.B_test_VBAT_Click); + // + // L_test_VDDAT + // + this.L_test_VDDAT.AutoSize = true; + this.L_test_VDDAT.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.L_test_VDDAT.Location = new System.Drawing.Point(5, 43); + this.L_test_VDDAT.Name = "L_test_VDDAT"; + this.L_test_VDDAT.Size = new System.Drawing.Size(53, 13); + this.L_test_VDDAT.TabIndex = 91; + this.L_test_VDDAT.Text = "VDDAT:"; + // + // T_test_VDDAT + // + this.T_test_VDDAT.Location = new System.Drawing.Point(122, 40); + this.T_test_VDDAT.Name = "T_test_VDDAT"; + this.T_test_VDDAT.Size = new System.Drawing.Size(74, 20); + this.T_test_VDDAT.TabIndex = 90; + this.T_test_VDDAT.Text = "untested"; + this.T_test_VDDAT.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // C_test_VDDAT + // + this.C_test_VDDAT.AutoSize = true; + this.C_test_VDDAT.Location = new System.Drawing.Point(217, 43); + this.C_test_VDDAT.Name = "C_test_VDDAT"; + this.C_test_VDDAT.Size = new System.Drawing.Size(15, 14); + this.C_test_VDDAT.TabIndex = 89; + this.C_test_VDDAT.UseVisualStyleBackColor = true; + this.C_test_VDDAT.CheckedChanged += new System.EventHandler(this.C_test_VDDAT_CheckedChanged); + // + // B_test_VDDAT + // + this.B_test_VDDAT.Location = new System.Drawing.Point(251, 38); + this.B_test_VDDAT.Name = "B_test_VDDAT"; + this.B_test_VDDAT.Size = new System.Drawing.Size(75, 23); + this.B_test_VDDAT.TabIndex = 88; + this.B_test_VDDAT.Text = "test now"; + this.B_test_VDDAT.UseVisualStyleBackColor = true; + this.B_test_VDDAT.Click += new System.EventHandler(this.B_test_VDDAT_Click); + // + // L_test_VCC + // + this.L_test_VCC.AutoSize = true; + this.L_test_VCC.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.L_test_VCC.Location = new System.Drawing.Point(5, 15); + this.L_test_VCC.Name = "L_test_VCC"; + this.L_test_VCC.Size = new System.Drawing.Size(35, 13); + this.L_test_VCC.TabIndex = 87; + this.L_test_VCC.Text = "VCC:"; + // + // T_test_VCC + // + this.T_test_VCC.Location = new System.Drawing.Point(122, 12); + this.T_test_VCC.Name = "T_test_VCC"; + this.T_test_VCC.Size = new System.Drawing.Size(74, 20); + this.T_test_VCC.TabIndex = 86; + this.T_test_VCC.Text = "untested"; + this.T_test_VCC.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // C_test_VCC + // + this.C_test_VCC.AutoSize = true; + this.C_test_VCC.Location = new System.Drawing.Point(217, 15); + this.C_test_VCC.Name = "C_test_VCC"; + this.C_test_VCC.Size = new System.Drawing.Size(15, 14); + this.C_test_VCC.TabIndex = 85; + this.C_test_VCC.UseVisualStyleBackColor = true; + this.C_test_VCC.CheckedChanged += new System.EventHandler(this.C_test_VCC_CheckedChanged); + // + // B_test_VCC + // + this.B_test_VCC.Location = new System.Drawing.Point(251, 10); + this.B_test_VCC.Name = "B_test_VCC"; + this.B_test_VCC.Size = new System.Drawing.Size(75, 23); + this.B_test_VCC.TabIndex = 84; + this.B_test_VCC.Text = "test now"; + this.B_test_VCC.UseVisualStyleBackColor = true; + this.B_test_VCC.Click += new System.EventHandler(this.B_test_VCC_Click); + // // B_test_clear // this.B_test_clear.Font = new System.Drawing.Font("SansSerif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(2))); @@ -295,6 +618,7 @@ this.B_test_STOP.TabIndex = 62; this.B_test_STOP.Text = "STOP"; this.B_test_STOP.UseVisualStyleBackColor = true; + this.B_test_STOP.Click += new System.EventHandler(this.B_test_STOP_Click); // // progressBar1 // @@ -312,40 +636,41 @@ this.B_test_TESTALL.TabIndex = 60; this.B_test_TESTALL.Text = "TEST ALL"; this.B_test_TESTALL.UseVisualStyleBackColor = true; + this.B_test_TESTALL.Click += new System.EventHandler(this.B_test_TESTALL_Click); // // L_test_EB_RLY // this.L_test_EB_RLY.AutoSize = true; this.L_test_EB_RLY.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.L_test_EB_RLY.Location = new System.Drawing.Point(5, 515); + this.L_test_EB_RLY.Location = new System.Drawing.Point(5, 541); this.L_test_EB_RLY.Name = "L_test_EB_RLY"; - this.L_test_EB_RLY.Size = new System.Drawing.Size(43, 13); + this.L_test_EB_RLY.Size = new System.Drawing.Size(66, 13); this.L_test_EB_RLY.TabIndex = 59; - this.L_test_EB_RLY.Text = "Relay:"; + this.L_test_EB_RLY.Text = "Relay_EB:"; // // L_test_EB_AIO // this.L_test_EB_AIO.AutoSize = true; this.L_test_EB_AIO.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.L_test_EB_AIO.Location = new System.Drawing.Point(6, 486); + this.L_test_EB_AIO.Location = new System.Drawing.Point(5, 512); this.L_test_EB_AIO.Name = "L_test_EB_AIO"; - this.L_test_EB_AIO.Size = new System.Drawing.Size(64, 13); + this.L_test_EB_AIO.Size = new System.Drawing.Size(87, 13); this.L_test_EB_AIO.TabIndex = 58; - this.L_test_EB_AIO.Text = "Analogue:"; + this.L_test_EB_AIO.Text = "Analogue_EB:"; // // L_test_EB_DIO // this.L_test_EB_DIO.AutoSize = true; this.L_test_EB_DIO.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.L_test_EB_DIO.Location = new System.Drawing.Point(6, 457); + this.L_test_EB_DIO.Location = new System.Drawing.Point(5, 483); this.L_test_EB_DIO.Name = "L_test_EB_DIO"; - this.L_test_EB_DIO.Size = new System.Drawing.Size(47, 13); + this.L_test_EB_DIO.Size = new System.Drawing.Size(70, 13); this.L_test_EB_DIO.TabIndex = 57; - this.L_test_EB_DIO.Text = "Digital:"; + this.L_test_EB_DIO.Text = "Digital_EB:"; // // T_test_EB_RLY // - this.T_test_EB_RLY.Location = new System.Drawing.Point(120, 512); + this.T_test_EB_RLY.Location = new System.Drawing.Point(122, 538); this.T_test_EB_RLY.Name = "T_test_EB_RLY"; this.T_test_EB_RLY.Size = new System.Drawing.Size(74, 20); this.T_test_EB_RLY.TabIndex = 56; @@ -354,7 +679,7 @@ // // T_test_EB_AIO // - this.T_test_EB_AIO.Location = new System.Drawing.Point(121, 483); + this.T_test_EB_AIO.Location = new System.Drawing.Point(122, 509); this.T_test_EB_AIO.Name = "T_test_EB_AIO"; this.T_test_EB_AIO.Size = new System.Drawing.Size(74, 20); this.T_test_EB_AIO.TabIndex = 55; @@ -363,9 +688,9 @@ // // T_test_EB_DIO // - this.T_test_EB_DIO.Location = new System.Drawing.Point(120, 454); + this.T_test_EB_DIO.Location = new System.Drawing.Point(121, 480); this.T_test_EB_DIO.Name = "T_test_EB_DIO"; - this.T_test_EB_DIO.Size = new System.Drawing.Size(75, 20); + this.T_test_EB_DIO.Size = new System.Drawing.Size(74, 20); this.T_test_EB_DIO.TabIndex = 54; this.T_test_EB_DIO.Text = "untested"; this.T_test_EB_DIO.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -373,33 +698,36 @@ // C_test_EB_RLY // this.C_test_EB_RLY.AutoSize = true; - this.C_test_EB_RLY.Location = new System.Drawing.Point(217, 515); + this.C_test_EB_RLY.Location = new System.Drawing.Point(217, 541); this.C_test_EB_RLY.Name = "C_test_EB_RLY"; this.C_test_EB_RLY.Size = new System.Drawing.Size(15, 14); this.C_test_EB_RLY.TabIndex = 53; this.C_test_EB_RLY.UseVisualStyleBackColor = true; + this.C_test_EB_RLY.CheckedChanged += new System.EventHandler(this.C_test_EB_RLY_CheckedChanged); // // C_test_EB_AIO // this.C_test_EB_AIO.AutoSize = true; - this.C_test_EB_AIO.Location = new System.Drawing.Point(217, 486); + this.C_test_EB_AIO.Location = new System.Drawing.Point(217, 512); this.C_test_EB_AIO.Name = "C_test_EB_AIO"; this.C_test_EB_AIO.Size = new System.Drawing.Size(15, 14); this.C_test_EB_AIO.TabIndex = 52; this.C_test_EB_AIO.UseVisualStyleBackColor = true; + this.C_test_EB_AIO.CheckedChanged += new System.EventHandler(this.C_test_EB_AIO_CheckedChanged); // // C_test_EB_DIO // this.C_test_EB_DIO.AutoSize = true; - this.C_test_EB_DIO.Location = new System.Drawing.Point(217, 457); + this.C_test_EB_DIO.Location = new System.Drawing.Point(217, 483); this.C_test_EB_DIO.Name = "C_test_EB_DIO"; this.C_test_EB_DIO.Size = new System.Drawing.Size(15, 14); this.C_test_EB_DIO.TabIndex = 51; this.C_test_EB_DIO.UseVisualStyleBackColor = true; + this.C_test_EB_DIO.CheckedChanged += new System.EventHandler(this.C_test_EB_DIO_CheckedChanged); // // B_test_EB_RLY // - this.B_test_EB_RLY.Location = new System.Drawing.Point(249, 510); + this.B_test_EB_RLY.Location = new System.Drawing.Point(251, 536); this.B_test_EB_RLY.Name = "B_test_EB_RLY"; this.B_test_EB_RLY.Size = new System.Drawing.Size(75, 23); this.B_test_EB_RLY.TabIndex = 50; @@ -409,7 +737,7 @@ // // B_test_EB_AIO // - this.B_test_EB_AIO.Location = new System.Drawing.Point(249, 481); + this.B_test_EB_AIO.Location = new System.Drawing.Point(251, 507); this.B_test_EB_AIO.Name = "B_test_EB_AIO"; this.B_test_EB_AIO.Size = new System.Drawing.Size(75, 23); this.B_test_EB_AIO.TabIndex = 49; @@ -419,7 +747,7 @@ // // B_test_EB_DIO // - this.B_test_EB_DIO.Location = new System.Drawing.Point(249, 452); + this.B_test_EB_DIO.Location = new System.Drawing.Point(251, 478); this.B_test_EB_DIO.Name = "B_test_EB_DIO"; this.B_test_EB_DIO.Size = new System.Drawing.Size(75, 23); this.B_test_EB_DIO.TabIndex = 48; @@ -431,36 +759,36 @@ // this.L_test_EB_EEPROM.AutoSize = true; this.L_test_EB_EEPROM.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.L_test_EB_EEPROM.Location = new System.Drawing.Point(6, 415); + this.L_test_EB_EEPROM.Location = new System.Drawing.Point(5, 454); this.L_test_EB_EEPROM.Name = "L_test_EB_EEPROM"; - this.L_test_EB_EEPROM.Size = new System.Drawing.Size(63, 13); + this.L_test_EB_EEPROM.Size = new System.Drawing.Size(86, 13); this.L_test_EB_EEPROM.TabIndex = 47; - this.L_test_EB_EEPROM.Text = "EEPROM:"; + this.L_test_EB_EEPROM.Text = "EEPROM_EB:"; // // L_test_EB_LED // this.L_test_EB_LED.AutoSize = true; this.L_test_EB_LED.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.L_test_EB_LED.Location = new System.Drawing.Point(6, 386); + this.L_test_EB_LED.Location = new System.Drawing.Point(5, 425); this.L_test_EB_LED.Name = "L_test_EB_LED"; - this.L_test_EB_LED.Size = new System.Drawing.Size(35, 13); + this.L_test_EB_LED.Size = new System.Drawing.Size(58, 13); this.L_test_EB_LED.TabIndex = 46; - this.L_test_EB_LED.Text = "LED:"; + this.L_test_EB_LED.Text = "LED_EB:"; // // T_test_EB_EEPROM // - this.T_test_EB_EEPROM.Location = new System.Drawing.Point(118, 412); + this.T_test_EB_EEPROM.Location = new System.Drawing.Point(121, 451); this.T_test_EB_EEPROM.Name = "T_test_EB_EEPROM"; - this.T_test_EB_EEPROM.Size = new System.Drawing.Size(75, 20); + this.T_test_EB_EEPROM.Size = new System.Drawing.Size(74, 20); this.T_test_EB_EEPROM.TabIndex = 45; this.T_test_EB_EEPROM.Text = "untested"; this.T_test_EB_EEPROM.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // T_test_EB_LED // - this.T_test_EB_LED.Location = new System.Drawing.Point(119, 383); + this.T_test_EB_LED.Location = new System.Drawing.Point(121, 422); this.T_test_EB_LED.Name = "T_test_EB_LED"; - this.T_test_EB_LED.Size = new System.Drawing.Size(75, 20); + this.T_test_EB_LED.Size = new System.Drawing.Size(74, 20); this.T_test_EB_LED.TabIndex = 44; this.T_test_EB_LED.Text = "untested"; this.T_test_EB_LED.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -468,24 +796,26 @@ // C_test_EB_EEPROM // this.C_test_EB_EEPROM.AutoSize = true; - this.C_test_EB_EEPROM.Location = new System.Drawing.Point(217, 415); + this.C_test_EB_EEPROM.Location = new System.Drawing.Point(217, 454); this.C_test_EB_EEPROM.Name = "C_test_EB_EEPROM"; this.C_test_EB_EEPROM.Size = new System.Drawing.Size(15, 14); this.C_test_EB_EEPROM.TabIndex = 43; this.C_test_EB_EEPROM.UseVisualStyleBackColor = true; + this.C_test_EB_EEPROM.CheckedChanged += new System.EventHandler(this.C_test_EB_EEPROM_CheckedChanged); // // C_test_EB_LED // this.C_test_EB_LED.AutoSize = true; - this.C_test_EB_LED.Location = new System.Drawing.Point(217, 386); + this.C_test_EB_LED.Location = new System.Drawing.Point(217, 425); this.C_test_EB_LED.Name = "C_test_EB_LED"; this.C_test_EB_LED.Size = new System.Drawing.Size(15, 14); this.C_test_EB_LED.TabIndex = 42; this.C_test_EB_LED.UseVisualStyleBackColor = true; + this.C_test_EB_LED.CheckedChanged += new System.EventHandler(this.C_test_EB_LED_CheckedChanged); // // B_test_EB_EEPROM // - this.B_test_EB_EEPROM.Location = new System.Drawing.Point(249, 410); + this.B_test_EB_EEPROM.Location = new System.Drawing.Point(251, 449); this.B_test_EB_EEPROM.Name = "B_test_EB_EEPROM"; this.B_test_EB_EEPROM.Size = new System.Drawing.Size(75, 23); this.B_test_EB_EEPROM.TabIndex = 41; @@ -495,7 +825,7 @@ // // B_test_EB_LED // - this.B_test_EB_LED.Location = new System.Drawing.Point(249, 381); + this.B_test_EB_LED.Location = new System.Drawing.Point(251, 420); this.B_test_EB_LED.Name = "B_test_EB_LED"; this.B_test_EB_LED.Size = new System.Drawing.Size(75, 23); this.B_test_EB_LED.TabIndex = 40; @@ -503,113 +833,38 @@ this.B_test_EB_LED.UseVisualStyleBackColor = true; this.B_test_EB_LED.Click += new System.EventHandler(this.B_test_EB_LED_Click); // - // L_test_CAN - // - this.L_test_CAN.AutoSize = true; - this.L_test_CAN.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.L_test_CAN.Location = new System.Drawing.Point(3, 320); - this.L_test_CAN.Name = "L_test_CAN"; - this.L_test_CAN.Size = new System.Drawing.Size(36, 13); - this.L_test_CAN.TabIndex = 39; - this.L_test_CAN.Text = "CAN:"; - // - // T_test_CAN - // - this.T_test_CAN.Location = new System.Drawing.Point(120, 317); - this.T_test_CAN.Name = "T_test_CAN"; - this.T_test_CAN.Size = new System.Drawing.Size(74, 20); - this.T_test_CAN.TabIndex = 38; - this.T_test_CAN.Text = "untested"; - this.T_test_CAN.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // C_test_CAN - // - this.C_test_CAN.AutoSize = true; - this.C_test_CAN.Location = new System.Drawing.Point(217, 320); - this.C_test_CAN.Name = "C_test_CAN"; - this.C_test_CAN.Size = new System.Drawing.Size(15, 14); - this.C_test_CAN.TabIndex = 37; - this.C_test_CAN.UseVisualStyleBackColor = true; - // - // B_test_CAN - // - this.B_test_CAN.Location = new System.Drawing.Point(249, 315); - this.B_test_CAN.Name = "B_test_CAN"; - this.B_test_CAN.Size = new System.Drawing.Size(75, 23); - this.B_test_CAN.TabIndex = 36; - this.B_test_CAN.Text = "test now"; - this.B_test_CAN.UseVisualStyleBackColor = true; - this.B_test_CAN.Click += new System.EventHandler(this.B_test_CAN_Click); - // - // L_test_CF - // - this.L_test_CF.AutoSize = true; - this.L_test_CF.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.L_test_CF.Location = new System.Drawing.Point(6, 164); - this.L_test_CF.Name = "L_test_CF"; - this.L_test_CF.Size = new System.Drawing.Size(90, 13); - this.L_test_CF.TabIndex = 35; - this.L_test_CF.Text = "CompactFlash:"; - // // L_test_USB // this.L_test_USB.AutoSize = true; this.L_test_USB.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.L_test_USB.Location = new System.Drawing.Point(5, 193); + this.L_test_USB.Location = new System.Drawing.Point(5, 307); this.L_test_USB.Name = "L_test_USB"; this.L_test_USB.Size = new System.Drawing.Size(64, 13); this.L_test_USB.TabIndex = 34; this.L_test_USB.Text = "USB host:"; // - // T_test_CF - // - this.T_test_CF.Location = new System.Drawing.Point(119, 161); - this.T_test_CF.Name = "T_test_CF"; - this.T_test_CF.Size = new System.Drawing.Size(74, 20); - this.T_test_CF.TabIndex = 33; - this.T_test_CF.Text = "untested"; - this.T_test_CF.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // // T_test_USB // - this.T_test_USB.Location = new System.Drawing.Point(119, 190); + this.T_test_USB.Location = new System.Drawing.Point(122, 304); this.T_test_USB.Name = "T_test_USB"; this.T_test_USB.Size = new System.Drawing.Size(74, 20); this.T_test_USB.TabIndex = 32; this.T_test_USB.Text = "untested"; this.T_test_USB.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // C_test_CF - // - this.C_test_CF.AutoSize = true; - this.C_test_CF.Location = new System.Drawing.Point(217, 164); - this.C_test_CF.Name = "C_test_CF"; - this.C_test_CF.Size = new System.Drawing.Size(15, 14); - this.C_test_CF.TabIndex = 31; - this.C_test_CF.UseVisualStyleBackColor = true; - // // C_test_USB // this.C_test_USB.AutoSize = true; - this.C_test_USB.Location = new System.Drawing.Point(217, 193); + this.C_test_USB.Location = new System.Drawing.Point(217, 307); this.C_test_USB.Name = "C_test_USB"; this.C_test_USB.Size = new System.Drawing.Size(15, 14); this.C_test_USB.TabIndex = 30; this.C_test_USB.UseVisualStyleBackColor = true; - // - // B_test_CF - // - this.B_test_CF.Location = new System.Drawing.Point(249, 159); - this.B_test_CF.Name = "B_test_CF"; - this.B_test_CF.Size = new System.Drawing.Size(75, 23); - this.B_test_CF.TabIndex = 29; - this.B_test_CF.Text = "test now"; - this.B_test_CF.UseVisualStyleBackColor = true; - this.B_test_CF.Click += new System.EventHandler(this.B_test_CF_Click); + this.C_test_USB.CheckedChanged += new System.EventHandler(this.C_test_USB_CheckedChanged); // // B_test_USB // - this.B_test_USB.Location = new System.Drawing.Point(249, 188); + this.B_test_USB.Location = new System.Drawing.Point(251, 302); this.B_test_USB.Name = "B_test_USB"; this.B_test_USB.Size = new System.Drawing.Size(75, 23); this.B_test_USB.TabIndex = 28; @@ -621,7 +876,7 @@ // this.L_test_eth1.AutoSize = true; this.L_test_eth1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.L_test_eth1.Location = new System.Drawing.Point(3, 125); + this.L_test_eth1.Location = new System.Drawing.Point(5, 277); this.L_test_eth1.Name = "L_test_eth1"; this.L_test_eth1.Size = new System.Drawing.Size(97, 13); this.L_test_eth1.TabIndex = 27; @@ -631,7 +886,7 @@ // this.L_test_eth0.AutoSize = true; this.L_test_eth0.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.L_test_eth0.Location = new System.Drawing.Point(3, 97); + this.L_test_eth0.Location = new System.Drawing.Point(5, 249); this.L_test_eth0.Name = "L_test_eth0"; this.L_test_eth0.Size = new System.Drawing.Size(99, 13); this.L_test_eth0.TabIndex = 26; @@ -639,7 +894,7 @@ // // T_test_eth1 // - this.T_test_eth1.Location = new System.Drawing.Point(120, 122); + this.T_test_eth1.Location = new System.Drawing.Point(122, 274); this.T_test_eth1.Name = "T_test_eth1"; this.T_test_eth1.Size = new System.Drawing.Size(74, 20); this.T_test_eth1.TabIndex = 25; @@ -648,7 +903,7 @@ // // T_test_eth0 // - this.T_test_eth0.Location = new System.Drawing.Point(120, 93); + this.T_test_eth0.Location = new System.Drawing.Point(122, 245); this.T_test_eth0.Name = "T_test_eth0"; this.T_test_eth0.Size = new System.Drawing.Size(74, 20); this.T_test_eth0.TabIndex = 24; @@ -658,24 +913,26 @@ // C_test_eth1 // this.C_test_eth1.AutoSize = true; - this.C_test_eth1.Location = new System.Drawing.Point(217, 125); + this.C_test_eth1.Location = new System.Drawing.Point(217, 277); this.C_test_eth1.Name = "C_test_eth1"; this.C_test_eth1.Size = new System.Drawing.Size(15, 14); this.C_test_eth1.TabIndex = 23; this.C_test_eth1.UseVisualStyleBackColor = true; + this.C_test_eth1.CheckedChanged += new System.EventHandler(this.C_test_eth1_CheckedChanged); // // C_test_eth0 // this.C_test_eth0.AutoSize = true; - this.C_test_eth0.Location = new System.Drawing.Point(217, 96); + this.C_test_eth0.Location = new System.Drawing.Point(217, 248); this.C_test_eth0.Name = "C_test_eth0"; this.C_test_eth0.Size = new System.Drawing.Size(15, 14); this.C_test_eth0.TabIndex = 22; this.C_test_eth0.UseVisualStyleBackColor = true; + this.C_test_eth0.CheckedChanged += new System.EventHandler(this.C_test_eth0_CheckedChanged); // // B_test_eth1 // - this.B_test_eth1.Location = new System.Drawing.Point(249, 120); + this.B_test_eth1.Location = new System.Drawing.Point(251, 272); this.B_test_eth1.Name = "B_test_eth1"; this.B_test_eth1.Size = new System.Drawing.Size(75, 23); this.B_test_eth1.TabIndex = 21; @@ -685,7 +942,7 @@ // // B_test_eth0 // - this.B_test_eth0.Location = new System.Drawing.Point(249, 91); + this.B_test_eth0.Location = new System.Drawing.Point(251, 243); this.B_test_eth0.Name = "B_test_eth0"; this.B_test_eth0.Size = new System.Drawing.Size(75, 23); this.B_test_eth0.TabIndex = 20; @@ -697,7 +954,7 @@ // this.L_test_MB_RLY.AutoSize = true; this.L_test_MB_RLY.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.L_test_MB_RLY.Location = new System.Drawing.Point(3, 291); + this.L_test_MB_RLY.Location = new System.Drawing.Point(5, 395); this.L_test_MB_RLY.Name = "L_test_MB_RLY"; this.L_test_MB_RLY.Size = new System.Drawing.Size(43, 13); this.L_test_MB_RLY.TabIndex = 19; @@ -707,7 +964,7 @@ // this.L_test_MB_AIO.AutoSize = true; this.L_test_MB_AIO.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.L_test_MB_AIO.Location = new System.Drawing.Point(6, 262); + this.L_test_MB_AIO.Location = new System.Drawing.Point(5, 366); this.L_test_MB_AIO.Name = "L_test_MB_AIO"; this.L_test_MB_AIO.Size = new System.Drawing.Size(64, 13); this.L_test_MB_AIO.TabIndex = 18; @@ -717,7 +974,7 @@ // this.L_test_MB_DIO.AutoSize = true; this.L_test_MB_DIO.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.L_test_MB_DIO.Location = new System.Drawing.Point(6, 233); + this.L_test_MB_DIO.Location = new System.Drawing.Point(5, 337); this.L_test_MB_DIO.Name = "L_test_MB_DIO"; this.L_test_MB_DIO.Size = new System.Drawing.Size(47, 13); this.L_test_MB_DIO.TabIndex = 17; @@ -727,7 +984,7 @@ // this.L_test_MB_EEPROM.AutoSize = true; this.L_test_MB_EEPROM.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.L_test_MB_EEPROM.Location = new System.Drawing.Point(6, 57); + this.L_test_MB_EEPROM.Location = new System.Drawing.Point(5, 217); this.L_test_MB_EEPROM.Name = "L_test_MB_EEPROM"; this.L_test_MB_EEPROM.Size = new System.Drawing.Size(63, 13); this.L_test_MB_EEPROM.TabIndex = 16; @@ -737,7 +994,7 @@ // this.L_test_MB_LED.AutoSize = true; this.L_test_MB_LED.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.L_test_MB_LED.Location = new System.Drawing.Point(6, 28); + this.L_test_MB_LED.Location = new System.Drawing.Point(5, 188); this.L_test_MB_LED.Name = "L_test_MB_LED"; this.L_test_MB_LED.Size = new System.Drawing.Size(35, 13); this.L_test_MB_LED.TabIndex = 15; @@ -745,7 +1002,7 @@ // // T_test_MB_RLY // - this.T_test_MB_RLY.Location = new System.Drawing.Point(120, 288); + this.T_test_MB_RLY.Location = new System.Drawing.Point(122, 391); this.T_test_MB_RLY.Name = "T_test_MB_RLY"; this.T_test_MB_RLY.Size = new System.Drawing.Size(74, 20); this.T_test_MB_RLY.TabIndex = 14; @@ -754,7 +1011,7 @@ // // T_test_MB_AIO // - this.T_test_MB_AIO.Location = new System.Drawing.Point(121, 259); + this.T_test_MB_AIO.Location = new System.Drawing.Point(122, 363); this.T_test_MB_AIO.Name = "T_test_MB_AIO"; this.T_test_MB_AIO.Size = new System.Drawing.Size(74, 20); this.T_test_MB_AIO.TabIndex = 13; @@ -763,27 +1020,27 @@ // // T_test_MB_EEPROM // - this.T_test_MB_EEPROM.Location = new System.Drawing.Point(118, 54); + this.T_test_MB_EEPROM.Location = new System.Drawing.Point(121, 214); this.T_test_MB_EEPROM.Name = "T_test_MB_EEPROM"; - this.T_test_MB_EEPROM.Size = new System.Drawing.Size(75, 20); + this.T_test_MB_EEPROM.Size = new System.Drawing.Size(74, 20); this.T_test_MB_EEPROM.TabIndex = 12; this.T_test_MB_EEPROM.Text = "untested"; this.T_test_MB_EEPROM.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // T_test_MB_DIO // - this.T_test_MB_DIO.Location = new System.Drawing.Point(120, 230); + this.T_test_MB_DIO.Location = new System.Drawing.Point(121, 332); this.T_test_MB_DIO.Name = "T_test_MB_DIO"; - this.T_test_MB_DIO.Size = new System.Drawing.Size(75, 20); + this.T_test_MB_DIO.Size = new System.Drawing.Size(74, 20); this.T_test_MB_DIO.TabIndex = 11; this.T_test_MB_DIO.Text = "untested"; this.T_test_MB_DIO.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // T_test_MB_LED // - this.T_test_MB_LED.Location = new System.Drawing.Point(119, 25); + this.T_test_MB_LED.Location = new System.Drawing.Point(121, 183); this.T_test_MB_LED.Name = "T_test_MB_LED"; - this.T_test_MB_LED.Size = new System.Drawing.Size(75, 20); + this.T_test_MB_LED.Size = new System.Drawing.Size(74, 20); this.T_test_MB_LED.TabIndex = 10; this.T_test_MB_LED.Text = "untested"; this.T_test_MB_LED.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -791,51 +1048,56 @@ // C_test_MB_RLY // this.C_test_MB_RLY.AutoSize = true; - this.C_test_MB_RLY.Location = new System.Drawing.Point(217, 291); + this.C_test_MB_RLY.Location = new System.Drawing.Point(217, 395); this.C_test_MB_RLY.Name = "C_test_MB_RLY"; this.C_test_MB_RLY.Size = new System.Drawing.Size(15, 14); this.C_test_MB_RLY.TabIndex = 9; this.C_test_MB_RLY.UseVisualStyleBackColor = true; + this.C_test_MB_RLY.CheckedChanged += new System.EventHandler(this.C_test_MB_RLY_CheckedChanged); // // C_test_MB_AIO // this.C_test_MB_AIO.AutoSize = true; - this.C_test_MB_AIO.Location = new System.Drawing.Point(217, 262); + this.C_test_MB_AIO.Location = new System.Drawing.Point(217, 366); this.C_test_MB_AIO.Name = "C_test_MB_AIO"; this.C_test_MB_AIO.Size = new System.Drawing.Size(15, 14); this.C_test_MB_AIO.TabIndex = 8; this.C_test_MB_AIO.UseVisualStyleBackColor = true; + this.C_test_MB_AIO.CheckedChanged += new System.EventHandler(this.C_test_MB_AIO_CheckedChanged); // // C_test_MB_DIO // this.C_test_MB_DIO.AutoSize = true; - this.C_test_MB_DIO.Location = new System.Drawing.Point(217, 233); + this.C_test_MB_DIO.Location = new System.Drawing.Point(217, 337); this.C_test_MB_DIO.Name = "C_test_MB_DIO"; this.C_test_MB_DIO.Size = new System.Drawing.Size(15, 14); this.C_test_MB_DIO.TabIndex = 7; this.C_test_MB_DIO.UseVisualStyleBackColor = true; + this.C_test_MB_DIO.CheckedChanged += new System.EventHandler(this.C_test_MB_DIO_CheckedChanged); // // C_test_MB_EEPROM // this.C_test_MB_EEPROM.AutoSize = true; - this.C_test_MB_EEPROM.Location = new System.Drawing.Point(217, 57); + this.C_test_MB_EEPROM.Location = new System.Drawing.Point(217, 217); this.C_test_MB_EEPROM.Name = "C_test_MB_EEPROM"; this.C_test_MB_EEPROM.Size = new System.Drawing.Size(15, 14); this.C_test_MB_EEPROM.TabIndex = 6; this.C_test_MB_EEPROM.UseVisualStyleBackColor = true; + this.C_test_MB_EEPROM.CheckedChanged += new System.EventHandler(this.C_test_MB_EEPROM_CheckedChanged); // // C_test_MB_LED // this.C_test_MB_LED.AutoSize = true; - this.C_test_MB_LED.Location = new System.Drawing.Point(217, 28); + this.C_test_MB_LED.Location = new System.Drawing.Point(217, 188); this.C_test_MB_LED.Name = "C_test_MB_LED"; this.C_test_MB_LED.Size = new System.Drawing.Size(15, 14); this.C_test_MB_LED.TabIndex = 5; this.C_test_MB_LED.UseVisualStyleBackColor = true; + this.C_test_MB_LED.CheckedChanged += new System.EventHandler(this.C_test_MB_LED_CheckedChanged); // // B_test_MB_RLY // - this.B_test_MB_RLY.Location = new System.Drawing.Point(249, 286); + this.B_test_MB_RLY.Location = new System.Drawing.Point(251, 390); this.B_test_MB_RLY.Name = "B_test_MB_RLY"; this.B_test_MB_RLY.Size = new System.Drawing.Size(75, 23); this.B_test_MB_RLY.TabIndex = 4; @@ -845,7 +1107,7 @@ // // B_test_MB_AIO // - this.B_test_MB_AIO.Location = new System.Drawing.Point(249, 257); + this.B_test_MB_AIO.Location = new System.Drawing.Point(251, 361); this.B_test_MB_AIO.Name = "B_test_MB_AIO"; this.B_test_MB_AIO.Size = new System.Drawing.Size(75, 23); this.B_test_MB_AIO.TabIndex = 3; @@ -855,7 +1117,7 @@ // // B_test_MB_DIO // - this.B_test_MB_DIO.Location = new System.Drawing.Point(249, 228); + this.B_test_MB_DIO.Location = new System.Drawing.Point(251, 332); this.B_test_MB_DIO.Name = "B_test_MB_DIO"; this.B_test_MB_DIO.Size = new System.Drawing.Size(75, 23); this.B_test_MB_DIO.TabIndex = 2; @@ -865,7 +1127,7 @@ // // B_test_MB_EEPROM // - this.B_test_MB_EEPROM.Location = new System.Drawing.Point(249, 52); + this.B_test_MB_EEPROM.Location = new System.Drawing.Point(251, 212); this.B_test_MB_EEPROM.Name = "B_test_MB_EEPROM"; this.B_test_MB_EEPROM.Size = new System.Drawing.Size(75, 23); this.B_test_MB_EEPROM.TabIndex = 1; @@ -875,7 +1137,7 @@ // // B_test_MB_LED // - this.B_test_MB_LED.Location = new System.Drawing.Point(249, 23); + this.B_test_MB_LED.Location = new System.Drawing.Point(251, 183); this.B_test_MB_LED.Name = "B_test_MB_LED"; this.B_test_MB_LED.Size = new System.Drawing.Size(75, 23); this.B_test_MB_LED.TabIndex = 0; @@ -886,6 +1148,8 @@ // tab_config // this.tab_config.BackColor = System.Drawing.SystemColors.Control; + this.tab_config.Controls.Add(this.G_conf_calibration); + this.tab_config.Controls.Add(this.G_conf_settings); this.tab_config.Controls.Add(this.G_conf_sect); this.tab_config.Controls.Add(this.G_conf_stat); this.tab_config.Location = new System.Drawing.Point(4, 22); @@ -895,6 +1159,73 @@ this.tab_config.TabIndex = 1; this.tab_config.Text = "Test Configuration"; // + // G_conf_calibration + // + this.G_conf_calibration.Controls.Add(this.C_conf_cal_AOMB); + this.G_conf_calibration.Controls.Add(this.C_conf_cal_AIEB); + this.G_conf_calibration.Controls.Add(this.C_conf_cal_AOEB); + this.G_conf_calibration.Controls.Add(this.C_conf_cal_AIMB); + this.G_conf_calibration.Location = new System.Drawing.Point(6, 217); + this.G_conf_calibration.Name = "G_conf_calibration"; + this.G_conf_calibration.Size = new System.Drawing.Size(315, 119); + this.G_conf_calibration.TabIndex = 9; + this.G_conf_calibration.TabStop = false; + this.G_conf_calibration.Text = "Calibration"; + // + // C_conf_cal_AIEB + // + this.C_conf_cal_AIEB.AutoSize = true; + this.C_conf_cal_AIEB.Location = new System.Drawing.Point(102, 88); + this.C_conf_cal_AIEB.Name = "C_conf_cal_AIEB"; + this.C_conf_cal_AIEB.Size = new System.Drawing.Size(179, 17); + this.C_conf_cal_AIEB.TabIndex = 4; + this.C_conf_cal_AIEB.Text = "Analogue Inputs Extensionboard"; + this.C_conf_cal_AIEB.UseVisualStyleBackColor = true; + this.C_conf_cal_AIEB.CheckedChanged += new System.EventHandler(this.C_conf_cal_AIEB_CheckedChanged); + // + // C_conf_cal_AOEB + // + this.C_conf_cal_AOEB.AutoSize = true; + this.C_conf_cal_AOEB.Location = new System.Drawing.Point(102, 65); + this.C_conf_cal_AOEB.Name = "C_conf_cal_AOEB"; + this.C_conf_cal_AOEB.Size = new System.Drawing.Size(187, 17); + this.C_conf_cal_AOEB.TabIndex = 3; + this.C_conf_cal_AOEB.Text = "Analogue Outputs Extensionboard"; + this.C_conf_cal_AOEB.UseVisualStyleBackColor = true; + this.C_conf_cal_AOEB.CheckedChanged += new System.EventHandler(this.C_conf_cal_AOEB_CheckedChanged); + // + // C_conf_cal_AIMB + // + this.C_conf_cal_AIMB.AutoSize = true; + this.C_conf_cal_AIMB.Location = new System.Drawing.Point(102, 42); + this.C_conf_cal_AIMB.Name = "C_conf_cal_AIMB"; + this.C_conf_cal_AIMB.Size = new System.Drawing.Size(156, 17); + this.C_conf_cal_AIMB.TabIndex = 2; + this.C_conf_cal_AIMB.Text = "Analogue Inputs Mainboard"; + this.C_conf_cal_AIMB.UseVisualStyleBackColor = true; + this.C_conf_cal_AIMB.CheckedChanged += new System.EventHandler(this.C_conf_cal_AIMB_CheckedChanged); + // + // G_conf_settings + // + this.G_conf_settings.Controls.Add(this.C_conf_settings_RTC); + this.G_conf_settings.Location = new System.Drawing.Point(3, 144); + this.G_conf_settings.Name = "G_conf_settings"; + this.G_conf_settings.Size = new System.Drawing.Size(318, 67); + this.G_conf_settings.TabIndex = 8; + this.G_conf_settings.TabStop = false; + this.G_conf_settings.Text = "Settings"; + // + // C_conf_settings_RTC + // + this.C_conf_settings_RTC.AutoSize = true; + this.C_conf_settings_RTC.Location = new System.Drawing.Point(6, 19); + this.C_conf_settings_RTC.Name = "C_conf_settings_RTC"; + this.C_conf_settings_RTC.Size = new System.Drawing.Size(126, 17); + this.C_conf_settings_RTC.TabIndex = 0; + this.C_conf_settings_RTC.Text = "Set RTC of Test Item"; + this.C_conf_settings_RTC.UseVisualStyleBackColor = true; + this.C_conf_settings_RTC.CheckedChanged += new System.EventHandler(this.C_conf_settings_RTC_CheckedChanged); + // // G_conf_sect // this.G_conf_sect.Controls.Add(this.L_conf_EB); @@ -906,9 +1237,9 @@ this.G_conf_sect.Controls.Add(this.B_conf_addEB); this.G_conf_sect.Controls.Add(this.B_conf_removeMB); this.G_conf_sect.Controls.Add(this.B_conf_removeall); - this.G_conf_sect.Location = new System.Drawing.Point(3, 15); + this.G_conf_sect.Location = new System.Drawing.Point(3, 25); this.G_conf_sect.Name = "G_conf_sect"; - this.G_conf_sect.Size = new System.Drawing.Size(318, 106); + this.G_conf_sect.Size = new System.Drawing.Size(318, 113); this.G_conf_sect.TabIndex = 7; this.G_conf_sect.TabStop = false; this.G_conf_sect.Text = "Test sections setup"; @@ -948,6 +1279,7 @@ this.B_conf_addall.TabIndex = 0; this.B_conf_addall.Text = "Add all Tests"; this.B_conf_addall.UseVisualStyleBackColor = true; + this.B_conf_addall.Click += new System.EventHandler(this.B_conf_addall_Click); // // B_conf_addMB // @@ -957,6 +1289,7 @@ this.B_conf_addMB.TabIndex = 2; this.B_conf_addMB.Text = "Add all MB Tests"; this.B_conf_addMB.UseVisualStyleBackColor = true; + this.B_conf_addMB.Click += new System.EventHandler(this.B_conf_addMB_Click); // // B_conf_removeEB // @@ -966,6 +1299,7 @@ this.B_conf_removeEB.TabIndex = 5; this.B_conf_removeEB.Text = "Remove all EB Tests"; this.B_conf_removeEB.UseVisualStyleBackColor = true; + this.B_conf_removeEB.Click += new System.EventHandler(this.B_conf_removeEB_Click); // // B_conf_addEB // @@ -975,6 +1309,7 @@ this.B_conf_addEB.TabIndex = 4; this.B_conf_addEB.Text = "Add all EB Tests"; this.B_conf_addEB.UseVisualStyleBackColor = true; + this.B_conf_addEB.Click += new System.EventHandler(this.B_conf_addEB_Click); // // B_conf_removeMB // @@ -994,11 +1329,12 @@ this.B_conf_removeall.TabIndex = 1; this.B_conf_removeall.Text = "Remove all Tests"; this.B_conf_removeall.UseVisualStyleBackColor = true; + this.B_conf_removeall.Click += new System.EventHandler(this.B_conf_removeall_Click); // // G_conf_stat // this.G_conf_stat.Controls.Add(this.B_conf_resettotal); - this.G_conf_stat.Location = new System.Drawing.Point(6, 345); + this.G_conf_stat.Location = new System.Drawing.Point(6, 342); this.G_conf_stat.Name = "G_conf_stat"; this.G_conf_stat.Size = new System.Drawing.Size(318, 48); this.G_conf_stat.TabIndex = 6; @@ -1007,12 +1343,13 @@ // // B_conf_resettotal // - this.B_conf_resettotal.Location = new System.Drawing.Point(203, 19); + this.B_conf_resettotal.Location = new System.Drawing.Point(66, 19); this.B_conf_resettotal.Name = "B_conf_resettotal"; this.B_conf_resettotal.Size = new System.Drawing.Size(107, 23); this.B_conf_resettotal.TabIndex = 0; this.B_conf_resettotal.Text = "Reset Test counter"; this.B_conf_resettotal.UseVisualStyleBackColor = true; + this.B_conf_resettotal.Click += new System.EventHandler(this.B_conf_resettotal_Click); // // G_statistics // @@ -1089,6 +1426,17 @@ this.L_stats_numbertotal.TabIndex = 0; this.L_stats_numbertotal.Text = "0"; // + // C_conf_cal_AOMB + // + this.C_conf_cal_AOMB.AutoSize = true; + this.C_conf_cal_AOMB.Location = new System.Drawing.Point(102, 19); + this.C_conf_cal_AOMB.Name = "C_conf_cal_AOMB"; + this.C_conf_cal_AOMB.Size = new System.Drawing.Size(164, 17); + this.C_conf_cal_AOMB.TabIndex = 5; + this.C_conf_cal_AOMB.Text = "Analogue Outputs Mainboard"; + this.C_conf_cal_AOMB.UseVisualStyleBackColor = true; + this.C_conf_cal_AOMB.CheckedChanged += new System.EventHandler(this.C_conf_cal_AOMB_CheckedChanged); + // // mainWindow // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1106,6 +1454,10 @@ this.tab_control.ResumeLayout(false); this.tab_control.PerformLayout(); this.tab_config.ResumeLayout(false); + this.G_conf_calibration.ResumeLayout(false); + this.G_conf_calibration.PerformLayout(); + this.G_conf_settings.ResumeLayout(false); + this.G_conf_settings.PerformLayout(); this.G_conf_sect.ResumeLayout(false); this.G_conf_sect.PerformLayout(); this.G_conf_stat.ResumeLayout(false); @@ -1145,13 +1497,9 @@ private System.Windows.Forms.Label L_test_MB_EEPROM; private System.Windows.Forms.Label L_test_MB_LED; private System.Windows.Forms.Button B_master_send; - private System.Windows.Forms.Label L_test_CF; private System.Windows.Forms.Label L_test_USB; - private System.Windows.Forms.TextBox T_test_CF; private System.Windows.Forms.TextBox T_test_USB; - private System.Windows.Forms.CheckBox C_test_CF; private System.Windows.Forms.CheckBox C_test_USB; - private System.Windows.Forms.Button B_test_CF; private System.Windows.Forms.Button B_test_USB; private System.Windows.Forms.Label L_test_eth1; private System.Windows.Forms.Label L_test_eth0; @@ -1181,10 +1529,6 @@ private System.Windows.Forms.CheckBox C_test_EB_LED; private System.Windows.Forms.Button B_test_EB_EEPROM; private System.Windows.Forms.Button B_test_EB_LED; - private System.Windows.Forms.Label L_test_CAN; - private System.Windows.Forms.TextBox T_test_CAN; - private System.Windows.Forms.CheckBox C_test_CAN; - private System.Windows.Forms.Button B_test_CAN; private System.Windows.Forms.Button B_test_TESTALL; private System.Windows.Forms.Button B_test_STOP; private System.Windows.Forms.ProgressBar progressBar1; @@ -1209,6 +1553,41 @@ private System.Windows.Forms.Label L_conf_MB; private System.Windows.Forms.Label L_conf_MBEB; private System.Windows.Forms.Button B_conf_resettotal; + private System.Windows.Forms.Label L_test_REVNUM; + private System.Windows.Forms.TextBox T_test_REVNUM; + private System.Windows.Forms.CheckBox C_test_REVNUM; + private System.Windows.Forms.Button B_test_REVNUM; + private System.Windows.Forms.Label L_test_TEMP; + private System.Windows.Forms.TextBox T_test_TEMP; + private System.Windows.Forms.CheckBox C_test_TEMP; + private System.Windows.Forms.Button B_test_TEMP; + private System.Windows.Forms.Label L_test_VCORE; + private System.Windows.Forms.TextBox T_test_VCORE; + private System.Windows.Forms.CheckBox C_test_VCORE; + private System.Windows.Forms.Button B_test_VCORE; + private System.Windows.Forms.Label L_test_VBAT; + private System.Windows.Forms.TextBox T_test_VBAT; + private System.Windows.Forms.CheckBox C_test_VBAT; + private System.Windows.Forms.Button B_test_VBAT; + private System.Windows.Forms.Label L_test_VDDAT; + private System.Windows.Forms.TextBox T_test_VDDAT; + private System.Windows.Forms.CheckBox C_test_VDDAT; + private System.Windows.Forms.Button B_test_VDDAT; + private System.Windows.Forms.Label L_test_VCC; + private System.Windows.Forms.TextBox T_test_VCC; + private System.Windows.Forms.CheckBox C_test_VCC; + private System.Windows.Forms.Button B_test_VCC; + private System.Windows.Forms.Button B_master_init; + private System.Windows.Forms.Button B_master_ENTER; + private System.Windows.Forms.Button B_master_N; + private System.Windows.Forms.Button B_masterY; + private System.Windows.Forms.GroupBox G_conf_settings; + private System.Windows.Forms.CheckBox C_conf_settings_RTC; + private System.Windows.Forms.GroupBox G_conf_calibration; + private System.Windows.Forms.CheckBox C_conf_cal_AIEB; + private System.Windows.Forms.CheckBox C_conf_cal_AOEB; + private System.Windows.Forms.CheckBox C_conf_cal_AIMB; + private System.Windows.Forms.CheckBox C_conf_cal_AOMB; } } diff --git a/Tester/SW/designtest_control/QUA_2475_designtest/mainWindow.cs b/Tester/SW/designtest_control/QUA_2475_designtest/mainWindow.cs index f35d3c5..64ac59f 100644 --- a/Tester/SW/designtest_control/QUA_2475_designtest/mainWindow.cs +++ b/Tester/SW/designtest_control/QUA_2475_designtest/mainWindow.cs @@ -61,17 +61,11 @@ namespace QUA_2475_designtest */ private void TimeoutThread() { - Thread.Sleep(20000); + Thread.Sleep(100000); if (activeTest == true) { TestIsTimeout(actualTest); } } - - private void B_conf_removeMB_Click(object sender, EventArgs e) - { - - } - } } diff --git a/Tester/SW/designtest_control/QUA_2475_designtest/obj/Debug/QUA_2475_designtest.csproj.GenerateResource.Cache b/Tester/SW/designtest_control/QUA_2475_designtest/obj/Debug/QUA_2475_designtest.csproj.GenerateResource.Cache index 2ebab72..2b6809a 100644 Binary files a/Tester/SW/designtest_control/QUA_2475_designtest/obj/Debug/QUA_2475_designtest.csproj.GenerateResource.Cache and b/Tester/SW/designtest_control/QUA_2475_designtest/obj/Debug/QUA_2475_designtest.csproj.GenerateResource.Cache differ diff --git a/Tester/SW/designtest_control/QUA_2475_designtest/obj/Debug/QUA_2475_designtest.exe b/Tester/SW/designtest_control/QUA_2475_designtest/obj/Debug/QUA_2475_designtest.exe index c7c90d7..48353d3 100644 Binary files a/Tester/SW/designtest_control/QUA_2475_designtest/obj/Debug/QUA_2475_designtest.exe and b/Tester/SW/designtest_control/QUA_2475_designtest/obj/Debug/QUA_2475_designtest.exe differ diff --git a/Tester/SW/designtest_control/QUA_2475_designtest/obj/Debug/QUA_2475_designtest.pdb b/Tester/SW/designtest_control/QUA_2475_designtest/obj/Debug/QUA_2475_designtest.pdb index 2ac16db..b3bcf0a 100644 Binary files a/Tester/SW/designtest_control/QUA_2475_designtest/obj/Debug/QUA_2475_designtest.pdb and b/Tester/SW/designtest_control/QUA_2475_designtest/obj/Debug/QUA_2475_designtest.pdb differ diff --git a/Tester/SW/designtest_control/QUA_2475_designtest/test_control.cs b/Tester/SW/designtest_control/QUA_2475_designtest/test_control.cs index 112aee1..ded2f70 100644 --- a/Tester/SW/designtest_control/QUA_2475_designtest/test_control.cs +++ b/Tester/SW/designtest_control/QUA_2475_designtest/test_control.cs @@ -40,97 +40,467 @@ namespace QUA_2475_designtest { public partial class mainWindow { + + private void increment_passed() + { + /* If called, increment the TestPassed counter */ + L_stats_numberpassed.Text = Convert.ToString(TotalPassedNumber++); + } + + private void increment_failed() + { + /* If called, increment the TestFailed counter */ + L_stats_numberfailed.Text = Convert.ToString(TotalFailedNumber++); + } + private void TestIsUntested(System.UInt32 TestID) { - /* Resets the to the parameter corresponding Textbox */ - TestTextBoxes[TestID].Text = "untested"; - TestTextBoxes[TestID].BackColor = System.Drawing.Color.White; + if (TestID > 18) + { + } + else + { + /* Resets the to the parameter corresponding Textbox */ + TestTextBoxes[TestID].Text = "untested"; + TestTextBoxes[TestID].BackColor = System.Drawing.Color.White; + } } private void TestIsActive(System.UInt32 TestID) { - /* Sets status of the corresponding TextBox to active */ - TestTextBoxes[TestID].Text = "Active"; - TestTextBoxes[TestID].BackColor = System.Drawing.Color.Yellow; + if (TestID > 18) + { + } + else + { + /* Sets status of the corresponding TextBox to active */ + TestTextBoxes[TestID].Text = "Active"; + TestTextBoxes[TestID].BackColor = System.Drawing.Color.Yellow; + } } - private void TestIsPassed(System.UInt32 TestID) + private void CalibrationFinished() { - /* Sets status of the corresponding TextBox to a passed test */ + MessageBox.Show("Calibration Finished"); TestTimeoutThread.Abort(); /* Abort Timeout Thread */ - TestTextBoxes[TestID].Text = "Passed"; - TestTextBoxes[TestID].BackColor = System.Drawing.Color.Green; + globalActivities(true); /* If Test was called by automatic test routine, go back there */ if (activeAutomatictest == true) { - //automaticTest(); + automaticTest(); + } + } + + private void TestIsCanceled(System.UInt32 TestID) + { + if (TestID > 18) + { + } + else + { + /* Sets status of the corresponding TextBox to active */ + TestTextBoxes[TestID].Text = "Canceled"; + TestTextBoxes[TestID].BackColor = System.Drawing.Color.DarkOrange; + globalActivities(true); + } + } + + private void TestIsPassed(System.UInt32 TestID) + { + if (TestID > 18) + { + } + else + { + /* Sets status of the corresponding TextBox to a passed test */ + TestTimeoutThread.Abort(); /* Abort Timeout Thread */ + TestTextBoxes[TestID].Text = "Passed"; + TestTextBoxes[TestID].BackColor = System.Drawing.Color.Green; + globalActivities(true); + + /* If Test was called by automatic test routine, go back there */ + if (activeAutomatictest == true) + { + automaticTest(); + } } } private void TestIsFailed(System.UInt32 TestID) { - /* Sets status of the corresponding TextBox to a failed test */ - TestTimeoutThread.Abort(); /* Abort Timeout Thread */ - TestTextBoxes[TestID].Text = "Failed"; - TestTextBoxes[TestID].BackColor = System.Drawing.Color.Red; - - /* If Test was called by automatic test routine, go back there */ - if (activeAutomatictest == true) + if (TestID > 18) { - //automaticTest(); + } + else + { + /* Sets status of the corresponding TextBox to a failed test */ + TestTimeoutThread.Abort(); /* Abort Timeout Thread */ + TestTextBoxes[TestID].Text = "Failed"; + TestTextBoxes[TestID].BackColor = System.Drawing.Color.Red; + globalActivities(true); + + /* If Test was called by automatic test routine, go back there */ + if (activeAutomatictest == true) + { + automaticTest(); + } + } + } + + private void TestIsSkipped(System.UInt32 TestID) + { + if (TestID > 18) + { + TestResult[TestID] = true; + + /* If Test was called by automatic test routine, go back there */ + if (activeAutomatictest == true) + { + automaticTest(); + } + } + else + { + /* Sets status of the corresponding TextBox to a passed test */ + TestTextBoxes[TestID].Text = "skipped"; + TestTextBoxes[TestID].BackColor = System.Drawing.Color.CornflowerBlue; + TestResult[TestID] = true; + + /* If Test was called by automatic test routine, go back there */ + if (activeAutomatictest == true) + { + automaticTest(); + } } } private void TestIsUnavailable(System.UInt32 TestID) { - /* Sets status of the corresponding TextBox to unreachable test */ - TestTimeoutThread.Abort(); /* Abort Timeout Thread */ - TestTextBoxes[TestID].Text = "unavailable"; - TestTextBoxes[TestID].BackColor = System.Drawing.Color.CornflowerBlue; - - /* If Test was called by automatic test routine, go back there */ - if (activeAutomatictest == true) + if (TestID > 18) { - //automaticTest(); + } + else + { + /* Sets status of the corresponding TextBox to unreachable test */ + TestTimeoutThread.Abort(); /* Abort Timeout Thread */ + TestTextBoxes[TestID].Text = "unavailable"; + TestTextBoxes[TestID].BackColor = System.Drawing.Color.CornflowerBlue; + + /* If Test was called by automatic test routine, go back there */ + if (activeAutomatictest == true) + { + automaticTest(); + } } } delegate void TestIsTimeoutCallback(System.UInt32 TestID); private void TestIsTimeout(System.UInt32 TestID) { - /* Check if Application is called from a subThread */ - if (this.TestTextBoxes[TestID].InvokeRequired) + if (TestID > 18) { - /* Handle Parameters to main Thread */ - TestIsTimeoutCallback d = new TestIsTimeoutCallback(TestIsTimeout); - this.Invoke(d, new object[] { TestID }); } else { - /* Set corresponding TextBox to Timeout Status */ - TestTextBoxes[TestID].Text = "Timeout"; - TestTextBoxes[TestID].BackColor = System.Drawing.Color.DarkOrange; - activeTest = false; - - /* If Test was called by automatic test routine, go there */ - if (activeAutomatictest == true) + /* Check if Application is called from a subThread */ + if (this.TestTextBoxes[TestID].InvokeRequired) { - //automaticTest(); + /* Handle Parameters to main Thread */ + TestIsTimeoutCallback d = new TestIsTimeoutCallback(TestIsTimeout); + this.Invoke(d, new object[] { TestID }); + } + else + { + /* Set corresponding TextBox to Timeout Status */ + TestTextBoxes[TestID].Text = "Timeout"; + TestTextBoxes[TestID].BackColor = System.Drawing.Color.DarkOrange; + activeTest = false; + + /* If Test was called by automatic test routine, go there */ + if (activeAutomatictest == true) + { + automaticTest(); + } } } } + private void C_test_VCC_CheckedChanged(object sender, EventArgs e) + { + if (C_test_VCC.Checked == true) + { + ActivateTest[(int)TestType.VCC] = true; + } + else + { + ActivateTest[(int)TestType.VCC] = false; + } + } + + private void C_test_VDDAT_CheckedChanged(object sender, EventArgs e) + { + if (C_test_VDDAT.Checked == true) + { + ActivateTest[(int)TestType.VDDAT] = true; + } + else + { + ActivateTest[(int)TestType.VDDAT] = false; + } + } + + private void C_test_VBAT_CheckedChanged(object sender, EventArgs e) + { + if (C_test_VBAT.Checked == true) + { + ActivateTest[(int)TestType.VBAT] = true; + } + else + { + ActivateTest[(int)TestType.VBAT] = false; + } + } + + private void C_test_VCORE_CheckedChanged(object sender, EventArgs e) + { + if (C_test_VCORE.Checked == true) + { + ActivateTest[(int)TestType.VCORE] = true; + } + else + { + ActivateTest[(int)TestType.VCORE] = false; + } + } + + private void C_test_TEMP_CheckedChanged(object sender, EventArgs e) + { + if (C_test_TEMP.Checked == true) + { + ActivateTest[(int)TestType.TEMP] = true; + } + else + { + ActivateTest[(int)TestType.TEMP] = false; + } + } + + private void C_test_REVNUM_CheckedChanged(object sender, EventArgs e) + { + if (C_test_REVNUM.Checked == true) + { + ActivateTest[(int)TestType.REVNUM] = true; + } + else + { + ActivateTest[(int)TestType.REVNUM] = false; + } + } + + private void C_test_MB_LED_CheckedChanged(object sender, EventArgs e) + { + if (C_test_MB_LED.Checked == true) + { + ActivateTest[(int)TestType.LED_MB] = true; + } + else + { + ActivateTest[(int)TestType.LED_MB] = false; + } + } + + private void C_test_MB_EEPROM_CheckedChanged(object sender, EventArgs e) + { + if (C_test_MB_EEPROM.Checked == true) + { + ActivateTest[(int)TestType.EEPROM_MB] = true; + } + else + { + ActivateTest[(int)TestType.EEPROM_MB] = false; + } + } + + private void C_test_eth0_CheckedChanged(object sender, EventArgs e) + { + if (C_test_eth0.Checked == true) + { + ActivateTest[(int)TestType.ETH0] = true; + } + else + { + ActivateTest[(int)TestType.ETH0] = false; + } + } + + private void C_test_eth1_CheckedChanged(object sender, EventArgs e) + { + if (C_test_eth1.Checked == true) + { + ActivateTest[(int)TestType.ETH1] = true; + } + else + { + ActivateTest[(int)TestType.ETH1] = false; + } + } + + private void C_test_USB_CheckedChanged(object sender, EventArgs e) + { + if (C_test_USB.Checked == true) + { + ActivateTest[(int)TestType.USB] = true; + } + else + { + ActivateTest[(int)TestType.USB] = false; + } + } + + private void C_test_MB_DIO_CheckedChanged(object sender, EventArgs e) + { + if (C_test_MB_DIO.Checked == true) + { + ActivateTest[(int)TestType.DIO_MB] = true; + } + else + { + ActivateTest[(int)TestType.DIO_MB] = false; + } + } + + private void C_test_MB_AIO_CheckedChanged(object sender, EventArgs e) + { + if (C_test_MB_AIO.Checked == true) + { + ActivateTest[(int)TestType.AIO_MB] = true; + } + else + { + ActivateTest[(int)TestType.AIO_MB] = false; + } + } + + private void C_test_MB_RLY_CheckedChanged(object sender, EventArgs e) + { + if (C_test_MB_RLY.Checked == true) + { + ActivateTest[(int)TestType.RLY_MB] = true; + } + else + { + ActivateTest[(int)TestType.RLY_MB] = false; + } + } + + private void C_test_EB_LED_CheckedChanged(object sender, EventArgs e) + { + if (C_test_EB_LED.Checked == true) + { + ActivateTest[(int)TestType.LED_EB] = true; + } + else + { + ActivateTest[(int)TestType.LED_EB] = false; + } + } + + private void C_test_EB_EEPROM_CheckedChanged(object sender, EventArgs e) + { + if (C_test_EB_EEPROM.Checked == true) + { + ActivateTest[(int)TestType.EEPROM_EB] = true; + } + else + { + ActivateTest[(int)TestType.EEPROM_EB] = false; + } + } + + private void C_test_EB_DIO_CheckedChanged(object sender, EventArgs e) + { + if (C_test_EB_DIO.Checked == true) + { + ActivateTest[(int)TestType.DIO_EB] = true; + } + else + { + ActivateTest[(int)TestType.DIO_EB] = false; + } + } + + private void C_test_EB_AIO_CheckedChanged(object sender, EventArgs e) + { + if (C_test_EB_AIO.Checked == true) + { + ActivateTest[(int)TestType.AIO_EB] = true; + } + else + { + ActivateTest[(int)TestType.AIO_EB] = false; + } + } + + private void C_test_EB_RLY_CheckedChanged(object sender, EventArgs e) + { + if (C_test_EB_RLY.Checked == true) + { + ActivateTest[(int)TestType.RLY_EB] = true; + } + else + { + ActivateTest[(int)TestType.RLY_EB] = false; + } + } + + + private void B_test_VCC_Click(object sender, EventArgs e) + { + /* CallTestRoutine corresponding TestResult with Parameter */ + CallTestRoutine((int)TestType.VCC); + } + + private void B_test_VDDAT_Click(object sender, EventArgs e) + { + /* CallTestRoutine corresponding TestResult with Parameter */ + CallTestRoutine((int)TestType.VDDAT); + } + + private void B_test_VBAT_Click(object sender, EventArgs e) + { + /* CallTestRoutine corresponding TestResult with Parameter */ + CallTestRoutine((int)TestType.VBAT); + } + + private void B_test_VCORE_Click(object sender, EventArgs e) + { + /* CallTestRoutine corresponding TestResult with Parameter */ + CallTestRoutine((int)TestType.VCORE); + } + + private void B_test_TEMP_Click(object sender, EventArgs e) + { + /* CallTestRoutine corresponding TestResult with Parameter */ + CallTestRoutine((int)TestType.TEMP); + } + + private void B_test_REVNUM_Click(object sender, EventArgs e) + { + /* CallTestRoutine corresponding TestResult with Parameter */ + CallTestRoutine((int)TestType.REVNUM); + } + private void B_test_MB_LED_Click(object sender, EventArgs e) { /* CallTestRoutine corresponding TestResult with Parameter */ - CallTestRoutine((int)TestType.MB_LED); + CallTestRoutine((int)TestType.LED_MB); } private void B_test_MB_EEPROM_Click(object sender, EventArgs e) { /* CallTestRoutine corresponding TestResult with Parameter */ - CallTestRoutine((int)TestType.MB_EEPROM); + CallTestRoutine((int)TestType.EEPROM_MB); } private void B_test_eth0_Click(object sender, EventArgs e) @@ -145,12 +515,6 @@ namespace QUA_2475_designtest CallTestRoutine((int)TestType.ETH1); } - private void B_test_CF_Click(object sender, EventArgs e) - { - /* CallTestRoutine corresponding TestResult with Parameter */ - CallTestRoutine((int)TestType.CF); - } - private void B_test_USB_Click(object sender, EventArgs e) { /* CallTestRoutine corresponding TestResult with Parameter */ @@ -160,55 +524,70 @@ namespace QUA_2475_designtest private void B_test_MB_DIO_Click(object sender, EventArgs e) { /* CallTestRoutine corresponding TestResult with Parameter */ - CallTestRoutine((int)TestType.MB_DIO); + CallTestRoutine((int)TestType.DIO_MB); } private void B_test_MB_AIO_Click(object sender, EventArgs e) { /* CallTestRoutine corresponding TestResult with Parameter */ - CallTestRoutine((int)TestType.MB_AIO); + CallTestRoutine((int)TestType.AIO_MB); } private void B_test_MB_RLY_Click(object sender, EventArgs e) { /* CallTestRoutine corresponding TestResult with Parameter */ - CallTestRoutine((int)TestType.MB_RLY); - } - - private void B_test_CAN_Click(object sender, EventArgs e) - { - /* CallTestRoutine corresponding TestResult with Parameter */ - CallTestRoutine((int)TestType.CAN); + CallTestRoutine((int)TestType.RLY_MB); } private void B_test_EB_LED_Click(object sender, EventArgs e) { /* CallTestRoutine corresponding TestResult with Parameter */ - CallTestRoutine((int)TestType.EB_LED); + CallTestRoutine((int)TestType.LED_EB); } private void B_test_EB_EEPROM_Click(object sender, EventArgs e) { /* CallTestRoutine corresponding TestResult with Parameter */ - CallTestRoutine((int)TestType.EB_EEPROM); + CallTestRoutine((int)TestType.EEPROM_EB); } private void B_test_EB_DIO_Click(object sender, EventArgs e) { /* CallTestRoutine corresponding TestResult with Parameter */ - CallTestRoutine((int)TestType.EB_DIO); + CallTestRoutine((int)TestType.DIO_EB); } private void B_test_EB_AIO_Click(object sender, EventArgs e) { /* CallTestRoutine corresponding TestResult with Parameter */ - CallTestRoutine((int)TestType.EB_AIO); + CallTestRoutine((int)TestType.AIO_EB); } private void B_test_EB_RLY_Click(object sender, EventArgs e) { /* CallTestRoutine corresponding TestResult with Parameter */ - CallTestRoutine((int)TestType.EB_RLY); + CallTestRoutine((int)TestType.RLY_EB); + } + + private void B_test_STOP_Click(object sender, EventArgs e) + { + if (activeTest == true) + { + TestTimeoutThread.Abort(); /* Abort Timeout Thread */ + activeTest = false; + activeAutomatictest = false; + TestIsCanceled(actualTest); + globalActivities(true); + testcnt = 0; + + } + else + { + activeAutomatictest = false; + globalActivities(true); + testcnt = 0; + } + } private void B_test_clear_Click(object sender, EventArgs e) @@ -222,17 +601,23 @@ namespace QUA_2475_designtest T_MasterOutput.BackColor = System.Drawing.Color.White; TestIsUntested(loopcnt); } - } } + private void B_test_TESTALL_Click(object sender, EventArgs e) + { + automaticTest(); + } + private void CallTestRoutine(uint TestID) { /* Call Test just if no other Test is active */ if (activeTest == false) { + globalActivities(false); actualTest = TestID; /* Set actual Test ID to active Test*/ + TestMessage[actualTest] = ""; /* Define and Start Timeout Thread */ TestTimeoutThread = new Thread(new ThreadStart(TimeoutThread)); TestTimeoutThread.Start(); @@ -240,6 +625,378 @@ namespace QUA_2475_designtest activeTest = true; /* Set Test to global active */ com1.Write(TestCallCommands[actualTest]); /* Call Test */ TestIsActive(actualTest); /* Set Test TextBox */ + globalActivities(true); + } + } + + private void automaticTest() + { + activeAutomatictest = true; /* Set autoTest to global active */ + globalActivities(false); + + /* Reset all Test Results and Test TextBoxes */ + if (testcnt == 0) + { + AllTestResult = false; + + for (uint loopcnt = 0; loopcnt < NrOfTests; loopcnt++) + { + T_MasterOutput.BackColor = System.Drawing.Color.White; + TestIsUntested(loopcnt); + TestResult[loopcnt] = false; + } + } + + if (testcnt < NrOfTests) + { + Thread.Sleep(500); + /* Call single Test */ + if (ActivateTest[testcnt] == true) + { + CallTestRoutine(testcnt++); + } + else + { + TestIsSkipped(testcnt++); + } + + } + else if (testcnt == NrOfTests) + { + if (setRTC == true) + { + remoteRTCset(); + } + //if (cal_Analogue == true) + //{ + // TestTimeoutThread = new Thread(new ThreadStart(TimeoutThread)); + // TestTimeoutThread.Start(); + // calibrateAnalogue(); + //} + + testcnt = 0; /* reset Test counter to zero */ + /* Increment Number of Totals Test */ + calculateAllResult(); /* Calculate autoTest Result */ + + + if (AllTestResult == false) + { +// /* If one or more tests failed */ +// InfoBox infobox = new InfoBox(); + /* Ask if user wants to restart test */ +// if (infobox.ShowDialog() == DialogResult.OK) + { + /* If user wants to restart, break out of algorithm + * and return to idle stat. Do not increment counters + * or the automatically calculated values + */ +// return; + } + /* Test failed - Increment FAILED- and overall Counter */ + increment_failed(); + L_stats_numbertotal.Text = Convert.ToString(TotalTestNumber++); + + } + else + { + /* Test passed - Increment PASSED- and overall Counter */ + increment_passed(); + L_stats_numbertotal.Text = Convert.ToString(TotalTestNumber++); + } + + activeAutomatictest = false; /* set autoTest to global off */ + globalActivities(true); + } + } + + private void calculateAllResult() + { + if ((TestResult[0] + & TestResult[1] + & TestResult[2] + & TestResult[3] + & TestResult[4] + & TestResult[5] + & TestResult[6] + & TestResult[7] + & TestResult[8] + & TestResult[9] + & TestResult[10] + & TestResult[11] + & TestResult[12] + & TestResult[13] + & TestResult[14] + & TestResult[15] + & TestResult[16] + & TestResult[17] + & TestResult[18] + & TestResult[19] + & TestResult[20] + & TestResult[21] + & TestResult[22]) + == true) + { + AllTestResult = true; + T_MasterOutput.BackColor = System.Drawing.Color.Green; + MessageBox.Show("Automatic Test Sequence finished\n\rSUCCESSFULLY"); + } + else + { + AllTestResult = false; + T_MasterOutput.BackColor = System.Drawing.Color.Red; + MessageBox.Show("Automatic Test Sequence finished\n\rwith ERRORS"); + } + } + + private void globalActivities (bool control) + { + /* Control checkboxes for Test-Controls */ + C_test_VCC.Enabled = control; + C_test_VDDAT.Enabled = control; + C_test_VBAT.Enabled = control; + C_test_VCORE.Enabled = control; + C_test_TEMP.Enabled = control; + C_test_REVNUM.Enabled = control; + C_test_MB_LED.Enabled = control; + C_test_MB_EEPROM.Enabled = control; + C_test_eth0.Enabled = control; + C_test_eth1.Enabled = control; + C_test_USB.Enabled = control; + C_test_MB_DIO.Enabled = control; + C_test_MB_AIO.Enabled = control; + C_test_MB_RLY.Enabled = control; + C_test_EB_LED.Enabled = control; + C_test_EB_EEPROM.Enabled = control; + C_test_EB_DIO.Enabled = control; + C_test_EB_AIO.Enabled = control; + C_test_EB_RLY.Enabled = control; + + /* Control Buttons of test section */ + B_test_VCC.Enabled = control; + B_test_VDDAT.Enabled = control; + B_test_VBAT.Enabled = control; + B_test_VCORE.Enabled = control; + B_test_TEMP.Enabled = control; + B_test_REVNUM.Enabled = control; + B_test_MB_LED.Enabled = control; + B_test_MB_EEPROM.Enabled = control; + B_test_eth0.Enabled = control; + B_test_eth1.Enabled = control; + B_test_USB.Enabled = control; + B_test_MB_DIO.Enabled = control; + B_test_MB_AIO.Enabled = control; + B_test_MB_RLY.Enabled = control; + B_test_EB_LED.Enabled = control; + B_test_EB_EEPROM.Enabled = control; + B_test_EB_DIO.Enabled = control; + B_test_EB_AIO.Enabled = control; + B_test_EB_RLY.Enabled = control; + + /* Control Configuration Buttons */ + B_conf_addall.Enabled = control; + B_conf_removeall.Enabled = control; + B_conf_addMB.Enabled = control; + B_conf_removeMB.Enabled = control; + B_conf_addEB.Enabled = control; + B_conf_removeEB.Enabled = control; + B_conf_resettotal.Enabled = control; + + /* Control String Input Text Box for Device */ + T_MasterInput.Enabled = control; + + + } + + private void B_master_init_Click(object sender, EventArgs e) + { + com1.Write("initForC_S\r"); + } + + private void B_masterY_Click(object sender, EventArgs e) + { + com1.Write("y"); + } + + private void B_master_N_Click(object sender, EventArgs e) + { + com1.Write("n"); + } + + private void B_master_ENTER_Click(object sender, EventArgs e) + { + com1.Write("\r"); + } + + + private void B_conf_addall_Click(object sender, EventArgs e) + { + C_test_VCC.Checked = true; + C_test_VDDAT.Checked = true; + C_test_VBAT.Checked = true; + C_test_VCORE.Checked = true; + C_test_TEMP.Checked = true; + C_test_REVNUM.Checked = true; + C_test_MB_LED.Checked = true; + C_test_MB_EEPROM.Checked = true; + C_test_eth0.Checked = true; + C_test_eth1.Checked = true; + C_test_USB.Checked = true; + C_test_MB_DIO.Checked = true; + C_test_MB_AIO.Checked = true; + C_test_MB_RLY.Checked = true; + C_test_EB_LED.Checked = true; + C_test_EB_EEPROM.Checked = true; + C_test_EB_DIO.Checked = true; + C_test_EB_AIO.Checked = true; + C_test_EB_RLY.Checked = true; + } + + private void B_conf_addMB_Click(object sender, EventArgs e) + { + C_test_VCC.Checked = true; + C_test_VDDAT.Checked = true; + C_test_VBAT.Checked = true; + C_test_VCORE.Checked = true; + C_test_TEMP.Checked = true; + C_test_REVNUM.Checked = true; + C_test_MB_LED.Checked = true; + C_test_MB_EEPROM.Checked = true; + C_test_eth0.Checked = true; + C_test_eth1.Checked = true; + C_test_USB.Checked = true; + C_test_MB_DIO.Checked = true; + C_test_MB_AIO.Checked = true; + C_test_MB_RLY.Checked = true; + } + + private void B_conf_addEB_Click(object sender, EventArgs e) + { + C_test_EB_LED.Checked = true; + C_test_EB_EEPROM.Checked = true; + C_test_EB_DIO.Checked = true; + C_test_EB_AIO.Checked = true; + C_test_EB_RLY.Checked = true; + } + + private void B_conf_removeall_Click(object sender, EventArgs e) + { + C_test_VCC.Checked = false; + C_test_VDDAT.Checked = false; + C_test_VBAT.Checked = false; + C_test_VCORE.Checked = false; + C_test_TEMP.Checked = false; + C_test_REVNUM.Checked = false; + C_test_MB_LED.Checked = false; + C_test_MB_EEPROM.Checked = false; + C_test_eth0.Checked = false; + C_test_eth1.Checked = false; + C_test_USB.Checked = false; + C_test_MB_DIO.Checked = false; + C_test_MB_AIO.Checked = false; + C_test_MB_RLY.Checked = false; + C_test_EB_LED.Checked = false; + C_test_EB_EEPROM.Checked = false; + C_test_EB_DIO.Checked = false; + C_test_EB_AIO.Checked = false; + C_test_EB_RLY.Checked = false; + + } + + private void B_conf_removeMB_Click(object sender, EventArgs e) + { + C_test_VCC.Checked = false; + C_test_VDDAT.Checked = false; + C_test_VBAT.Checked = false; + C_test_VCORE.Checked = false; + C_test_TEMP.Checked = false; + C_test_REVNUM.Checked = false; + C_test_MB_LED.Checked = false; + C_test_MB_EEPROM.Checked = false; + C_test_eth0.Checked = false; + C_test_eth1.Checked = false; + C_test_USB.Checked = false; + C_test_MB_DIO.Checked = false; + C_test_MB_AIO.Checked = false; + C_test_MB_RLY.Checked = false; + } + + private void B_conf_removeEB_Click(object sender, EventArgs e) + { + C_test_EB_LED.Checked = false; + C_test_EB_EEPROM.Checked = false; + C_test_EB_DIO.Checked = false; + C_test_EB_AIO.Checked = false; + C_test_EB_RLY.Checked = false; + } + + private void B_conf_resettotal_Click(object sender, EventArgs e) + { + TotalFailedNumber = 0; + TotalPassedNumber = 0; + TotalTestNumber = 0; + L_stats_numberfailed.Text = Convert.ToString(TotalFailedNumber); + L_stats_numberpassed.Text = Convert.ToString(TotalPassedNumber); + L_stats_numbertotal.Text = Convert.ToString(TotalTestNumber); + + } + + private void C_conf_settings_RTC_CheckedChanged(object sender, EventArgs e) + { + if (C_conf_settings_RTC.Checked) + { + setRTC = true; + } + else + { + setRTC = false; + } + } + + private void C_conf_cal_AOMB_CheckedChanged(object sender, EventArgs e) + { + if (C_conf_cal_AOMB.Checked) + { + ActivateTest[(int)TestType.CAL_AOMB] = true; + } + else + { + ActivateTest[(int)TestType.CAL_AOMB] = false; + } + } + + private void C_conf_cal_AIMB_CheckedChanged(object sender, EventArgs e) + { + if (C_conf_cal_AOMB.Checked) + { + ActivateTest[(int)TestType.CAL_AIMB] = true; + } + else + { + ActivateTest[(int)TestType.CAL_AIMB] = false; + } + } + + private void C_conf_cal_AOEB_CheckedChanged(object sender, EventArgs e) + { + if (C_conf_cal_AOMB.Checked) + { + ActivateTest[(int)TestType.CAL_AOEB] = true; + } + else + { + ActivateTest[(int)TestType.CAL_AOEB] = false; + } + } + + private void C_conf_cal_AIEB_CheckedChanged(object sender, EventArgs e) + { + if (C_conf_cal_AOMB.Checked) + { + ActivateTest[(int)TestType.CAL_AIEB] = true; + } + else + { + ActivateTest[(int)TestType.CAL_AIEB] = false; } } }