fix: formType에 따라 다른 count 로직 적용

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 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
 
@@ -4621,6 +4695,64 @@ RunSuccess:
             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()
+
+        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:
@@ -5282,7 +5414,6 @@ ProcessEnd:
     '        End If
     '    End If
     'End Sub
-
     Private Sub RFReCount()
         If dupDATA = 0 Then
             txbDayCount.Text = Val(txbDayCount.Text) + 1
@@ -5323,6 +5454,7 @@ ProcessEnd:
         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 & "'"