jionmt-sw/prod-ProductFunctionTester
5
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: RFReCount() 함수를 formType에 따라 분기 처리

Browse Source
This commit is contained in:
kje97 2025-06-24 17:53:09 +09:00
commit 9090c8564c
1 changed files with 50 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
ProductFunctionTester/Main_Form.vb
View File

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