diff --git a/ProductFunctionTester/Main_Form.vb b/ProductFunctionTester/Main_Form.vb index 983a777..0f8d2f1 100644 --- a/ProductFunctionTester/Main_Form.vb +++ b/ProductFunctionTester/Main_Form.vb @@ -78,7 +78,7 @@ Public Class Main_Form Private StartSwitch As Boolean Private TDSNHead1 As String = "DIT" - Private TDSNHead2 As String = "J" + Private TDSNHead2 As String = "J3" Private Const TestType As String = "SET" Private Const TestModel As String = "MAXIMUM" @@ -1073,31 +1073,31 @@ Public Class Main_Form Return True End If - If Scale_Snd If + If Scale_Snd Then If ScopeData = DoCommand(":DISPlay:ANNotation:BACKground TRAN") - If ScopeData <> "PASS" Then - txbWindow.AppendText("Scope Annotation BackGround Error:" & ScopeData & vbCrLf) - ErrCheck = True - Else - txbWindow.AppendText("Scope Annotation BackGround:" & ScopeData & vbCrLf) - End If + If ScopeData <> "PASS" Then + txbWindow.AppendText("Scope Annotation BackGround Error:" & ScopeData & vbCrLf) + ErrCheck = True + Else + txbWindow.AppendText("Scope Annotation BackGround:" & ScopeData & vbCrLf) + End If - ScopeData = DoCommand(":CHANnel1:COUPling DC") - If ScopeData <> "PASS" Then - txbWindow.AppendText(vbCrLf & "Scope Coupling Set Error:" & ScopeData & vbCrLf) - ErrCheck = True - Else - txbWindow.AppendText(vbCrLf & "Scope Coupling Set:" & ScopeData & vbCrLf) - End If + ScopeData = DoCommand(":CHANnel1:COUPling DC") + If ScopeData <> "PASS" Then + txbWindow.AppendText(vbCrLf & "Scope Coupling Set Error:" & ScopeData & vbCrLf) + ErrCheck = True + Else + txbWindow.AppendText(vbCrLf & "Scope Coupling Set:" & ScopeData & vbCrLf) + End If - RF_Setting() '' 50ms 단축을 위해 사용 - 안할시 170ms / 적용시 110ms + RF_Setting() '' 50ms 단축을 위해 사용 - 안할시 170ms / 적용시 110ms - If ErrCheck = True Then - Return True - End If + If ErrCheck = True Then + Return True + End If - Return False + Return False End Function Private Function RF_Setting() As Boolean @@ -2424,7 +2424,7 @@ SettingFail: End Try forSettingFail: - rfTestFail(forcnt) + rfTestFail(ForCnt) SettingFail: txbWindow.AppendText("Run RF FAIL" & vbCrLf) TestRunningState(testRunningList.Fail, Color.Red) @@ -4718,39 +4718,39 @@ NormalEnd: End If If TDResult.Length <> 10 Then - _EPVpp(0) & "," & TestData.Test_EPFreq(0) & "," & TestData.Test_EPPWidth(0) & "," & TestData.Test_EPNWidth(0) & "," & TestData.Test_EPVpp(1) & "," & TestData.Test_EPFreq(1) & "," & TestData.Test_EPPWidth(1) & "," & TestData.Test_EPNWidth(1) & "," & TestData.Test_EPVpp(2) & "," & TestData.Test_EPFreq(2) & "," & TestData.Test_EPPWidth(2) & "," & TestData.Test_EPNWidth(2) & "," & TestError & "" + _EPVpp(0) & "," & TestData.Test_EPFreq(0) & "," & TestData.Test_EPPWidth(0) & "," & TestData.Test_EPNWidth(0) & "," & TestData.Test_EPVpp(1) & "," & TestData.Test_EPFreq(1) & "," & TestData.Test_EPPWidth(1) & "," & TestData.Test_EPNWidth(1) & "," & TestData.Test_EPVpp(2) & "," & TestData.Test_EPFreq(2) & "," & TestData.Test_EPPWidth(2) & "," & TestData.Test_EPNWidth(2) & "," & TestError & "" If Save_Csv(csvData) Then - txbWindow.AppendText("CSV Data Save : FAIL" & vbCrLf) - FailMain() - - Else - - txbWindow.AppendText("Run Count Change Save : OK" & vbCrLf) - - If TestError = False Then - FailMain() - Else - SuccessMain() - End If - - End If - Else - - txbWindow.AppendText("Run Count Change Save : FAIL" & vbCrLf) - FailMain() - - End If + txbWindow.AppendText("CSV Data Save : FAIL" & vbCrLf) + FailMain() Else - txbWindow.AppendText("DB Data Save : FAIL" & vbCrLf) - FailMain() + + txbWindow.AppendText("Run Count Change Save : OK" & vbCrLf) + + If TestError = False Then + FailMain() + Else + SuccessMain() + End If + End If + Else + + txbWindow.AppendText("Run Count Change Save : FAIL" & vbCrLf) + FailMain() + + End If Else - txbWindow.AppendText("PostgreSQL Data Save : FAIL" & vbCrLf) - FailMain() + txbWindow.AppendText("DB Data Save : FAIL" & vbCrLf) + FailMain() + End If + + Else + txbWindow.AppendText("PostgreSQL Data Save : FAIL" & vbCrLf) + FailMain() End If ProcessEnd: @@ -4758,7 +4758,7 @@ ProcessEnd: NormalEnd: myscope.IO.Clear() txbWindow.AppendText("[" & MeasureTimeAll(MeasEnd) & "ms] Test Play" & vbCrLf) - End Sub + End Sub Private Function TDSetCheck() As Boolean Dim TDResult As String = TD_name_load() @@ -4904,8 +4904,8 @@ NormalEnd: GoTo RunSuccess - Else - MsgBox("지그를 연결한 후 동작하여 주십시오.", vbCritical, Program_Name & Program_Version) + Else + MsgBox("지그를 연결한 후 동작하여 주십시오.", vbCritical, Program_Name & Program_Version) FailMain() GoTo NormalEnd End If @@ -5414,6 +5414,7 @@ ProcessEnd: ' End If ' End If 'End Sub + Private Sub RFReCount() If dupDATA = 0 Then txbDayCount.Text = Val(txbDayCount.Text) + 1