From ba1d352b60b9262814fb9bda3fa233ec90e8d7cd Mon Sep 17 00:00:00 2001 From: TAO Cheng Date: Fri, 21 Mar 2014 15:04:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Eso7=5Fconfig.ini=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E5=8F=82=E6=95=B0=EF=BC=8CCNC=E8=BF=90?= =?UTF-8?q?=E5=8A=A8=E5=81=9C=E9=A1=BF=E5=88=A4=E6=96=AD=E5=BC=80=E5=85=B3?= =?UTF-8?q?=E3=80=82V7.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp | 28 ++++ .../Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h | 2 + .../Tools/UsbUtility/Debug/UtilityDebug.Log | 71 ++++++++++ .../Hsi/Tools/UsbUtility/Debug/so7_config.ini | 2 + .../Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc | 16 +-- .../UsbUtility/UsbUtil/SetSo7MotionConfig.cpp | 128 +++++++++++------- .../Tools/UsbUtility/UsbUtil/So7_Option.cpp | 11 +- .../UsbUtility/UsbUtil/So7_UtilUsbCtlR.cpp | 16 ++- .../UsbUtil/Usb_Util.vcxproj.filters | 8 +- .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo | Bin 2355712 -> 2355712 bytes 10 files changed, 208 insertions(+), 74 deletions(-) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp index ee3a800..5b74dcc 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp @@ -599,6 +599,8 @@ SSI_STATUS_MOTION CSO7_Proto::so7_config_para_set_default() g_machine.s_machine_config.motion.m_EQUIDIS_X=0; g_machine.s_machine_config.motion.m_EQUIDIS_Y=0; g_machine.s_machine_config.motion.m_EQUIDIS_Z=0; + g_machine.s_machine_config.motion.m_CNC_Deadlock_Solution=1; + g_machine.s_machine_config.motion.m_CNC_Deadlock_JudgeMaxCnts=6; g_machine.s_machine_config.motion.m_TouchProbeEnable=0; g_machine.s_machine_config.motion.m_JoyStickEnable=0; g_machine.s_machine_config.motion.m_DebugOutputEnable=0; @@ -2221,6 +2223,14 @@ SSI_STATUS_MOTION CSO7_Proto::Save_So7_Config() fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_EQUIDIS_Z); fprintf(m_pOutFile, "\n"); + outBuff="CNC_DEADLOCK_SOLUTION="; + fprintf(m_pOutFile,"%s", outBuff); + fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_CNC_Deadlock_Solution); + fprintf(m_pOutFile, "\n"); + outBuff="CNC_DEADLOCK_MAX_CNTS="; + fprintf(m_pOutFile,"%s", outBuff); + fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_CNC_Deadlock_JudgeMaxCnts); + fprintf(m_pOutFile, "\n"); outBuff="TOUCH_PROBE_ENABLE="; fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_TouchProbeEnable); @@ -2507,6 +2517,24 @@ SSI_STATUS_MOTION CSO7_Proto::Load_So7_Config() g_machine.s_machine_config.motion.m_EQUIDIS_Z=atoi(cTemp); } } + else if (!_stricmp(token,"CNC_DEADLOCK_SOLUTION")) + { + token = strtok( NULL, seps); + if (token) + { + strcpy(cTemp,token); + g_machine.s_machine_config.motion.m_CNC_Deadlock_Solution=atoi(cTemp); + } + } + else if (!_stricmp(token,"CNC_DEADLOCK_MAX_CNTS")) + { + token = strtok( NULL, seps); + if (token) + { + strcpy(cTemp,token); + g_machine.s_machine_config.motion.m_CNC_Deadlock_JudgeMaxCnts=atoi(cTemp); + } + } else if (!_stricmp(token,"TOUCH_PROBE_ENABLE")) { token = strtok( NULL, seps); diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h index daaff8e..6536961 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h @@ -171,6 +171,8 @@ struct s_so7_machine_interface_config INT m_EQUIDIS_X; INT m_EQUIDIS_Y; INT m_EQUIDIS_Z; + INT m_CNC_Deadlock_Solution; + INT m_CNC_Deadlock_JudgeMaxCnts; INT m_TouchProbeEnable; INT m_JoyStickEnable; INT m_DebugOutputEnable; 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 0f7cf5c..5f37d3a 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log @@ -4396,3 +4396,74 @@ Construct Cso7_Proto. Init:Open device succeed . Exit: Exit_SO7Usb Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Unable to open device Init:Open device succeed . +Exit: Exit_SO7Usb +Unable to open device Init:Open device succeed . +Exit: Exit_SO7Usb +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Construct Cso7_Proto. +Unable to open device Init:Open device succeed . +Unable to open device Init:Open device succeed . +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 . +Exit: Exit_SO7Usb +Init:Open device succeed . +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 +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/Debug/so7_config.ini b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/so7_config.ini index 5c976c5..2f7988d 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/so7_config.ini +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/so7_config.ini @@ -24,6 +24,8 @@ ACCURA_ERROR_PULSE_Z=1 EQUIDISTANCE_PULSE_X=0 EQUIDISTANCE_PULSE_Y=0 EQUIDISTANCE_PULSE_Z=0 +CNC_DEADLOCK_SOLUTION=1 +CNC_DEADLOCK_MAX_CNTS=6 TOUCH_PROBE_ENABLE=0 JOYSTICK_ENABLE=0 DEBUG_LOG_ENABLE=0 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 ce9152c..2f832a2 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 @@ -16,7 +16,7 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// 中文(简体，中国) resources +// Chinese (Simplified, PRC) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS) LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -1517,12 +1517,12 @@ IDB_BITMAP_Z_DOWN BITMAP "res\\bmp\\Z_DOWN.bmp" IDB_BITMAP_Z_UP BITMAP "res\\bmp\\Z_UP.bmp" IDB_BITMAP_X_LEFT BITMAP "res\\bmp\\X_LEFT.BMP" IDB_BITMAP_X_RIGHT BITMAP "res\\bmp\\X_RIGHT.bmp" -#endif // 中文(简体，中国) resources +#endif // Chinese (Simplified, PRC) resources ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// -// 英语(美国) resources +// English (United States) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US @@ -2417,8 +2417,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 7,5,0,0 - PRODUCTVERSION 7,5,0,0 + FILEVERSION 7,7,0,0 + PRODUCTVERSION 7,7,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -2435,12 +2435,12 @@ BEGIN BEGIN VALUE "CompanyName", "Hexagon Metrology" VALUE "FileDescription", "Utility for Hexagon Metrology" - VALUE "FileVersion", "7.5.0.0" + VALUE "FileVersion", "7.7.0.0" VALUE "InternalName", "Usb_Util.exe" VALUE "LegalCopyright", "Copyright 2014 Hexagon Metrology." VALUE "OriginalFilename", "Usb_Util.exe" VALUE "ProductName", "Utility" - VALUE "ProductVersion", "7.5.0.0" + VALUE "ProductVersion", "7.7.0.0" END END BLOCK "VarFileInfo" @@ -2465,7 +2465,7 @@ BEGIN IDS_SO7_ABOUTBOX "&About Utility for SO7..." END -#endif // 英语(美国) resources +#endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.cpp index ac8b5a9..f5e28f1 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.cpp @@ -48,10 +48,10 @@ BOOL CSetSo7MotionConfig::OnInitDialog() m_ConfigList.GetClientRect(&m_rect); //获取list的客户区 m_ConfigList.SetExtendedStyle(LVS_EX_GRIDLINES|LVS_EX_FULLROWSELECT); //设置list风格 - m_ConfigList.InsertColumn(0,_T("编号"),LVCFMT_LEFT, m_rect.right/20); - m_ConfigList.InsertColumn(1,_T("参数名"),LVCFMT_LEFT, m_rect.right*6/20); - m_ConfigList.InsertColumn(2,_T("值"),LVCFMT_LEFT, m_rect.right*2/20); - m_ConfigList.InsertColumn(3,_T("描述"),LVCFMT_LEFT, m_rect.right*11/20); + m_ConfigList.InsertColumn(0,_T("编号"),LVCFMT_LEFT, m_rect.right*2/40); + m_ConfigList.InsertColumn(1,_T("参数名"),LVCFMT_LEFT, m_rect.right*12/40); + m_ConfigList.InsertColumn(2,_T("值"),LVCFMT_LEFT, m_rect.right*3/40); + m_ConfigList.InsertColumn(3,_T("描述"),LVCFMT_LEFT, m_rect.right*22/40); for (int i = 1; i < 100; i++) { @@ -61,8 +61,8 @@ BOOL CSetSo7MotionConfig::OnInitDialog() } UpdateLabelName(); UpdateDataValue(); - m_ConfigList.SetEditableItemRange(0,20,2,2); - m_ConfigList.SetColorStyleItemRange(0,22,0,3); + m_ConfigList.SetEditableItemRange(0,22,2,2); + m_ConfigList.SetColorStyleItemRange(0,24,0,3); return TRUE; } @@ -71,141 +71,153 @@ void CSetSo7MotionConfig::UpdateLabelName() int iRow=0; int iCol=1; CString cStr(""); - cStr="CLOSE_LOOP_ENABLED"; + cStr=L"CLOSE_LOOP_ENABLED"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="软件闭环判断功能；0：禁用，1：使能；默认值：0"; + cStr=L"软件闭环判断功能；0：禁用，1：使能；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; - cStr="MOTION_RETRY_TIMES"; + cStr=L"MOTION_RETRY_TIMES"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="软件闭环判断重试次数；有效范围:0-255；默认值：0"; + cStr=L"软件闭环判断重试次数；有效范围:0-255；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; - cStr="SHIFT_POSITION_X"; + cStr=L"SHIFT_POSITION_X"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="软件闭环判断X偏移距离(mm)；有效范围:0-65535；默认值：0"; + cStr=L"软件闭环判断X偏移距离(mm)；有效范围:0-65535；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; - cStr="SHIFT_POSITION_Y"; + cStr=L"SHIFT_POSITION_Y"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="软件闭环判断Y偏移距离(mm)；有效范围:0-65535；默认值：0"; + cStr=L"软件闭环判断Y偏移距离(mm)；有效范围:0-65535；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; - cStr="SHIFT_POSITION_Z"; + cStr=L"SHIFT_POSITION_Z"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="软件闭环判断Z偏移距离(mm)；有效范围:0-65535；默认值：0"; + cStr=L"软件闭环判断Z偏移距离(mm)；有效范围:0-65535；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; - cStr="GET_USB_MESSAGE_METHOD"; + cStr=L"GET_USB_MESSAGE_METHOD"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="USB读取消息方式；0：中断方式，1：查询方式；默认值：1"; + cStr=L"USB读取消息方式；0:Firmware V3.X,1:Firmware V6.X；默认值：1"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; - cStr="WRITE_DATA_SLEEP_TIME"; + cStr=L"WRITE_DATA_SLEEP_TIME"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="USB通信休息时间（ms）；有效范围:0-255；默认值：0"; + cStr=L"USB通信休息时间（ms）；有效范围:0-255；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; - cStr="ACCURA_ERROR_PULSE_X"; + cStr=L"ACCURA_ERROR_PULSE_X"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="允许定位误差脉冲数；有效范围:1-255；默认值：1"; + cStr=L"允许定位误差脉冲数；有效范围:1-255；默认值：1"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; - cStr="ACCURA_ERROR_PULSE_Y"; + cStr=L"ACCURA_ERROR_PULSE_Y"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="允许定位误差脉冲数；有效范围:1-255；默认值：1"; + cStr=L"允许定位误差脉冲数；有效范围:1-255；默认值：1"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; - cStr="ACCURA_ERROR_PULSE_Z"; + cStr=L"ACCURA_ERROR_PULSE_Z"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="允许定位误差脉冲数；有效范围:1-255；默认值：1"; + cStr=L"允许定位误差脉冲数；有效范围:1-255；默认值：1"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; - cStr="EQUIDISTANCE_PULSE_X"; + cStr=L"EQUIDISTANCE_PULSE_X"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="输出等间距脉冲；有效范围:0-255；默认值：0"; + cStr=L"输出等间距脉冲；有效范围:0-255；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; - cStr="EQUIDISTANCE_PULSE_Y"; + cStr=L"EQUIDISTANCE_PULSE_Y"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="输出等间距脉冲；有效范围:0-255；默认值：0"; + cStr=L"输出等间距脉冲；有效范围:0-255；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; - cStr="EQUIDISTANCE_PULSE_Z"; + cStr=L"EQUIDISTANCE_PULSE_Z"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="输出等间距脉冲；有效范围:0-255；默认值：0"; + cStr=L"输出等间距脉冲；有效范围:0-255；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; - cStr="TOUCH_PROBE_ENABLE"; + cStr=L"CNC_DEADLOCK_SOLUTION"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="接触探针功能；0：禁用，1：使能；默认值：0"; + cStr=L"解决CNC运行停顿问题；0：禁用，1：启用；默认值：1"; + m_ConfigList.SetItemText(iRow,iCol+2,cStr); + iRow++; + + cStr=L"CNC_DEADLOCK_MAX_CNTS"; + m_ConfigList.SetItemText(iRow,iCol,cStr); + cStr=L"CNC运行停顿判断次数；有效范围:1-255；默认值：6"; + m_ConfigList.SetItemText(iRow,iCol+2,cStr); + iRow++; + + cStr=L"TOUCH_PROBE_ENABLE"; + m_ConfigList.SetItemText(iRow,iCol,cStr); + cStr=L"接触探针功能；0：禁用，1：使能；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; - cStr="JOYSTICK_ENABLE"; + cStr=L"JOYSTICK_ENABLE"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="摇杆功能；0：禁用，1：使能；默认值：0"; + cStr=L"摇杆功能；0：禁用，1：使能；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; - cStr="DEBUG_LOG_ENABLE"; + cStr=L"DEBUG_LOG_ENABLE"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="软件运行记录功能；0：禁用，1：使能；默认值：0"; + cStr=L"软件运行记录功能；0：禁用，1：使能；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; //=================VIDEOCARD================== - cStr="SDK3000_SLEEP_COUNT"; + cStr=L"SDK3000_SLEEP_COUNT"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="SDK3000去条纹参数；有效范围:500000-700000；默认值：550000"; + cStr=L"SDK3000去条纹参数；有效范围:500000-700000；默认值：550000"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; - cStr="SV4000E_DENOISE_PARA_CHANNEL1"; + cStr=L"SV4000E_DENOISE_PARA_CHANNEL1"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="SV4000E降噪参数；有效范围:5-100；默认值：70"; + cStr=L"SV4000E降噪参数；有效范围:5-100；默认值：70"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; - cStr="SV4000E_DENOISE_PARA_CHANNEL2"; + cStr=L"SV4000E_DENOISE_PARA_CHANNEL2"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="SV4000E降噪参数；有效范围:5-100；默认值：70"; + cStr=L"SV4000E降噪参数；有效范围:5-100；默认值：70"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; - cStr="SV4000E_DENOISE_PARA_CHANNEL3"; + cStr=L"SV4000E_DENOISE_PARA_CHANNEL3"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="SV4000E降噪参数；有效范围:5-100；默认值：70"; + cStr=L"SV4000E降噪参数；有效范围:5-100；默认值：70"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; - cStr="SV4000E_DENOISE_PARA_CHANNEL4"; + cStr=L"SV4000E_DENOISE_PARA_CHANNEL4"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="SV4000E降噪参数；有效范围:5-100；默认值：70"; + cStr=L"SV4000E降噪参数；有效范围:5-100；默认值：70"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; - cStr="MACHINE_CONTROLLER_TYPE"; + cStr=L"MACHINE_CONTROLLER_TYPE"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="控制器类型；保留项；默认值：0"; + cStr=L"控制器类型；保留项；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; - cStr="MACHINE_VIDEOCARD_TYPE"; + cStr=L"MACHINE_VIDEOCARD_TYPE"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="视频卡类型；保留项；默认值：0"; + cStr=L"视频卡类型；保留项；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; } @@ -240,6 +252,10 @@ void CSetSo7MotionConfig::UpdateDataValue() m_ConfigList.SetItemText(iRow++,iCol,cStr); cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_EQUIDIS_Z); m_ConfigList.SetItemText(iRow++,iCol,cStr); + cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_CNC_Deadlock_Solution); + m_ConfigList.SetItemText(iRow++,iCol,cStr); + cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_CNC_Deadlock_JudgeMaxCnts); + m_ConfigList.SetItemText(iRow++,iCol,cStr); cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_TouchProbeEnable); m_ConfigList.SetItemText(iRow++,iCol,cStr); cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_JoyStickEnable); @@ -327,6 +343,14 @@ void CSetSo7MotionConfig::SaveDataValue() iRow++; cStr=m_ConfigList.GetItemText(iRow,iCol); cTemp=T2A(cStr); + m_pSO7_Proto->g_machine.s_machine_config.motion.m_CNC_Deadlock_Solution=atoi(cTemp); + iRow++; + cStr=m_ConfigList.GetItemText(iRow,iCol); + cTemp=T2A(cStr); + m_pSO7_Proto->g_machine.s_machine_config.motion.m_CNC_Deadlock_JudgeMaxCnts=atoi(cTemp); + iRow++; + cStr=m_ConfigList.GetItemText(iRow,iCol); + cTemp=T2A(cStr); m_pSO7_Proto->g_machine.s_machine_config.motion.m_TouchProbeEnable=atoi(cTemp); iRow++; cStr=m_ConfigList.GetItemText(iRow,iCol); diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp index 066bb69..8ec5421 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp @@ -190,11 +190,6 @@ void CSo7_Option::OnBnClickedOk() { delete m_pSO7_Proto; m_pSO7_Proto=NULL; - } - if (m_pSO7_Proto_Aux) - { - delete m_pSO7_Proto_Aux; - m_pSO7_Proto_Aux = NULL; } if (m_pEF8000_Interface) { @@ -212,6 +207,12 @@ void CSo7_Option::OnBnClickedOk() So7_UtilUsbCtlR* pSo7_UtilUsbCtlR=new So7_UtilUsbCtlR(); pSo7_UtilUsbCtlR->DoModal(); delete pSo7_UtilUsbCtlR; + + if (m_pSO7_Proto_Aux) + { + delete m_pSO7_Proto_Aux; + m_pSO7_Proto_Aux=nullptr; + } } else if (((CButton *)GetDlgItem(IDC_RADIO__SO7_RS232))->GetCheck()) { diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_UtilUsbCtlR.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_UtilUsbCtlR.cpp index 4217ebf..696ae50 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_UtilUsbCtlR.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_UtilUsbCtlR.cpp @@ -59,16 +59,18 @@ BOOL So7_UtilUsbCtlR::OnInitDialog() //===================================================================================== void So7_UtilUsbCtlR::OnBnClickedButtonStartSo7RMachine() { + SSI_STATUS_MOTION rStatus=SSI_STATUS_UNKNOWN_ERROR; if (m_pSO7_Proto_Aux) { - m_pSO7_Proto_Aux->Init_SO7Usb(); + rStatus=m_pSO7_Proto_Aux->Init_SO7Usb(); } - - m_pSO7_Proto_Aux->_send_cmd_SO7_CMD_RESET_R(0); - - UpdateCtrlsStatus(TRUE); - UpdateR1CtrlsStatus(FALSE); - UpdateR2CtrlsStatus(FALSE); + if (rStatus==SSI_STATUS_MOTION_NORMAL) + { + m_pSO7_Proto_Aux->_send_cmd_SO7_CMD_RESET_R(0); + UpdateCtrlsStatus(TRUE); + UpdateR1CtrlsStatus(FALSE); + UpdateR2CtrlsStatus(FALSE); + } } //===================================================================================== diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters index 9f14414..6d0cad1 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters @@ -196,10 +196,12 @@ Sources Files - Sources Files + + Sources Files + @@ -430,10 +432,12 @@ Header Files - Header Files + + Header Files + 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 4d9a623cac8ae515d746559737d37f0da964f2cd..d3ebbf89ee8afa2692ba15d2a4678f5fd22e7a42 100644 GIT binary patch delta 4471 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