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

ProductFunctionTester/Main_Form.vb

@@ -1026,6 +1026,80 @@ Public Class Main_Form
         Return False
     End Function
 
+    Private Function RF_Setting() As Boolean
+        Dim SetString As String
+
+        If TrigSlope_Set("POS") = False Then
+            Return True
+        End If
+
+        If rdbRFTrAuto.Checked = True Then
+            SetString = "AUTO"
+        Else
+            SetString = "NORMal"
+        End If
+
+        If TriggerSet(SetString) = False Then
+            Return True
+        End If
+
+        If TrigMod_Set() = False Then
+            Return True
+        End If
+
+        If TrigLv_Set(nudRFTrgLv.Value) = False Then
+            Return True
+        End If
+
+        If TimeScale_Set(CSng(txbRFtime.Text)) = False Then
+            Return True
+        End If
+
+        If Delay_Select(Val(txbRFDelay.Text)) = False Then
+            Return True
+        End If
+
+        If CH_Select(nudRFCh.Value) = False Then
+            Return True
+        End If
+
+        If rdbRFUnitV.Checked = True Then
+            SetString = "VOLT"
+        Else
+            SetString = "AMPere"
+        End If
+
+        If Unit_Select(SetString, nudRFCh.Value) = False Then
+            Return True
+        End 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
+
+            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
+
+            If ErrCheck = True Then
+                Return True
+            End If
+
+            Return False
+    End Function
+
     Private Function RF_Setting() As Boolean
         Dim SetString As String
 
@@ -2350,7 +2424,7 @@ SettingFail:
         End Try
 
 forSettingFail:
-        rfTestFail(forcnt)
+        rfTestFail(ForCnt)
 SettingFail:
         txbWindow.AppendText("Run RF FAIL" & vbCrLf)
         TestRunningState(testRunningList.Fail, Color.Red)
@@ -4628,6 +4702,64 @@ NormalEnd:
         txbWindow.AppendText("[" & MeasureTimeAll(MeasEnd) & "ms] Test Play" & vbCrLf)
     End Sub
 
+    Private Function TDSetCheck() As Boolean
+        Dim TDResult As String = TD_name_load()
+
+        If TDResult = "1" Then
+            MsgBox("Send 중 오류가 발생하였습니다.", vbCritical)
+            txbTDSN.ForeColor = Color.Red
+            Return True
+        End If
+
+        If TDResult = "0" Then
+            MsgBox("Receive 중 오류가 발생하였습니다.", vbCritical)
+            txbTDSN.ForeColor = Color.Red
+            Return True
+        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 & ""
+
+                    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
+
+        Else
+        txbWindow.AppendText("DB Data Save : FAIL" & vbCrLf)
+        FailMain()
+        End If
+
+        Else
+        txbWindow.AppendText("PostgreSQL Data Save : FAIL" & vbCrLf)
+        FailMain()
+        End If
+
+ProcessEnd:
+        Jig_End()
+NormalEnd:
+        myscope.IO.Clear()
+        txbWindow.AppendText("[" & MeasureTimeAll(MeasEnd) & "ms] Test Play" & vbCrLf)
+        End Sub
+
     Private Function TDSetCheck() As Boolean
         Dim TDResult As String = TD_name_load()
 
@@ -4772,8 +4904,8 @@ NormalEnd:
 
                 GoTo RunSuccess
 
-                Else
+            Else
-                    MsgBox("지그를 연결한 후 동작하여 주십시오.", vbCritical, Program_Name & Program_Version)
+                MsgBox("지그를 연결한 후 동작하여 주십시오.", vbCritical, Program_Name & Program_Version)
                 FailMain()
                 GoTo NormalEnd
             End If
@@ -5260,6 +5392,29 @@ ProcessEnd:
         txbOkCount.Text = Val(txbOkCount.Text) + 1
     End Sub
 
