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:test
Branches Tags
jionmt-sw:master
jionmt-sw:dot_test
jionmt-sw:test
jionmt-sw:2.4.2

1 Commits
master ... test

Author SHA1 Message Date
jiwonRepair
1055df729e feat: update to baudrate in ini file 2025-08-22 16:35:09 +09:00
2 changed files with 2909 additions and 2612 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

41
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
@ -36,6 +36,7 @@ Public Class frmTD_JIG
Public Title_Text As String Public Title_Text As String
Public AutoAgingCnt As Long Public AutoAgingCnt As Long
Public CkbNoRun As Boolean Public CkbNoRun As Boolean
Public baudrate_ini As Integer
Private txtPVSN As String Private txtPVSN As String
Private SettingMeasure As String Private SettingMeasure As String
@ -451,6 +452,8 @@ Public Class frmTD_JIG
txbMinValue.Text = ConifgStr txbMinValue.Text = ConifgStr
End If End If
baudrate_ini = Integer.Parse(ConifgStr.Split(","c).Last()) 'get last string in ini file
ParaComport = cboComPort.Text ParaComport = cboComPort.Text
ParaScopeID = "USB0::0x2A8D::" & txbScopeID.Text & "::0::INSTR" ParaScopeID = "USB0::0x2A8D::" & txbScopeID.Text & "::0::INSTR"
@ -844,7 +847,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 = baudrate_ini '230400
.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 +2430,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 +2492,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,31 +2547,17 @@ 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
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)) <= 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)) <= EyeMAX Then If RegMeasure.MeasureValue(RelayCnt(Cnt)) <= ProMAX Then
RegMeasure.MeasureValue(0) = RelayCnt(Cnt) RegMeasure.MeasureValue(0) = RelayCnt(Cnt)
End If
End If End If
End If End If
Next End If
Else Next
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"