From 94f85752ce8d0b9f3483d24b188e87295020f9c8 Mon Sep 17 00:00:00 2001 From: TAO Cheng Date: Fri, 12 Jul 2013 16:40:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=AD=A3=E5=B8=B8=E8=BF=90?= =?UTF-8?q?=E8=A1=8CCNC=EF=BC=8C=E6=98=BE=E7=A4=BA=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=8C=E4=BB=A5=E5=8F=8A=E6=97=A0=E9=99=90?= =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E8=BF=90=E8=A1=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tools/UsbUtility/Debug/UtilityDebug.Log | 66 ++++++++ .../Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc | 16 +- .../Tools/UsbUtility/UsbUtil/MyListCtrl.cpp | 8 +- .../UsbUtility/UsbUtil/So7_Util_Program.cpp | 156 +++++++++++++++--- .../UsbUtility/UsbUtil/So7_Util_Program.h | 8 + .../Hsi/Tools/UsbUtility/UsbUtil/resource.h | 4 +- .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo | Bin 2355712 -> 2355712 bytes 7 files changed, 224 insertions(+), 34 deletions(-) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log index 3252e47..ee475dc 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log @@ -1929,3 +1929,69 @@ Init:Open device succeed . _start_machine Exit: Exit_SO7Usb Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc index 8d258c0..bb2c1cc 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc @@ -773,16 +773,20 @@ BEGIN PUSHBUTTON "X",IDC_BUTTON_PROGRAM_SET_ZERO_X,427,41,27,21 PUSHBUTTON "Y",IDC_BUTTON_PROGRAM_SET_ZERO_Y,427,64,27,21 PUSHBUTTON "Z",IDC_BUTTON_PROGRAM_SET_ZERO_Z,427,87,27,21 - GROUPBOX "CNC Program",IDC_STATIC,15,14,140,130 - PUSHBUTTON "Add CNC Point",IDC_BUTTON_SO7_PROGRAM_ADD_CNC_PROGRAM,90,29,54,28 - PUSHBUTTON "Run",IDC_BUTTON_SO7_PROGRAM_RUN_CNC,87,65,60,32 + GROUPBOX "CNC Program",IDC_STATIC,15,11,140,130 + PUSHBUTTON "Add CNC Point",IDC_BUTTON_SO7_PROGRAM_ADD_CNC_PROGRAM,22,107,53,21 + PUSHBUTTON "Run",IDC_BUTTON_SO7_PROGRAM_RUN_CNC,88,89,60,32 EDITTEXT IDC_EDIT_SO7_PROGRAM_MSG_OUTPUT,17,276,554,77,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL EDITTEXT IDC_EDIT_READOUT_X,459,42,113,22,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER EDITTEXT IDC_EDIT_READOUT_Z,459,85,113,22,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER EDITTEXT IDC_EDIT_READOUT_Y,459,63,113,22,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - PUSHBUTTON "New",IDC_BUTTON_SO7_PROGRAM_NEW_CNC,25,29,54,28 - PUSHBUTTON "Save as...",IDC_BUTTON_SO7_PROGRAM_SAVE_CNC_FILE,25,105,54,28 - PUSHBUTTON "Open",IDC_BUTTON_SO7_PROGRAM_OPEN_CNC,25,67,54,28 + PUSHBUTTON "New",IDC_BUTTON_SO7_PROGRAM_NEW_CNC,22,29,53,21 + PUSHBUTTON "Save as...",IDC_BUTTON_SO7_PROGRAM_SAVE_CNC_FILE,22,81,53,21 + PUSHBUTTON "Open",IDC_BUTTON_SO7_PROGRAM_OPEN_CNC,22,55,53,21 + EDITTEXT IDC_EDIT_SO7_PROGEAM_CNC_RUING_TIMES,97,59,40,14,ES_AUTOHSCROLL + CONTROL "Infinite",IDC_CHECK_SO7_RUNING_PROGRAM_RUNING_INFINITE, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,100,42,39,10 + GROUPBOX "Times",IDC_STATIC,91,25,54,56 END diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/MyListCtrl.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/MyListCtrl.cpp index 1c6526f..adb2267 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/MyListCtrl.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/MyListCtrl.cpp @@ -21,10 +21,11 @@ COLORREF CMyListCtrl::OnGetCellBkColor(int nRow, int nColum) if (m_bMarkSortedColumn && nColum == m_iSortedColumn) { - return(nRow % 2) == 0 ? RGB(233, 221, 229) : RGB(176, 218, 234); + return(nRow % 2) == 0 ? RGB(170, 230, 255) : RGB(215, 243, 255) ; + //return(nRow % 2) == 0 ? RGB(233, 221, 229) : RGB(176, 218, 234); } - return(nRow % 2) == 0 ? RGB(255, 255, 255) : RGB(211, 223, 238) ; + return(nRow % 2) == 0 ? RGB(170, 230, 255) : RGB(215, 243, 255) ; } //======================================================= HFONT CMyListCtrl::OnGetCellFont(int nRow, int nColum, DWORD /*dwData* = 0*/) @@ -36,7 +37,8 @@ HFONT CMyListCtrl::OnGetCellFont(int nRow, int nColum, DWORD /*dwData* = 0*/) if (nColum == 2 &&(nRow >= 4 && nRow <= 8)) { - return afxGlobalData.fontDefaultGUIBold; + return NULL; + //return afxGlobalData.fontDefaultGUIBold; } return NULL; diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_Program.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_Program.cpp index 3abb4c4..4b33c00 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_Program.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_Program.cpp @@ -31,8 +31,17 @@ IMPLEMENT_DYNAMIC(CSo7_Util_Program, CDialog) CSo7_Util_Program::CSo7_Util_Program(CWnd* pParent /*=NULL*/) : CDialog(CSo7_Util_Program::IDD, pParent) -{ - +{ + m_RptCol=1; + m_RptRow=0; + m_bSetZeroX=FALSE; + m_bSetZeroY=FALSE; + m_bSetZeroZ=FALSE; + m_IsRuningCNC=FALSE; + m_StartTime=0; + m_FinishTime=0; + m_duration=0.0; + m_RuningCNCTimes=1; } CSo7_Util_Program::~CSo7_Util_Program() @@ -80,6 +89,8 @@ BEGIN_MESSAGE_MAP(CSo7_Util_Program, CDialog) ON_EN_KILLFOCUS(IDC_EDIT_SO7_PROGRAM_Y_MOVETO, &CSo7_Util_Program::OnEnKillfocusEditSo7ProgramYMoveto) ON_BN_CLICKED(IDC_RADIO_SO7_PROGRAM_MOVE, &CSo7_Util_Program::OnBnClickedRadioSo7ProgramMove) ON_BN_CLICKED(IIDC_RADIO_SO7_PROGRAM_MOVE_TO, &CSo7_Util_Program::OnBnClickedRadioSo7ProgramMoveTo) + ON_EN_KILLFOCUS(IDC_EDIT_SO7_PROGEAM_CNC_RUING_TIMES, &CSo7_Util_Program::OnEnKillfocusEditSo7ProgeamCncRuingTimes) + ON_BN_CLICKED(IDC_CHECK_SO7_RUNING_PROGRAM_RUNING_INFINITE, &CSo7_Util_Program::OnBnClickedCheckSo7RuningProgramRuningInfinite) END_MESSAGE_MAP() @@ -89,11 +100,6 @@ BOOL CSo7_Util_Program::OnInitDialog() { CDialog::OnInitDialog(); - - m_bSetZeroX=FALSE; - m_bSetZeroY=FALSE; - m_bSetZeroZ=FALSE; - m_IsRuningCNC=FALSE; if (!m_pSO7_Proto->so7_motion_is_homed()) { AfxMessageBox(_T("Homing now!")); @@ -116,6 +122,7 @@ BOOL CSo7_Util_Program::OnInitDialog() m_pSO7_Proto->g_machine.y._Move_Speed_Gear=3; m_pSO7_Proto->g_machine.z._Move_Speed_Gear=3; + (GetDlgItem(IDC_EDIT_SO7_PROGEAM_CNC_RUING_TIMES))->SetWindowTextW(_T("1")); ((CButton *)GetDlgItem(IDC_RADIO_SO7_PROGRAM_MOVE))->SetCheck(1); ((CButton *)GetDlgItem(IIDC_RADIO_SO7_PROGRAM_MOVE_TO))->SetCheck(0); (GetDlgItem(IDC_EDIT_SO7_PROGRAM_X_MOVETO))->SetWindowTextW(_T("10")); @@ -130,14 +137,23 @@ BOOL CSo7_Util_Program::OnInitDialog() m_BTNFont.CreatePointFont(300,_T("Arial")) ; ((CMFCButton*)(GetDlgItem(IDC_MFCBUTTON_SPEEDGEAR)))->SetFont(&m_BTNFont); - ((CMFCButton*)(GetDlgItem(IDC_MFCBUTTON_SPEEDGEAR)))->SetTextColor(RGB(128,255,255)); + ((CMFCButton*)(GetDlgItem(IDC_MFCBUTTON_SPEEDGEAR)))->SetTextColor(RGB(0,170,200));//RGB(0,128,64) { - m_RptListCtrl.InsertColumn(0, _T("NO."), LVCFMT_LEFT, 60); - m_RptListCtrl.InsertColumn(1, _T("Time"), LVCFMT_LEFT, 60+120); - m_RptListCtrl.InsertColumn(2, _T("PosX"), LVCFMT_LEFT, 60+120*2); - m_RptListCtrl.InsertColumn(3, _T("PosY"), LVCFMT_LEFT, 60+120*3); - m_RptListCtrl.InsertColumn(4, _T("PosZ"), LVCFMT_LEFT, 60+120*4); + int ColWidth(30); + m_RptListCtrl.InsertColumn(0, _T("NO."), LVCFMT_LEFT, ColWidth); + ColWidth+=40; + m_RptListCtrl.InsertColumn(1, _T("Start Time"), LVCFMT_LEFT, ColWidth); + ColWidth+=30; + m_RptListCtrl.InsertColumn(2, _T("End Time"), LVCFMT_LEFT, ColWidth); + ColWidth+=50; + m_RptListCtrl.InsertColumn(3, _T("Elapsed Time(s)"), LVCFMT_LEFT,ColWidth); + ColWidth+=30; + m_RptListCtrl.InsertColumn(4, _T(" "), LVCFMT_LEFT,ColWidth); + ColWidth+=30; + m_RptListCtrl.InsertColumn(5, _T(" "), LVCFMT_LEFT,ColWidth); + ColWidth+=145; + m_RptListCtrl.InsertColumn(6, _T(" "), LVCFMT_LEFT,ColWidth); for (int i = 1; i < 1000; i++) { @@ -168,6 +184,7 @@ BOOL CSo7_Util_Program::OnInitDialog() void CSo7_Util_Program::OnBnClickedCancel() { KillTimer(1); + m_IsRuningCNC=FALSE; m_Thread_State = THREAD_EXIT; SetEvent(m_hTriggerEvent); @@ -192,6 +209,7 @@ void CSo7_Util_Program::OnBnClickedCancel() delete m_pSo7_CNC_Program; m_pSo7_CNC_Program=nullptr; } + CDialog::OnCancel(); } //=================================================== @@ -347,14 +365,46 @@ void CSo7_Util_Program::OnBnClickedButtonSo7ProgramAddCncProgram() //=================================================== void CSo7_Util_Program::OnBnClickedButtonSo7ProgramNewCnc() { + m_pSo7_CNC_Program->RemoveAll(); } //=================================================== void CSo7_Util_Program::OnBnClickedButtonSo7ProgramOpenCnc() { + AfxMessageBox(_T("Not supported!")); } //=================================================== void CSo7_Util_Program::OnBnClickedButtonSo7ProgramSaveCncFile() { + AfxMessageBox(_T("Not supported!")); +} +//=================================================== +void CSo7_Util_Program::OnEnKillfocusEditSo7ProgeamCncRuingTimes() +{ + UpdateData(TRUE); + USES_CONVERSION; + CString csTmp; + (GetDlgItem(IDC_EDIT_SO7_PROGEAM_CNC_RUING_TIMES))->GetWindowText(csTmp); + const char* cTmp=T2A(csTmp); + m_RuningCNCTimes =static_cast( atoi(cTmp)); +} +//=================================================== +void CSo7_Util_Program::OnBnClickedCheckSo7RuningProgramRuningInfinite() +{ + if (((CButton*)(GetDlgItem(IDC_CHECK_SO7_RUNING_PROGRAM_RUNING_INFINITE)))->GetCheck()) + { + m_RuningCNCTimes=MAXDWORD; + (GetDlgItem(IDC_EDIT_SO7_PROGEAM_CNC_RUING_TIMES))->EnableWindow(FALSE); + } + else + { + (GetDlgItem(IDC_EDIT_SO7_PROGEAM_CNC_RUING_TIMES))->EnableWindow(TRUE); + UpdateData(TRUE); + USES_CONVERSION; + CString csTmp; + (GetDlgItem(IDC_EDIT_SO7_PROGEAM_CNC_RUING_TIMES))->GetWindowText(csTmp); + const char* cTmp=T2A(csTmp); + m_RuningCNCTimes =static_cast( atoi(cTmp)); + } } //=================================================== void CSo7_Util_Program::OnBnClickedButtonSo7ProgramRunCnc() @@ -362,33 +412,88 @@ void CSo7_Util_Program::OnBnClickedButtonSo7ProgramRunCnc() if (m_IsRuningCNC) { m_IsRuningCNC=FALSE; - ((CButton*)(GetDlgItem(IDC_BUTTON_SO7_PROGRAM_RUN_CNC)))->SetWindowTextW(_T("Run")); + UpdateCNCCtrl(m_IsRuningCNC); } else { Sleep(50); m_IsRuningCNC=TRUE; - ((CButton*)(GetDlgItem(IDC_BUTTON_SO7_PROGRAM_RUN_CNC)))->SetWindowTextW(_T("Stop")); + UpdateCNCCtrl(m_IsRuningCNC); m_RuningCNCIndex=0; m_Thread_State=THREAD_RUNNING_STATE; SetEvent(m_hTriggerEvent); } } +//=================================================== +void CSo7_Util_Program::UpdateCNCCtrl(BOOL _IsRuningCNC) +{ + if (_IsRuningCNC) + { + ((CButton*)(GetDlgItem(IDC_BUTTON_SO7_PROGRAM_RUN_CNC)))->SetWindowTextW(_T("Stop")); + } + else + { + ((CButton*)(GetDlgItem(IDC_BUTTON_SO7_PROGRAM_RUN_CNC)))->SetWindowTextW(_T("Run")); + } + (GetDlgItem(IDCANCEL))->EnableWindow(!_IsRuningCNC); + (GetDlgItem(IDC_BUTTON_SO7_PROGRAM_NEW_CNC))->EnableWindow(!_IsRuningCNC); + (GetDlgItem(IDC_BUTTON_SO7_PROGRAM_OPEN_CNC))->EnableWindow(!_IsRuningCNC); + (GetDlgItem(IDC_BUTTON_SO7_PROGRAM_SAVE_CNC_FILE))->EnableWindow(!_IsRuningCNC); + (GetDlgItem(IDC_BUTTON_SO7_PROGRAM_ADD_CNC_PROGRAM))->EnableWindow(!_IsRuningCNC); + +} + //=================================================== BOOL CSo7_Util_Program::RunCNC() { WaitForSingleObject(m_Thread_Mutex, INFINITE); - - while (m_IsRuningCNC &&(m_RuningCNCIndexm_Program_Number)) + SYSTEMTIME st; + CString csTime; + unsigned int iRuningCNC(0); + while(m_IsRuningCNC &&(iRuningCNCm_CNC_element.at(m_RuningCNCIndex)->GetPoint(0,0,0,NULL,m_pnt); - m_pSO7_Proto->so7_motion_set_position_xyz(m_pnt.x,m_pnt.y,m_pnt.z,true); - m_RuningCNCIndex++; - } + m_RuningCNCIndex=0; + GetLocalTime(&st); + csTime.Format(_T("%02d:%02d:%02d"),st.wHour,st.wMinute,st.wSecond); + m_RptListCtrl.SetItemText(m_RptRow,1,csTime); + m_StartTime=clock(); + while (m_IsRuningCNC &&(m_RuningCNCIndexm_Program_Number)) + { + m_OutMessage.Format(_T("[Runing]%d/%d"),m_RuningCNCIndex+1,m_pSo7_CNC_Program->m_Program_Number); + OutputWithScroll(m_OutMessage,m_edMSG); + CPoint3 m_pnt; + m_pSo7_CNC_Program->m_CNC_element.at(m_RuningCNCIndex)->GetPoint(0,0,0,NULL,m_pnt); + m_pSO7_Proto->so7_motion_set_position_xyz(m_pnt.x,m_pnt.y,m_pnt.z,true); + m_RuningCNCIndex++; + } + if (m_IsRuningCNC) + { + m_FinishTime=clock(); + m_duration=static_cast(m_FinishTime-m_StartTime); + csTime.Format(_T("%3.4f"),(m_duration/1000.0)); + m_RptListCtrl.SetItemText(m_RptRow,3,csTime); + GetLocalTime(&st); + csTime.Format(_T("%02d:%02d:%02d"),st.wHour,st.wMinute,st.wSecond); + m_RptListCtrl.SetItemText(m_RptRow,2,csTime); + + m_OutMessage=_T("--Run CNC Finished--"); + OutputWithScroll(m_OutMessage,m_edMSG); + m_RptRow++; + m_RptListCtrl.SetFocus(); + m_RptListCtrl.EnsureVisible(m_RptRow,FALSE); + iRuningCNC++; + } + else + { + m_RptRow++; + m_OutMessage=_T("--Run CNC Stoped--"); + OutputWithScroll(m_OutMessage,m_edMSG); + } + }; + m_IsRuningCNC=FALSE; - ((CButton*)(GetDlgItem(IDC_BUTTON_SO7_PROGRAM_RUN_CNC)))->SetWindowTextW(_T("Run")); - SetTimer(1,150,NULL); + UpdateCNCCtrl(m_IsRuningCNC); + ReleaseMutex(m_Thread_Mutex); return TRUE; @@ -513,3 +618,6 @@ void CSo7_Util_Program::OutputWithScroll(const CString &strNewText,CEdit &edtOut } + + + diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_Program.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_Program.h index fe5f4fb..50bd49b 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_Program.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_Program.h @@ -45,8 +45,14 @@ protected: BOOL m_bSetZeroX; BOOL m_bSetZeroY; BOOL m_bSetZeroZ; + clock_t m_StartTime, m_FinishTime; + double m_duration; + unsigned int m_RuningCNCTimes; BOOL m_IsRuningCNC; int m_RuningCNCIndex; + int m_RptCol; + int m_RptRow; + void UpdateCNCCtrl(BOOL _IsRuningCNC); void OutputWithScroll(const CString &strNewText,CEdit &edtOutput); BOOL RunCNC(void); protected: @@ -73,4 +79,6 @@ public: afx_msg void OnEnKillfocusEditSo7ProgramYMoveto(); afx_msg void OnBnClickedRadioSo7ProgramMove(); afx_msg void OnBnClickedRadioSo7ProgramMoveTo(); + afx_msg void OnEnKillfocusEditSo7ProgeamCncRuingTimes(); + afx_msg void OnBnClickedCheckSo7RuningProgramRuningInfinite(); }; diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h index f97e896..8ecf1db 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h @@ -267,6 +267,7 @@ #define IDC_CHECK_CONTINUE_READ_LASER_VALUE 1204 #define IDC_CHECK_SO7_MANUAL_MACHINE_READ_POS_CONTINUE 1204 #define IDC_CHECK_CONTINUOUS_READ_IO_STATUS 1204 +#define IDC_CHECK_SO7_RUNING_PROGRAM_RUNING_INFINITE 1204 #define IDC_RADIO_MACHINE_SevenOcean 1205 #define IDC_CHECK_CONTINUE_READ_LASER_LK_H_VALUE 1205 #define IDC_BUTTON_INIT_SO7USB 1206 @@ -813,6 +814,7 @@ #define IDC_BUTTON_SO7_PROGRAM_NEW_CNC 1710 #define IDC_BUTTON_SO7_PROGRAM_SAVE_CNC_FILE 1711 #define IDC_BUTTON_SO7_PROGRAM_OPEN_CNC 1712 +#define IDC_EDIT_SO7_PROGEAM_CNC_RUING_TIMES 1713 // Next default values for new objects // @@ -820,7 +822,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 188 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1713 +#define _APS_NEXT_CONTROL_VALUE 1714 #define _APS_NEXT_SYMED_VALUE 104 #endif #endif diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo index 715681e43a2b442842dd73f95ba84aece83a11c3..a352377059e37ace2cf1193a733a21f1ed64479c 100644 GIT binary patch delta 7908 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 N>P!u*NPTk8zW|92xMKhS delta 7494 zcmZWu3tUvy)<0{XeQ>}L$8j79X&Q)-ND+*@Mua1xnGZy>$p;!Jz6uG6e3dqk0U{c( ziKSqONaSax2*mMyk-A^7xHg^#RZ$dI%R1gqWwZTS3i_Qk^Ei5h?O_nvl4tAmH<{^n z&~J|%oBY`Ks<;)tk?o6bS$|gwz*2Ez*bI0O$4zHL2P(=^8vLvhqfAupQzo^H8-BkA zw8MxZ5VJn?o%7d z7%!gJw_orPfYn@VFF6g>4;<`mARTjkxZxe%7yeb-Qg^1Lh3-S6$)h;Y6xJX`}fR@Kt9eTUTnu*K(@WV9Tik4Ae zhryzJ?fdXCnV>~vt&JQQuS`(ll{Dp1l6i@e+tU5yO)m0Qg$T>47BOM=gY~(7`2L3w zMfPnVp-S-s8>|!QPX>vPibtR&9nwVS6Lt){&I?4$Zo4?YAqq!dVg*>23^p2PgM~Qo z1`}A;qz2F;kB}Pku)GGA;kL~@5W2*r^;?Bw{b`ZD?qt8c%4{i(=-x2VM272j(3U+h zx3Ls()}Nt{+=BsHUVt*(<^elt;YHk<%bpc+`Bpe7E}guq;`uNP-wz=zi3J^MRW*+k zW$~Q3`(j}j9H!&vi?WIY*l+kNp1Z`%gL@5?N+Oo|)FNWXjc;)kx2vMQ$RYk&nuD|6 zV+CSwsRIgqL7KA^~yJ6f#!cr4oQ5|1j>4&p&z)kTMqJF3>5hq5!hUdpZl%~Aj6sd=B9qwn}*3 z3LtHED7euLs|jhW+DA0G%qQi?ZGrG5-te%mw1G6G&-E=L66UI3_%QjL;k;XsuiU zbDm-G(Ct&z#R9O31| zK_c$mHuyvgI(7mR|Hy(x^t*o0=(9(9HB5$b@%hQQ6{o_m!NSPl+B^Kkhfz~Vm?&r` zL3W`x9HgkrFt&(qK<8B+s6~;K7o>&m7mH#ywro6CFa%To#v8Qf=tTkMr^7Si!z)&J zPUH_a5IM}q48utqC74kRE3s}jI3Qd+fB9Y5B+t~7E3z)zMfz9UF>V2D7p||IEUnMy z`-`gY?V|qMg&1=WBxy3!+z|i$&706lQtl9)-#D>yjA|8?Usu*&HT8d3nMBAXN8Kha zwQUhuU)x3Izs|r}T(t<^#GD)4jML6imP!8?myu8dYlP>f4T>>iK0Jk;#SqNiRz&R& z7vP!!s3P@;R9rM1mP%Ym(ALn(GFC@ceaW0H&L6$QM7_SvIA$xoGW?gesQ};6*BTC( zKbO~t&UdYtz3Da?Qgi9)N!&dRcA(|ISOfzQ-knu4`;CCNaNr9twJ``dVIM5iUZPcN zC3+JOZRTbehId@&FG|G1oJ2JYW9(oO1(&yrGEcb3?lM80fzOyT34&w0L^cmbz5z=km^_))wyM6;03Y!jynPsmjv5NE9B%OoL)?1kNM^n^mV9zFst zfXH1sMPsycBbHBsEo99QIFDQ7;2_kKEcc5nld~~~RFM=1Ddgl(y%{MeVzhRe^D&JW zf>l?bowgi8TOPqN?=hQyFB(?h)*5)0tZSAz&kXGtdX_B_bs|mMMbr0Tc^u`-l(Uo$ zO9-pSz-jo10(A{~;-!4?Bp+Juh9s>0n~~cm0A5Uni?CCsLg@`I*y~%PE(81^8)uB8 z(ZQHLTbkzzFEO&T_IHxRN{toSc41akR+eU_1?tx#~=zlZYYro>&@9=1A5K<5-nOM zPG#of^)=iNi$7vPwACnj+U!e}GPdCkLWLJG zuwWis#IU)v%ifM4@~%d5HG<}0ED61j(|IcvQaFuW1Y-#|`WP=d7SRT^(vB~Qvf@CR z7b{P(89w%bPg5EXmZs1~l2FGf^BpnZ>?zF8gx4{yh_A=oOt8v0ZPU(4LLqkFIYDzXT5XBI9368gq#-?T&OBLTdNX2437<#Xc1|>3)Qm zj@j4%pKtZh^ z1KyK$RjXKpmP}65U<8G9-Jm{>(KI~@&)?iZ7&*LAQI2o`bEz=6|mi)B6wy4 zw~z`qk_7uC2ar`tl(vj+kN%rR%|-$-)AQqo0G+ik0>gIFGL#=27*h)-XrMPm7`%`> z;7M^Ja|?blO0{T@(VQwuxAWWT!2@_}6LUc;j<1JtZ4EGCfWPurIz|W$GRP?A9fDL- zFx|>jZamVv4uRP&I%^!p+M28mw;AqEvPR1a?kINbhQ!~hFFMdo8r15`5UFc;Fnb7u zN3X}aKQPIo&eGe@=(sarr<9~z@@2DLdkz*25wl`5Wu6PiKpQjp*nL?B*foEWrx^#m z&UcG~*f@zLHhuDCI6P`_lJX4IBzekHRLb})w;5Z8vFSMFRi28eP8LDALLxGS=VWAg zyiEck*A9{t2c$NsPz!fK#yt0m ziUpZI*iNElBw^TvscsgI&QMlHriAJT+UBqcRxu$wR?mBam1@}RWZ49JvPQ;jPqPRt z%Vi}*@Teep0fGoXpTAsVPz3EwTGE$8D0-rP2j4c#tz$uYP#*i{c1$mUF#PYIxRoqY zN+O?>B`=Y4!9s|ikjMn&+kIa9h=S<}u&JjEvf|ZYnk-KW@p)wL;jHOYCrUO*3pr__ zHd0@?5w}#rlF?)`Gv4FHm&vBNmFy@nK&bXHKtIXFzEIGzgO0Z!^RwCO`u=K${ro}J zNfHWsT(h3d5O48V?5by}_;x*u(ew7O)PAO6G^9T*(&MiCnE7^0tzyZ>%0W~EoMRtJ zAzP((Y{KzwAjWLxCN>uEz*%-3oo87YR=&eZtKMOi4?^++Y z^b=;6^;VrxTisD%Av*CTyP#t3bh5B3fiTcqXdxWx&0Ws}W?y0ZspiNZz7FSIq3PBe zR0fA#XW!$dZ`pIOMDPBVwnKKEBsn0<_E!xa%jPP0?Q7F zqseSDNx3p|DgnCL}Mm6v`mB+*t|X{+r@Bm9lUo1flB>w1KZa zHP9VP#;5_ZCvzC)dpUsPEq3tKqTU1tqq5VW#P02 z^X_9-O2B_HLM#!J&Jb6wD~HkgB$s;BUv#cblRQ2eQ>UsWRC)QTPa=lT-e%HDX}7)f z=q{}II|Q|)KlBYWrl?Gm)nprN3%!q!8jLs|@f~;iWzzWHQd+nu{w0tkTtH8^iHxtd z7)j=1y7Tl#XO#8{-Cib?+k@T`H4%@el8$H34{4jN+J>U}0)g82<2+i=eo}oDe9@Vu z&hQ7>X^>S+Pw1|c&*stnX$S=T2b^pTh!12 zriC;mt#=xBZC4Ex(DQbv(@Y}wPM2|Z-NMyx)V4-76I8+iqcaH)i1Itf>+P?p15I#5 z?>wlU*=yjL7DLM&mGN*)3!|^UH9YKipor?&VRY!{q)+~?q{g~=JP@jpc&J!iHERuZ!He12k1-w@J?fKs!xf#b~ z@L*pOZJG^P@F!W~m1D{QqX|?d%5NI=9Ce^9B4M4WaS`X}UBR80x}1B_n@pwduQg6z zR+FiGuk`GA2Vd+~;W`cWZegnDG zOPI-sm=!PJ7JX6{Uk{jcH}mMOZ2k!hDrk7EJ9q7_W7d+XFCToURpA0=4b~HK_}eOW zE~OT#qP$E-=zg0233Hz0WkxM-@Z)fFJ;`ILp5Sf03J5IX5eBY3Cem*@sRd&Z&G%Vx z?@DIT!`AX!-0|K&W>tK5ZRVEyzVP=S*Y@qhvM=PrqVDdWAJF4B@G~ZoT&933$+iuG zZ|U#rP1@*biEIiLp=C4Y+EuzQ!17$S1_M?beLLxr1u{Tse~Y9dR_ZZGI`1v!W2uQ! zA}eRiE+%ae1_jO|;jl7Xh&C3;{Y0p?~1?^@mMr#L( zx0j^osg=A*!`u%c0^2LNAKFSF4}oDaU?~hlS_&u23&OgV>H+dG89pz(i#yNg3d@2VW!Y2;!yK%)~{xOOJ z{0xpe!aooGVSn+8h}&no6je$30FvWl=@r^_2JcB7kI{ zLgbo*e(oKtINH~c#{h2oGrx&D&vUajfZhe`Z=C0k^vBeXxK+1a={+nuQS0B(3|5Y0=lm7MyMmJ&DVix-IVm(dAuI)r=39E zI1OCstFNN|$({P%+}q{==3L_@G_AhvJk<&Y$=o=QSh7)Czku`B+}0?(lzYPhH5*>O zP5?_i_YOEm>ke-Fp8p6e2*fQOh2dR%m!_1FGO^tQBk^VzPcd>%-c3&VrJP<=7%%Ck zEWPU{pQiSITB_am5tqi^hn}CfM@H}}uH)GEn02U6`x{mkIGpdiv#h%@ZSgZ7M-DfO zjDHOAPgBM#i>R)62LHH&&{}5G~$hX-cNSv_|$rlse>Eskdt}qB+PVocVS%uU11WzyGzz4AWQRB|mMb ze&P=8YpD8}e}XZ{FN*XNQ3IYeq@AxK><+H(hL#WnI)p9ddF3GEE=h1jHQaeq; zhhu|-IZfMX;BL98{QVL0A~cUSnS}2WKW)4l!-i`Yapo610%P9bZuB1EyvSLv(d9>1 zKe|kG`O_6ZSAV+9bPb>@kgkDrS#)RpAa9HAdPS>SSLn7Dx(64!ZH4Y3g>HMHduX9M nsL*{|p*y(HJ*?0jQs}RHJ9qvcBoiMn