+    'Private Sub RFReCount()
+    '    If dupDATA = 0 Then
+    '        txbDayCount.Text = Val(txbDayCount.Text) + 1
+    '        If processNum = TestStepList.RF_NewSuc Or processNum = TestStepList.Rf_ReSuc Then
+    '            txbOkCount.Text = Val(txbOkCount.Text) + 1
+    '        Else
+    '            txbNgCount.Text = Val(txbNgCount.Text) + 1
+    '        End If
+    '    Else
+    '        If TDDataSet(TD_Data.TestStep) = TestStepList.Rf_NewFail Or TDDataSet(TD_Data.TestStep) = TestStepList.RF_ReFail Then
+    '            If processNum = TestStepList.HF_NewSuc Or processNum = TestStepList.HF_ReSuc Then
+    '                txbOkCount.Text = Val(txbOkCount.Text) + 1
+    '                txbNgCount.Text = Val(txbNgCount.Text) - 1
+    '            End If
+    '        Else
+    '            If processNum = TestStepList.HF_NEWFail Or processNum = TestStepList.HF_ReFail Then
+    '                txbOkCount.Text = Val(txbOkCount.Text) - 1
+    '                txbNgCount.Text = Val(txbNgCount.Text) + 1
+    '            End If
+    '        End If
+    '    End If
+    'End Sub
+
     Private Sub RFReCount()
         If dupDATA = 0 Then
             txbDayCount.Text = Val(txbDayCount.Text) + 1
@@ -5269,20 +5424,38 @@ ProcessEnd:
                 txbNgCount.Text = Val(txbNgCount.Text) + 1
             End If
         Else
-            If TDDataSet(TD_Data.TestStep) = TestStepList.Rf_NewFail Or TDDataSet(TD_Data.TestStep) = TestStepList.RF_ReFail Then
+            ' formType에 따라 다른 로직 적용
-                If processNum = TestStepList.HF_NewSuc Or processNum = TestStepList.HF_ReSuc Then
+            If formType = formTypeList.altoPD Then
-                    txbOkCount.Text = Val(txbOkCount.Text) + 1
+                ' Alto PD의 경우 Alto 관련 TestStep 사용
-                    txbNgCount.Text = Val(txbNgCount.Text) - 1
+                If TDDataSet(TD_Data.TestStep) = TestStepList.Rf_NewFail Or TDDataSet(TD_Data.TestStep) = TestStepList.RF_ReFail Then
+                    If processNum = TestStepList.HF_NewSuc Or processNum = TestStepList.HF_ReSuc Then
+                        txbOkCount.Text = Val(txbOkCount.Text) + 1
+                        txbNgCount.Text = Val(txbNgCount.Text) - 1
+                    End If
+                Else
+                    If processNum = TestStepList.HF_NEWFail Or processNum = TestStepList.HF_ReFail Then
+                        txbOkCount.Text = Val(txbOkCount.Text) - 1
+                        txbNgCount.Text = Val(txbNgCount.Text) + 1
+                    End If
                 End If
             Else
-                If processNum = TestStepList.HF_NEWFail Or processNum = TestStepList.HF_ReFail Then
+                ' 일반 RF의 경우 RF 관련 TestStep 사용
-                    txbOkCount.Text = Val(txbOkCount.Text) - 1
+                If TDDataSet(TD_Data.TestStep) = TestStepList.Rf_NewFail Or TDDataSet(TD_Data.TestStep) = TestStepList.RF_ReFail Then
-                    txbNgCount.Text = Val(txbNgCount.Text) + 1
+                    If processNum = TestStepList.RF_NewSuc Or processNum = TestStepList.Rf_ReSuc Then
+                        txbOkCount.Text = Val(txbOkCount.Text) + 1
+                        txbNgCount.Text = Val(txbNgCount.Text) - 1
+                    End If
+                Else
+                    If processNum = TestStepList.Rf_NewFail Or processNum = TestStepList.RF_ReFail Then
+                        txbOkCount.Text = Val(txbOkCount.Text) - 1
+                        txbNgCount.Text = Val(txbNgCount.Text) + 1
+                    End If
                 End If
             End If
         End If
     End Sub
 
+
     Private Function CountUpdate() As Boolean
         If rdbAltoPD.Checked = True Then
             DBCmd = "UPDATE " & pd1CntTableNow & " SET PD1_AltoCnt = '" & txbDayCount.Text & "', PD1_AltoOkCnt = '" & txbOkCount.Text & "', PD1_AltoNgCnt = '" & txbNgCount.Text & "' WHERE PD1_Date = '" & NowDate & "'"