diff --git a/ProductFunctionTester/Main_Form.vb b/ProductFunctionTester/Main_Form.vb index 7269db6..e40e3af 100644 --- a/ProductFunctionTester/Main_Form.vb +++ b/ProductFunctionTester/Main_Form.vb @@ -9,7 +9,7 @@ Imports uPLibrary.Networking.M2Mqtt Public Class Main_Form Public Program_Name As String = "DUALSONIC_Multi_Function_Tester Ver." - Public Program_Version As String = "2.0.5" + Public Program_Version As String = "2.0.6" ''데이터 베이스 테이블 목록 @@ -72,7 +72,7 @@ Public Class Main_Form prdRFEP prdDsHF company - + iqcHFEP MAX_FORM_TYPE End Enum Private formType As Int16 @@ -579,6 +579,7 @@ Public Class Main_Form comboBoxModel.Items.Add(New DictionaryEntry(ModelName, ModelCode)) Next End If + comboBoxModel.Items.Add(New DictionaryEntry("WON", "99")) comboBoxModel.Text = "MAXIMUM" End Sub @@ -3883,6 +3884,8 @@ DataFail: CompanyFunction() Case formTypeList.iqcDsHF, formTypeList.prdDsHF DSTestFunction() + Case formTypeList.iqcHFEP + iqcHfEpFunction() Case Else MsgBox("잘못된 동작 모드가 입력되어 있습니다. 관리자에게 문의해주세요.", vbCritical) End Select @@ -4719,6 +4722,112 @@ ErrorEnd: End Function + Private Sub iqcHfEpFunction() + StartTime = MeasureTimeAll(MeasStart) + + If StartSwitch = True Then + If JigSerial.IsOpen = True Then + + If txbBarcode.Text = "[START]" Then + + For i = 0 To nudOnRe.Value + + If JigRun_On() Then + GoTo processEnd + End If + + delay_run(StepDelay) + + If FirmVerCheck() Then + + Dim ReadUni As Byte() = Encoding.Unicode.GetBytes(TestData.Test_Firmware) + + If ReadUni(0) < 57 Then + MsgBox("잘못된 펌웨어 버전입니다. 버전을 확인하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo processEnd + End If + + If i = nudOnRe.Value Then + MsgBox("전원 ON에 실패하였습니다. 다시 시도하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo processEnd + End If + + Else + Exit For + End If + + delay_run(StepDelay) + + Next + + If BuzzerTestFunc(0) Then + TestError = False + GoTo processEnd + End If + + delay_run(StepDelay) + + If TempTest() Then + TestError = False + GoTo processEnd + End If + + delay_run(StepDelay) + + If HFTestRun() Then + TestError = False + GoTo processEnd + End If + + delay_run(StepDelay) + + If BuzzerTestFunc(1) Then + TestError = False + GoTo processEnd + End If + + delay_run(StepDelay) + + If EPTestRun() Then + TestError = False + GoTo processEnd + End If + + GoTo SuccessEnd + + Else + MsgBox("잘못된 시작 명령어를 입력하였습니다.", vbExclamation, Program_Name & Program_Version) + GoTo ErrorEnd + End If + Else + MsgBox("지그를 연결한 후 동작하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo ErrorEnd + End If + Else + MsgBox("스코프와 스펙트럼을 연결한 후 동작하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo ErrorEnd + End If + + +SuccessEnd: + + If TestError = False Then + FailMain() + txbWindow.AppendText("Total Process Fail" & vbCrLf) + Else + SuccessMain() + txbWindow.AppendText("Total Process Success" & vbCrLf) + End If + +processEnd: + Jig_End() + +ErrorEnd: + myscope.IO.Clear() + txbWindow.AppendText("[" & MeasureTimeAll(MeasEnd) & "ms] Test Play" & vbCrLf) + End Sub + + Private Sub iqcHfFunction() StartTime = MeasureTimeAll(MeasStart) @@ -7633,6 +7742,19 @@ WR_File_Error: checkBoxEpUse.Checked = False checkBoxMcUse.Checked = False + If ModelCode.Equals("99") Then + comboBoxVerificationStep.DisplayMember = "Key" + comboBoxVerificationStep.ValueMember = "Value" + comboBoxVerificationStep.Items.Clear() + comboBoxVerificationStep.Items.Add(New DictionaryEntry("수입검사(HF/EP)", "iqcHFEP")) + checkBoxHfUse.Checked = True + checkBoxEpUse.Checked = True + If comboBoxVerificationStep.Items.Count > 0 Then + comboBoxVerificationStep.SelectedIndex = 0 + End If + Return + End If + DBCmd = "SELECT DeviceTypeCode, CartTypeName, TDUseYn, HifuUseYn, RfUseYn, EpUseYn, McUseYn FROM " & ApplyModelInfoDB & " WHERE ModelCode = '" & ModelCode & "' LIMIT 1" If DBQueryReader(DBCmd) Then DeviceTypeCode = sqlDataQuery(0) @@ -7750,6 +7872,13 @@ WR_File_Error: Case "company" gbAltoIQC.Visible = True formType = formTypeList.company + Case "iqcHFEP" + gbIQC.Visible = True + pnIQCRF.Visible = True + pnIQCRun2.Visible = True + pnIQCEP.Visible = True + pnIQCRun3.Visible = True + formType = formTypeList.iqcHFEP End Select changeMode()