Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1055df729e |
5480
frmTD_JIG.Designer.vb
generated
5480
frmTD_JIG.Designer.vb
generated
File diff suppressed because it is too large
Load Diff
41
frmTD_JIG.vb
41
frmTD_JIG.vb
@ -10,7 +10,7 @@ Imports System.Runtime.InteropServices.ComTypes
|
||||
Imports System.Text
|
||||
|
||||
Public Class frmTD_JIG
|
||||
Public Const TESTER_VER As String = "3.0.0"
|
||||
Public Const TESTER_VER As String = "2.4.2"
|
||||
Public ShowDetailLog As Boolean = False
|
||||
Public RunDemoMode As Boolean = False
|
||||
Public EnableSetup As Boolean = False
|
||||
@ -36,6 +36,7 @@ Public Class frmTD_JIG
|
||||
Public Title_Text As String
|
||||
Public AutoAgingCnt As Long
|
||||
Public CkbNoRun As Boolean
|
||||
Public baudrate_ini As Integer
|
||||
|
||||
Private txtPVSN As String
|
||||
Private SettingMeasure As String
|
||||
@ -451,6 +452,8 @@ Public Class frmTD_JIG
|
||||
txbMinValue.Text = ConifgStr
|
||||
End If
|
||||
|
||||
baudrate_ini = Integer.Parse(ConifgStr.Split(","c).Last()) 'get last string in ini file
|
||||
|
||||
ParaComport = cboComPort.Text
|
||||
ParaScopeID = "USB0::0x2A8D::" & txbScopeID.Text & "::0::INSTR"
|
||||
|
||||
@ -844,7 +847,7 @@ WR_File_Error:
|
||||
If cmdSerialPort.IsOpen = False Then
|
||||
With cmdSerialPort
|
||||
.PortName = ParaComport
|
||||
.BaudRate = 230400
|
||||
.BaudRate = baudrate_ini '230400
|
||||
.DataBits = 8
|
||||
.Parity = IO.Ports.Parity.None
|
||||
.StopBits = IO.Ports.StopBits.One
|
||||
@ -2427,7 +2430,7 @@ VisaComError:
|
||||
DelayMs(Val(txbOntime.Text) + 50)
|
||||
|
||||
RetStr = RunMeasure()
|
||||
If IsNumeric(RetStr) = False Or RetStr = "Fail" Then
|
||||
If RetStr = "Fail" Then
|
||||
StatusFail = True
|
||||
txbRun.Text = "Scope Error 03" 'cmdDisplay("Trigger failure")
|
||||
txbRun.BackColor = Color.Red
|
||||
@ -2489,7 +2492,7 @@ VisaComError:
|
||||
DelayMs(Val(txbOntime.Text) + 50)
|
||||
|
||||
RetStr = RunMeasure()
|
||||
If IsNumeric(RetStr) = False Or RetStr = "Fail" Then
|
||||
If RetStr = "Fail" Then
|
||||
StatusFail = True
|
||||
txbRun.Text = "Scope Error 03" 'cmdDisplay("Trigger failure")
|
||||
txbRun.BackColor = Color.Red
|
||||
@ -2544,31 +2547,17 @@ MEASURE_END:
|
||||
Else
|
||||
RegMeasure.MeasureValue(0) = 0
|
||||
|
||||
If Mid(RegMeasure.MeasurePV_SN, 1, 2) = "J3" Then
|
||||
For Cnt = 1 To RelayCnt.Length - 1
|
||||
If RegMeasure.MeasureValue(RelayCnt(Cnt)) <= EyeMAX And RegMeasure.MeasureValue(0) = 0 Then RegMeasure.MeasureValue(0) = Cnt
|
||||
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)) <= EyeMAX Then
|
||||
RegMeasure.MeasureValue(0) = RelayCnt(Cnt)
|
||||
End If
|
||||
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
|
||||
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
|
||||
End If
|
||||
Next
|
||||
|
||||
If RegMeasure.MeasureValue(0) = 0 Then
|
||||
RegMeasure.MeasureOkNg = "NG"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user