Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 065f208ecb | |||
| f9c13a2ed9 |
5480
frmTD_JIG.Designer.vb
generated
5480
frmTD_JIG.Designer.vb
generated
File diff suppressed because it is too large
Load Diff
36
frmTD_JIG.vb
36
frmTD_JIG.vb
@ -10,7 +10,7 @@ Imports System.Runtime.InteropServices.ComTypes
|
|||||||
Imports System.Text
|
Imports System.Text
|
||||||
|
|
||||||
Public Class frmTD_JIG
|
Public Class frmTD_JIG
|
||||||
Public Const TESTER_VER As String = "2.4.2"
|
Public Const TESTER_VER As String = "3.0.0"
|
||||||
Public ShowDetailLog As Boolean = False
|
Public ShowDetailLog As Boolean = False
|
||||||
Public RunDemoMode As Boolean = False
|
Public RunDemoMode As Boolean = False
|
||||||
Public EnableSetup As Boolean = False
|
Public EnableSetup As Boolean = False
|
||||||
@ -2427,7 +2427,7 @@ VisaComError:
|
|||||||
DelayMs(Val(txbOntime.Text) + 50)
|
DelayMs(Val(txbOntime.Text) + 50)
|
||||||
|
|
||||||
RetStr = RunMeasure()
|
RetStr = RunMeasure()
|
||||||
If RetStr = "Fail" Then
|
If IsNumeric(RetStr) = False Or RetStr = "Fail" Then
|
||||||
StatusFail = True
|
StatusFail = True
|
||||||
txbRun.Text = "Scope Error 03" 'cmdDisplay("Trigger failure")
|
txbRun.Text = "Scope Error 03" 'cmdDisplay("Trigger failure")
|
||||||
txbRun.BackColor = Color.Red
|
txbRun.BackColor = Color.Red
|
||||||
@ -2489,7 +2489,7 @@ VisaComError:
|
|||||||
DelayMs(Val(txbOntime.Text) + 50)
|
DelayMs(Val(txbOntime.Text) + 50)
|
||||||
|
|
||||||
RetStr = RunMeasure()
|
RetStr = RunMeasure()
|
||||||
If RetStr = "Fail" Then
|
If IsNumeric(RetStr) = False Or RetStr = "Fail" Then
|
||||||
StatusFail = True
|
StatusFail = True
|
||||||
txbRun.Text = "Scope Error 03" 'cmdDisplay("Trigger failure")
|
txbRun.Text = "Scope Error 03" 'cmdDisplay("Trigger failure")
|
||||||
txbRun.BackColor = Color.Red
|
txbRun.BackColor = Color.Red
|
||||||
@ -2544,17 +2544,31 @@ MEASURE_END:
|
|||||||
Else
|
Else
|
||||||
RegMeasure.MeasureValue(0) = 0
|
RegMeasure.MeasureValue(0) = 0
|
||||||
|
|
||||||
For Cnt = 1 To RelayCnt.Length - 1
|
If Mid(RegMeasure.MeasurePV_SN, 1, 2) = "J3" Then
|
||||||
If RegMeasure.MeasureValue(RelayCnt(Cnt)) <= ProMAX And RegMeasure.MeasureValue(0) = 0 Then RegMeasure.MeasureValue(0) = Cnt
|
For Cnt = 1 To RelayCnt.Length - 1
|
||||||
|
If RegMeasure.MeasureValue(RelayCnt(Cnt)) <= EyeMAX And RegMeasure.MeasureValue(0) = 0 Then RegMeasure.MeasureValue(0) = Cnt
|
||||||
|
|
||||||
If RegMeasure.MeasureValue(0) Then
|
If RegMeasure.MeasureValue(0) Then
|
||||||
If RegMeasure.MeasureValue(RegMeasure.MeasureValue(0)) < RegMeasure.MeasureValue(RelayCnt(Cnt)) Then
|
If RegMeasure.MeasureValue(RegMeasure.MeasureValue(0)) < RegMeasure.MeasureValue(RelayCnt(Cnt)) Then
|
||||||
If RegMeasure.MeasureValue(RelayCnt(Cnt)) <= ProMAX Then
|
If RegMeasure.MeasureValue(RelayCnt(Cnt)) <= EyeMAX Then
|
||||||
RegMeasure.MeasureValue(0) = RelayCnt(Cnt)
|
RegMeasure.MeasureValue(0) = RelayCnt(Cnt)
|
||||||
|
End If
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
End If
|
Next
|
||||||
Next
|
Else
|
||||||
|
For Cnt = 1 To RelayCnt.Length - 1
|
||||||
|
If RegMeasure.MeasureValue(RelayCnt(Cnt)) <= ProMAX And RegMeasure.MeasureValue(0) = 0 Then RegMeasure.MeasureValue(0) = Cnt
|
||||||
|
|
||||||
|
If RegMeasure.MeasureValue(0) Then
|
||||||
|
If RegMeasure.MeasureValue(RegMeasure.MeasureValue(0)) < RegMeasure.MeasureValue(RelayCnt(Cnt)) Then
|
||||||
|
If RegMeasure.MeasureValue(RelayCnt(Cnt)) <= ProMAX Then
|
||||||
|
RegMeasure.MeasureValue(0) = RelayCnt(Cnt)
|
||||||
|
End If
|
||||||
|
End If
|
||||||
|
End If
|
||||||
|
Next
|
||||||
|
End If
|
||||||
|
|
||||||
If RegMeasure.MeasureValue(0) = 0 Then
|
If RegMeasure.MeasureValue(0) = 0 Then
|
||||||
RegMeasure.MeasureOkNg = "NG"
|
RegMeasure.MeasureOkNg = "NG"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user