From 447aa91fd9992f18aad5c4e9f0c2ba7440832912 Mon Sep 17 00:00:00 2001 From: TAO Cheng Date: Tue, 11 Mar 2014 17:36:17 +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=8Cdebuglog=E5=BC=80?= =?UTF-8?q?=E5=85=B3=EF=BC=8C=E6=91=87=E6=9D=86=E5=BC=80=E5=85=B3=EF=BC=8C?= =?UTF-8?q?=E6=8E=A2=E5=A4=B4=E5=BC=80=E5=85=B3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp | 57 ++++++++++++++++-- .../Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h | 3 + .../Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc | 8 +-- .../UsbUtility/UsbUtil/SetSo7MotionConfig.cpp | 47 +++++++++++++-- .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo | Bin 2355712 -> 2355712 bytes 5 files changed, 100 insertions(+), 15 deletions(-) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp index 74d9c10..31ddd99 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp @@ -543,7 +543,7 @@ CSO7_Proto::CSO7_Proto() g_machine.s_machine_config.motion._ShiftPositionZ=0.0; g_machine.s_machine_config.motion._ShiftPositionZ=0.0; - g_machine.s_machine_config.motion.GetInterruptMsgMethod=E_GET_INTERRUPT_MSG_INTERRUPT;//E_GET_INTERRUPT_MSG_INQUIRY; + g_machine.s_machine_config.motion.GetInterruptMsgMethod=E_GET_INTERRUPT_MSG_INQUIRY; g_machine.s_machine_config.motion.m_WriteDataSleepTime=0; g_machine.s_machine_config.motion.m_AccuraErrPulseX=1; g_machine.s_machine_config.motion.m_AccuraErrPulseY=1; @@ -551,7 +551,10 @@ CSO7_Proto::CSO7_Proto() 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_TouchProbeEnable=0; + g_machine.s_machine_config.motion.m_JoyStickEnable=0; + g_machine.s_machine_config.motion.m_DebugOutputEnable=0; + g_machine.s_machine_config.motion.m_SDK3000_CntThreadSleepVal=550000; g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[0]=70; g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[1]=70; @@ -2156,9 +2159,10 @@ SSI_STATUS_MOTION CSO7_Proto::Save_So7_Config() outBuff="ZOOM_MOTOR_SPEED_SLOW="; fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile,"%d", g_machine.s_machine_config.zm_axis._SpeedSlow); - fprintf(m_pOutFile, "\n;\n"); + fprintf(m_pOutFile, "\n"); + fprintf(m_pOutFile, ";\n"); - outBuff="[MOTION]"; + outBuff="[CONTROLLER]"; fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile, "\n"); outBuff="CLOSE_LOOP_ENABLED="; @@ -2212,7 +2216,20 @@ SSI_STATUS_MOTION CSO7_Proto::Save_So7_Config() outBuff="EQUIDISTANCE_PULSE_Z="; fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_EQUIDIS_Z); - fprintf(m_pOutFile, "\n;\n"); + 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); + fprintf(m_pOutFile, "\n"); + outBuff="JOYSTICK_ENABLE="; + fprintf(m_pOutFile,"%s", outBuff); + fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_JoyStickEnable); + fprintf(m_pOutFile, "\n"); + outBuff="DEBUG_LOG_ENABLE="; + fprintf(m_pOutFile,"%s", outBuff); + fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_DebugOutputEnable); + fprintf(m_pOutFile, "\n"); + fprintf(m_pOutFile, ";\n"); outBuff="[VIDEOCARD]"; fprintf(m_pOutFile,"%s", outBuff); @@ -2237,7 +2254,7 @@ SSI_STATUS_MOTION CSO7_Proto::Save_So7_Config() fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[3]); fprintf(m_pOutFile, "\n"); - fprintf(m_pOutFile, "\n;\n"); + fprintf(m_pOutFile, ";\n"); outBuff="[HSI]"; fprintf(m_pOutFile,"%s", outBuff); @@ -2250,6 +2267,7 @@ SSI_STATUS_MOTION CSO7_Proto::Save_So7_Config() fprintf(m_pOutFile,"%s", outBuff); fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_VideoCardType); fprintf(m_pOutFile, "\n"); + fprintf(m_pOutFile, ";\n"); fclose(m_pOutFile); } @@ -2485,6 +2503,33 @@ SSI_STATUS_MOTION CSO7_Proto::Load_So7_Config() g_machine.s_machine_config.motion.m_EQUIDIS_Z=atoi(cTemp); } } + else if (!_stricmp(token,"TOUCH_PROBE_ENABLE")) + { + token = strtok( NULL, seps); + if (token) + { + strcpy(cTemp,token); + g_machine.s_machine_config.motion.m_TouchProbeEnable=atoi(cTemp); + } + } + else if (!_stricmp(token,"JOYSTICK_ENABLE")) + { + token = strtok( NULL, seps); + if (token) + { + strcpy(cTemp,token); + g_machine.s_machine_config.motion.m_JoyStickEnable=atoi(cTemp); + } + } + else if (!_stricmp(token,"DEBUG_LOG_ENABLE")) + { + token = strtok( NULL, seps); + if (token) + { + strcpy(cTemp,token); + g_machine.s_machine_config.motion.m_DebugOutputEnable=atoi(cTemp); + } + } //=================VideoCard======================== else if (!_stricmp(token,"SDK3000_SLEEP_COUNT")) { diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h index 539913b..5d8798d 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h @@ -163,6 +163,9 @@ struct s_so7_machine_interface_config INT m_EQUIDIS_X; INT m_EQUIDIS_Y; INT m_EQUIDIS_Z; + INT m_TouchProbeEnable; + INT m_JoyStickEnable; + INT m_DebugOutputEnable; INT m_SDK3000_CntThreadSleepVal; INT m_SV4000E_DenoisePara[4]; INT m_MachineType; 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 ba1c251..bd4d041 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 @@ -2374,8 +2374,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 7,2,0,0 - PRODUCTVERSION 7,2,0,0 + FILEVERSION 7,3,0,0 + PRODUCTVERSION 7,3,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -2392,12 +2392,12 @@ BEGIN BEGIN VALUE "CompanyName", "Hexagon Metrology" VALUE "FileDescription", "Utility for Hexagon Metrology" - VALUE "FileVersion", "7.2.0.0" + VALUE "FileVersion", "7.3.0.0" VALUE "InternalName", "Usb_Util.exe" VALUE "LegalCopyright", "Copyright 2014 Hexagon Metrology." VALUE "OriginalFilename", "Usb_Util.exe" VALUE "ProductName", "Utility" - VALUE "ProductVersion", "7.2.0.0" + VALUE "ProductVersion", "7.3.0.0" END END BLOCK "VarFileInfo" 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 c7da650..a6c7369 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.cpp @@ -60,7 +60,7 @@ BOOL CSetSo7MotionConfig::OnInitDialog() } UpdateLabelName(); UpdateDataValue(); - m_ConfigList.SetMaxItemIndex(0,17,2,2); + m_ConfigList.SetMaxItemIndex(0,20,2,2); return TRUE; } @@ -147,6 +147,23 @@ void CSetSo7MotionConfig::UpdateLabelName() m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; + cStr="TOUCH_PROBE_ENABLE"; + m_ConfigList.SetItemText(iRow,iCol,cStr); + cStr="0:Disable,1:Enable"; + m_ConfigList.SetItemText(iRow,iCol+2,cStr); + iRow++; + + cStr="JOYSTICK_ENABLE"; + m_ConfigList.SetItemText(iRow,iCol,cStr); + cStr="0:Disable,1:Enable"; + m_ConfigList.SetItemText(iRow,iCol+2,cStr); + iRow++; + + cStr="DEBUG_LOG_ENABLE"; + m_ConfigList.SetItemText(iRow,iCol,cStr); + cStr="0:Disable,1:Enable"; + m_ConfigList.SetItemText(iRow,iCol+2,cStr); + iRow++; //=================VIDEOCARD================== cStr="SDK3000_SLEEP_COUNT"; m_ConfigList.SetItemText(iRow,iCol,cStr); @@ -156,25 +173,25 @@ void CSetSo7MotionConfig::UpdateLabelName() cStr="SV4000E_DENOISE_PARA_CHANNEL1"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="default:70"; + cStr="effective range:5-100;default:70"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; cStr="SV4000E_DENOISE_PARA_CHANNEL2"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="default:70"; + cStr="effective range:5-100;default:70"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; cStr="SV4000E_DENOISE_PARA_CHANNEL3"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="default:70"; + cStr="effective range:5-100;default:70"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; cStr="SV4000E_DENOISE_PARA_CHANNEL4"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="default:70"; + cStr="effective range:5-100;default:70"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; } @@ -209,6 +226,13 @@ 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_TouchProbeEnable); + m_ConfigList.SetItemText(iRow++,iCol,cStr); + cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_JoyStickEnable); + m_ConfigList.SetItemText(iRow++,iCol,cStr); + cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_DebugOutputEnable); + m_ConfigList.SetItemText(iRow++,iCol,cStr); + cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_SDK3000_CntThreadSleepVal); m_ConfigList.SetItemText(iRow++,iCol,cStr); cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[0]); @@ -280,6 +304,19 @@ void CSetSo7MotionConfig::SaveDataValue() cStr=m_ConfigList.GetItemText(iRow,iCol); cTemp=T2A(cStr); m_pSO7_Proto->g_machine.s_machine_config.motion.m_EQUIDIS_Z=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); + cTemp=T2A(cStr); + m_pSO7_Proto->g_machine.s_machine_config.motion.m_JoyStickEnable=atoi(cTemp); + iRow++; + cStr=m_ConfigList.GetItemText(iRow,iCol); + cTemp=T2A(cStr); + m_pSO7_Proto->g_machine.s_machine_config.motion.m_DebugOutputEnable=atoi(cTemp); + iRow++; cStr=m_ConfigList.GetItemText(iRow,iCol); cTemp=T2A(cStr); 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 583fd83c402ff9df824d2cda19da151196d154ce..8bbd1755754ad72cf48ca23cd33df4a813260373 100644 GIT binary patch delta 2034 zcmZvc3s96*6oCJ8|NAfd?=A?kEK0hX6+o!-JdYibdzs)f*c}BFAf8f%UD>O0`MM294c_N$^(iC?>HK8CHOY3KLAE~2< zJ!0;V4gpff4x7Rm+n8aG{*`fD*C8Hn)X-8iHm-{E%!EquL^!wK9(Ncw!|vC|^J0z%57UXeZen z|Lw2+FpVb0<_)n@z6RCF$n__>45;qNBJnhnyr3pJ_A;UK4O2O`h%!9q{ zqrF)69v_L-8Bhqv@WSTNGo_UQ26Pq~Xk>yRTI~k>9KT&;6mY?QFyWK{y}YDQX-%B( zqQGU!EM<;TsVpQpK2jA>bgn2Yq1owo7Ohp#+^RGv_43LXfMjv#l_{xrg%>wpzo0q1 zrum-o=6f2};MYI%p#GV%JH^gG6Pi=O#QK}TE%)ZbO2Cy9p#Te}LA@}hSo^FS0I;=< z`-E?*Hy+a`eZ}x42w&f7OgREJSvUjEFku#35d&k4Yi8i2ZI>C=07$B@-<(O*EHMmIEhPR=mP_ zf-S!+JC;x=+#FPkWpNEGc10S%fuR+UiQkRT49s?Ey8Pu%NQYe)csjPLnjfdPz>-KS zq+;M7o)tea2ahj@k@9Q{_yLV+Fc&vH1Znundhp2Rt>Cpso&+vC9tREJ>i-$n`81FF zK)i5+<9?F;B;$@JpjkZq-2YeZy2Qq@lZSTETtcYCnSqiQw?4nxxcY5zRjEkW0+F4- zaPNb#6rcW)I};Bt5iY$R2IH9ltC?hKJeYhDie%RgSk2H{1$9`r3qojunv4GJkR?hT zHd(O;-cm8=AD%D2%F{juG`I0wjBJ7|S=tSUua!Mrun6$nd~E`D)M!pw^aAt)PC76L2~9^&A7%nKDI~0k@p{E$sL5d6XZ< z7`s7VK+~*s%5E;X`?C~&4Bzr#918>)sF|5sI zi{hO|8oA60hzp(7_?TBK#)W&CE-P|aBSdPLP4@U`pDeG}UI%>rRyGgc->iA0rkv-4=YppHfD%y7j!d3;BFV0$~e5v_LS!eg75TYlQk@-lFs4N9Y%OSb}66)}(S zEX&7lx>!&Kcd}C|25hzemWvUjce zt_y27X!E7DQN4c>RyFcsQ99X=tWnE@2p;-?)l1)g)&HR=7-z@gMy*Ji?cDfPoC$WS zLqgim&F I9ADS=FHU!)%K!iX delta 1845 zcmZ9MeQZ=k5WwH;+jqTpy_PGz>j#!{Eu|i%RB8dshwwPCf*`$XON&rTPhyR>Xep=F zdg$Xr#6&B&%0T_9##}Wb#h&R#gL;K%VyvY#8oxmNXfz?HXzmXsQJhyfNZjO?-I?9l zo!y-obNop#iKA`Y=Dq&+GgXUY9em8GL#m=E9s=Wq;1l7DY8~7p&Pb|aiHuRkXHSSG zl!}DAT35u!Ws7jps6B_IX-NZ{pGKdq6J0Y_ zi4%3#4-_BfpyBuRJTn$A*#$ae(tLJuwFsA1Ymh!6k^`|s>B+0baxz$ zD*kRfQwK9eJk5w1d;f4vTJV0h-;w{*xrb|4ycdweVn^E2n0aWWkKdMbAeI=ac3STs z!XxyU7pbkhGB*-PwXY&^^<`D~>j2nuN%UP-CB7L>jTz+z8#uc>U019vHYX=V_|NKz z-4lP(?ro%QPEN(bf1RWsttUB@)XA_74yGSy;7&YpujWJl2YfQtc%V!)+YK4_fC1PT z;YIjPtCojGHW=8^m21E`>t@j$;Mnmw4~X^#n^;m&tW9T%G9o}WF_*mXFMulX;hZkC^k~il6L+kJQhf0`2;u8Dfm^z7f=wXIig;hV z5MQu0F> zLLR34ucf*28r2XsL;2Js1NU=xw*&pe~ee+yb>u9GRpwpx3GCvbh~HA=&~C z+`j?bxLws|;Nh)Mhk+(ogo|&5$@1o%Pz=!yaN*EuSdaO;ARBkp(f#9(z!7^m( z_D$qm>OQytr^VQwEz!q;i=o5UiJ3i<{)_E>2O!Jq1?#J}R9j_5+BA4{S@vAZTG4#vvwOSrv-j6UY$7?2r9ySl2!ySXL zAHRE-JLL<*P?E|WF5i37<(#xt}x5pa^*O@n$Q2CEWiX~mAaJ=8|fw& zthKnB_wsL>YYkil)NpUDT7t3Lxa zyu@C^eFxbPnw^XS`aX6_l|!$vPXP}vP|M~(ilQ*W^1Oh08<9fTFX?pZQ;AF>kH9$* zW;pX{WLcD1nn;8##-kDD#?kG}DZh*`p9hU9h{ud26kR_IuxsVDPqPsvOCvBzq4FvQ|?i=DYsLhnn^Obr$ljRjD=+3t7`FQ_)fQ0Da{Bs zeielkemvNx`tZB&xyz~zbFBK}#5JATTZYlVMN3%1;+eJu)k z4qZ9dC;S!OM|(Rp!bYSJc0wl{L@MDV(uj0o65%2;h{;4I;U+vp7LiTl5V^z@;wmDK Vm`dam(+KOl0-{j%c1~~Z`WLJKV|M@m