jionmt-sw/store-TDTestExecutor
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Compare commits

base: jionmt-sw:master
Branches Tags
jionmt-sw:master
jionmt-sw:dot_test
jionmt-sw:test
jionmt-sw:2.4.2
..
compare: jionmt-sw:2.4.2
Branches Tags
jionmt-sw:master
jionmt-sw:dot_test
jionmt-sw:test
jionmt-sw:2.4.2

No commits in common. "master" and "2.4.2" have entirely different histories.
master ... 2.4.2

2 changed files with 2923 additions and 2621 deletions
Show Stats Expand all files Collapse all files

5480
frmTD_JIG.Designer.vb generated
View File

File diff suppressed because it is too large Load Diff

48
frmTD_JIG.vb
View File

@ -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 = "3.0.0" Public Const TESTER_VER As String = "2.4.2"
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
@ -844,7 +844,7 @@ WR_File_Error:
If cmdSerialPort.IsOpen = False Then If cmdSerialPort.IsOpen = False Then
With cmdSerialPort With cmdSerialPort
.PortName = ParaComport .PortName = ParaComport
.BaudRate = 230400 .BaudRate = 115200
.DataBits = 8 .DataBits = 8
.Parity = IO.Ports.Parity.None .Parity = IO.Ports.Parity.None
.StopBits = IO.Ports.StopBits.One .StopBits = IO.Ports.StopBits.One
@ -2427,7 +2427,7 @@ VisaComError:
DelayMs(Val(txbOntime.Text) + 50) DelayMs(Val(txbOntime.Text) + 50)
RetStr = RunMeasure() RetStr = RunMeasure()
If IsNumeric(RetStr) = False Or RetStr = "Fail" Then If 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 IsNumeric(RetStr) = False Or RetStr = "Fail" Then If 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,19 +2544,6 @@ MEASURE_END:
Else Else
RegMeasure.MeasureValue(0) = 0 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
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
End If
End If
Next
Else
For Cnt = 1 To RelayCnt.Length - 1 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(RelayCnt(Cnt)) <= ProMAX And RegMeasure.MeasureValue(0) = 0 Then RegMeasure.MeasureValue(0) = Cnt
@ -2568,7 +2555,6 @@ MEASURE_END:
End If End If
End If End If
Next Next
End If
If RegMeasure.MeasureValue(0) = 0 Then If RegMeasure.MeasureValue(0) = 0 Then
RegMeasure.MeasureOkNg = "NG" RegMeasure.MeasureOkNg = "NG"
@ -5931,7 +5917,7 @@ MEASURE_END:
Private Sub btnCal_Click(sender As Object, e As EventArgs) Handles btnCal.Click Private Sub btnCal_Click(sender As Object, e As EventArgs) Handles btnCal.Click
If CalModeOn = False Then If CalModeOn = False Then
CalModeOn = True CalModeOn = True
'txbCmdWindow.Clear() 'Commenting out to check logs txbCmdWindow.Clear()
txbCmdWindow.Visible = True txbCmdWindow.Visible = True
gbTestWindow.Visible = False gbTestWindow.Visible = False
btnRunIQC.Enabled = True btnRunIQC.Enabled = True
@ -5946,7 +5932,10 @@ MEASURE_END:
btnRunIQC.Enabled = True btnRunIQC.Enabled = True
txbPV_Freq.Text = "N/A" txbPV_Freq.Text = "N/A"
resizeCmdWindow(505, 380, 513, 21) txbCmdWindow.Width = 505
txbCmdWindow.Height = 380
txbCmdWindow.Left = 513
txbCmdWindow.Top = 21
End Sub End Sub
Private Sub btPrintref_Click(sender As Object, e As EventArgs) Handles btPrintref.Click Private Sub btPrintref_Click(sender As Object, e As EventArgs) Handles btPrintref.Click
@ -6120,15 +6109,20 @@ MEASURE_END:
End If End If
End Sub End Sub
Private Sub resizeCmdWindow(width As Int32, height As Int32, left As Int32, top As Int32) 'Private Sub showCmdWindow()
txbCmdWindow.Width = width ' txbCmdWindow.Width = 505
txbCmdWindow.Height = height ' txbCmdWindow.Height = 80
txbCmdWindow.Left = left ' txbCmdWindow.Left = 513
txbCmdWindow.Top = top ' txbCmdWindow.Top = 300
End Sub ' txbCmdWindow.BringToFront()
' txbCmdWindow.Visible = True
'End Sub
Private Sub showCmdWindow() Private Sub showCmdWindow()
resizeCmdWindow(505, 200, 513, 200) txbCmdWindow.Width = 505
txbCmdWindow.Height = 200
txbCmdWindow.Left = 513
txbCmdWindow.Top = 200
txbCmdWindow.BringToFront() txbCmdWindow.BringToFront()
txbCmdWindow.Visible = True txbCmdWindow.Visible = True
End Sub End Sub