From f1188c017cb068d1b6a416273562e16a6a96d40d Mon Sep 17 00:00:00 2001 From: TAO Cheng Date: Tue, 15 Apr 2014 22:36:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA=E5=87=BD?= =?UTF-8?q?=E6=95=B0=EF=BC=8C=E5=AE=8C=E5=96=84INI=E6=96=87=E4=BB=B6?= =?UTF-8?q?=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 | 28 +++++++++++++- .../Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h | 2 +- .../MachineInterfaceDll.cpp | 35 +++++++++++++++++- .../MachineInterfaceDll/MachineInterfaceDll.h | 5 ++- .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo | Bin 92672 -> 95232 bytes 5 files changed, 66 insertions(+), 4 deletions(-) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp index 1be3f1a..af2b58c 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp @@ -535,6 +535,7 @@ CSO7_Proto::CSO7_Proto() g_machine.s_machine_config.zm_axis._SpeedFast=2000; g_machine.s_machine_config.zm_axis._SpeedSlow=800; g_machine.s_machine_config.zm_axis._speed._short_=0; + g_machine.MotionType=-1; g_machine.s_status._bIsZMMotionFinished=0; g_machine.x._scale_pos._long_ = 0; @@ -614,6 +615,11 @@ SSI_STATUS_MOTION CSO7_Proto::so7_config_para_set_default() g_machine.s_machine_config.motion.m_MachineType=MACHINE_SO7_CONTROLLER; g_machine.s_machine_config.motion.m_VideoCardType=0; + g_machine.s_machine_config.motion.m_RotaryCircleDis=7.2; + g_machine.s_machine_config.motion.m_RotaryCirclePulse=14400; + g_machine.s_machine_config.motion.m_RotaryAxisNO=MACHINE_AXIS_Y; + + return SSI_STATUS_MOTION_NORMAL; } SSI_STATUS_MOTION CSO7_Proto::so7_motion_reset_controller_parameter() @@ -2562,6 +2568,27 @@ SSI_STATUS_MOTION CSO7_Proto::Load_So7_Config() g_machine.s_machine_config.motion.m_DebugOutputEnable=atoi(cTemp); } } + + //=================Rotary======================== + else if (!_stricmp(token,"ROTARY_AXIS_NUMBER")) + { + token = strtok( NULL, seps); + if (token) + { + strcpy(cTemp,token); + g_machine.s_machine_config.motion.m_RotaryAxisNO=atoi(cTemp); + } + } + else if (!_stricmp(token,"ROTARY_CIR_DIS")) + { + token = strtok( NULL, seps); + if (token) + { + strcpy(cTemp,token); + g_machine.s_machine_config.motion.m_RotaryCircleDis=atof(cTemp); + g_machine.s_machine_config.motion.m_RotaryCirclePulse=g_machine.s_machine_config.motion.m_RotaryCircleDis/ROTARY_MMtoScale_RESOLUTION; + } + } //=================VideoCard======================== else if (!_stricmp(token,"SDK3000_SLEEP_COUNT")) { @@ -3368,7 +3395,6 @@ SSI_STATUS_MOTION CSO7_Proto::so7_motion_get_position_R(double & dRad) bPlus=false; } int iRetryCnts(0); - g_machine.s_machine_config.motion.m_RotaryCirclePulse=g_machine.s_machine_config.motion.m_RotaryCircleDis/ROTARY_MMtoScale_RESOLUTION; if (fabs(dR)-fabs(2.0*g_machine.s_machine_config.motion.m_RotaryCirclePulse)>100) { do diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h index d79c50a..f8ace27 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h @@ -233,7 +233,7 @@ struct struct_so7_machine char _bIsZMMotionFinished; bool _bZMHoming; bool _bXYZZMIdle; - bool _bRMovins; + bool _bRMoving; } s_status; union { struct s_lights_value diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.cpp index 0f76621..b1ff369 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.cpp @@ -162,6 +162,23 @@ extern "C" EXP_IMP SSI_STATUS_MOTION WINAPI Motion_SetPositionR(double dAbsolute return SSI_STATUS_MOTION_NORMAL; } } +//================================================================== +extern "C" EXP_IMP SSI_STATUS_MOTION WINAPI Motion_DCCHome() +{ + if (!g_bOfflineOnly) + { + if (!m_pSO7_Proto) + { + m_pSO7_Proto=new CSO7_Proto(); + } + return m_pSO7_Proto->so7_motion_Dcc_Home_R(); + } + else + { + return SSI_STATUS_MOTION_NORMAL; + } +} + //================================================================== extern "C" EXP_IMP SSI_STATUS_MOTION WINAPI Motion_IsHomed(bool &bHomed) { @@ -195,7 +212,7 @@ extern "C" EXP_IMP SSI_STATUS_MOTION WINAPI Motion_IsFinished(bool &bFinished) } } //================================================================== -extern "C" EXP_IMP SSI_STATUS_MOTION WINAPI Motion_MoveR(char cSpeedGear) +extern "C" EXP_IMP SSI_STATUS_MOTION WINAPI Motion_JogR(char cSpeedGear) { if (!g_bOfflineOnly) { @@ -210,3 +227,19 @@ extern "C" EXP_IMP SSI_STATUS_MOTION WINAPI Motion_MoveR(char cSpeedGear) return SSI_STATUS_MOTION_NORMAL; } } +//================================================================== +extern "C" EXP_IMP SSI_STATUS_MOTION WINAPI Motion_StopR() +{ + if (!g_bOfflineOnly) + { + if (!m_pSO7_Proto) + { + m_pSO7_Proto=new CSO7_Proto(); + } + return m_pSO7_Proto->_send_cmd_SO7_CMD_STOP_MOVE_XYZ(); + } + else + { + return SSI_STATUS_MOTION_NORMAL; + } +} diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.h index 88cd9be..e95c4e4 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.h @@ -26,9 +26,12 @@ extern "C" //Units:Rad EXP_IMP SSI_STATUS_MOTION WINAPI Motion_GetPositionR(double& dPos); EXP_IMP SSI_STATUS_MOTION WINAPI Motion_SetPositionR(double dAbsolutePos,bool bWait); + + EXP_IMP SSI_STATUS_MOTION WINAPI Motion_DCCHome(); EXP_IMP SSI_STATUS_MOTION WINAPI Motion_IsHomed(bool &bHomed); EXP_IMP SSI_STATUS_MOTION WINAPI Motion_IsFinished(bool &bFinished); //SpeedGear:1,2,3,4(Faster) - EXP_IMP SSI_STATUS_MOTION WINAPI Motion_MoveR(char cSpeedGear); + EXP_IMP SSI_STATUS_MOTION WINAPI Motion_JogR(char cSpeedGear); + EXP_IMP SSI_STATUS_MOTION WINAPI Motion_StopR(); } \ No newline at end of file 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 c9d908b376bd871f34457179c857953661c13d78..648196c34b739eca9c6531b758f35fe12d6357ff 100644 GIT binary patch delta 3250 zcmb7GdsLH07N47ZNka%25D^eDARu6ZBx0(pr2$b9Q6i<5typ=BM+L>;t`;@jx_Y)t zRk+HhT^Fg=9_hmdKALo;YS7xUv|UkIANZ_#wzjS=<;3plv2^d3hi(7bv-6#M?%dy< znLGC}GoQ6zX1yb`B}ip+8DqtQPHKXH>5bny3QvQS5Nn38p34D+f%%0>2gQ%nVth)pD9xNklx|D_4W@7^bP=NX1!D0xD?$kg7g5iW{snSwwogP$ zu-UzA*b~G>$Sjg_dPm!$hVS;O9p3D!%kUY|dp(Wg`c!ng-hX}54m4wfj z3bn%C<3)hhNQ0k}Mc0cip2U)*?HC!a#8%Bjtcx3f$7qgsqB=1|xEhrR!snWII3aUF zC+9c+UhV3dNjB3jrc5qinY!l+(o*PqSwC4n**LAzpi40t%5|x!B?jG8vhs?WB@4@@E}x0rxjNW@pqn;2E3IhWx~!VA zx|J2xmZIF6rA4!9YFCzE#*AbvonDTChOubXt>hb35F^AS@0Ylv7vb|*9!R|j_4p_y zMV-end)|1E}MF!24 zp+REceQhjtl7yg_zL27Nu~Jg!6uv3B2+$=4SXfvQ=Z2wL*itnJ0bhq_s@5i!nV6hq zzK^TZ7vZt#k@CFS(q)zzIQW7AoY**TD=segm(7@$wImzcvnFEA3=2M3zDklc>`M`j zsm=%$d^=#V&d;bX)^X-ln%{~~txOL%`I|+jY?od!u{f6bsdv>;?rh)7RpPpI13pYN z%3oMkomElkHgiAsS#&Os79Q0Y#^9=k&1f8(g8kiE)O=oqMUk;^9!vP&qq89uP1~ce zubab=juy1q!i30%PH5WU#M138xOv+(?0dZv4r6=s%QQNMzcvNbRKAO8e*<1HmA558 z5`oV>0Zj*Tu(&A#ojV4g6T5e8McaEx=-jEm>dU{wz~)FeM)voix+@H=yHpY@bC))@ zG&gj-u|M)W^z+&mcow~9Zlpua%gEaE94|aJwaTA#F8ZQA#(9n*eey*zZoNi zzj^nVfTn|~*l;imEkuc&TC*;q!@RX;W8NQvHl|fAdK6b`o7whC@!*_2x-+wveezj9 z4c73zk)RZY56+b0NluTJwmgvwuC~*h9}~?4`;4ONFzMR#@)roH%Ek2`Y=J6--N&KN zy8}amsW8u~I>9kb9^!>U;_p{wX)Y^iW`_jmvscK5%JstyI(Y&)Ae3poie zhDDtkPDUNU+PMzI%Zrh)hApGOTUZHE9ZAWoiWHNHda>ksJEb?&PejHMU2*S4OwI~> zBo1|SQqr%1OGJ5f39Of;(V%AR?t7Kzra&;I^hE;pyY=+}5KmQ^jhh@7;0v!)?&^UY z)O8(2%aM+LQl)W~{lq z6+2IbkkJi84pg5K3(Qlp228%Arj0MbKY#iqoc&qZhswmb=fsbf!f5La}g<|13mEi2(!igsUGGHSGql7FR zL48*v9vMi6E3|qSny$;S_*xih1{5%W@YgPqG@!@jm*2$A*RIfM-Y`U|c8`jsSbKJ> zq_d@faD4X0K`g$06K~&`g{3wlMmEG?;muW;ek&7QH*@%2324!JtA`s!roHFvb^#~W zkoTdxt&*YkkNq9rYJoQ;LosIuHJ{nt|OF%dQFKFg!?o(Wg=?SzGfpuJ5dLbcqxBKB?`8m&jEIU zxO^_KOT;y~z^)Nbn+I-pO6PlcSDr`zrP(w8$^sb0uF$}L<%63`3OxL66>!+TTFV#u z!6E+FL6FX;tKt4ApgT+qF#Vh{&f6b$Krq||UK<4c_7Kp5Jrr!RfZYMKE;W%y@ZXJw ziTs^0aMN+P3XISk1z8FcX_Z9o&^s(qkOzJsx*p;KRngud#2Bv~1^sAC40Hr)APVd; za0r4r+m;QH zEtVimg9HV+{L+l?{>uV-7zo@OFK66tE3Rd?=6H_&6wwbJ)mvmF7%YU{uZ#?KRYI< f+1+X{g%i^M!<&f?Wfk0pVDT7hQ delta 2893 zcmZWre^gWV6@T~T1(Ogl{4gQ{hJXkP2&im&6r-R5>WHgHu~J3sEUQHk(++XP=&E*# z8{}4=w5y684m-r?Lt;@B6*WUEKbkRR5drPrGe}<4He0Js}>>zhcrO~ zP`cDtNR)d37cWk9PXrCda!NEP^fC`ZM!40{K}Z-$qlXcLr`~CDtQ!#=p36Kqxm!eo zk6yNrB>!Q=LC9Q^g4_uF6+iY(mq|%hx-r4wn=X|z<4E>#V`vzw$0jaTaEw*5Xlncr z)ApI3Y8(> za`=64Cp;NanBcL+@c!EM1y~UrC8USfa`K}$LiaQ*`Bpbcl1wqVwEpnsst@6 zPJ0QlF<-E<+2me;+eHsA`g&&@zKl)dd`0k0GUJLdCwj7w7~d8NZnFjWha3gPEQT3M zlsxPtcCS@?-xx`lbHp@i$nq#5a?MQ%jK&boSCFr31ss*xKV(8idSVfh&kezJcwYI3_d_GUu1VW9muEpR!f?h1z6D)bo$HPQoe+RJS_U! z0|yVM$i!re!8@A>4M$u(pdLmXganhMaU&j!=*!9qg%w%}pCO7ey+dTjHj;#LF^60jOzizs2+Zu3MzsFjX{(JADnK`RoP7rLBnU5Acyc%9H<`pNdghSQc%mxC zfNeojP;;&TrsC_41DN%L52Z|j<_jFGz)#QiP-K;N>gnH_llgs z%vz1}Lon8Eg%P5EG_W6&vHxiVnk|9gpn~=B`gI_a&ZOnHhAJA5%g+a(qrQqQ8$JOV zwAcGfY|Q&O#cJWrkq|&PQ3Nfjd+Sh$?#b{$Um)tM3$UXh9P`e%vvtEp=omFlL(@eY zYAD#V{0pii7gi-r=6#78)jj|a2bNI zt@SEfJRDsN9Kod>rC1-NlBUxZRU}oqiX&dSXUPLHFpz+I|E@%>t&Y@1B=4MxFAfJk zYLIN~=^IbE`&{e}VR1*R1hfCyi$^;fP30T;+_~UGN^7ZUDlpmJEvb9UDNVN;4|Un` z@?E>c?!?bvNzWwslhY+@w+fC86>7ccAk08%-xl22nt;{Mw3yMGhwX=BaPQ$1wD!(J z<9#dVM?Mer)PrT*bhjip9w?=P?NJn%UfED{I|sY_IND}76rHoz*NLH+nm3~AvJV;u zmSb;cp-}j^nU!&5iNbK(exjF6C267?@%)6o28n23#s2w}F%6%oaE6|NPaO9##&HdQ z`P7cKXI2cmyOR!wzlV4M7@d_UBHJs4hUdQns=4ci((>0*AOLkQ8u`Wu@G-qKs>B94 zN^3;!Y?hLjfg#ldoFJ+pI!RIbP>;349?JuOI-ZUFI@BgN_VY)sfW>wofO;d0rTLkjgKjT zCuO%%5 z5}+&?lAZrN3uqH(8ZCxkNC)wPRfZ6zAQFegrXj2R-Vv~m-!~6Z>$Fe>-kY)-9A~Vm z=T+}c*i_W#_s)3!R17Sv3xgEkylIuwB5#-gu16)o4Otu$pb@-(_-UV|dWyba`+Ea7 zzZ(;{E3$NHDBm9oD)Hf{i-0SvoQbA2p>Nhrf>b~)I@(>aX1n{>B%3FQ;n;WAc2obqPxkOJCW~~!FUl`M$&ZJNy_VVFbj3xq|w{! zg|i-pTk4bH8jH1MQ6t`dO;i}{8N-NgjPnJ=9cL}P{#{V>-6?PuIpu6rDdVU}xOwAZ z%i=UBP|A`>dA{2v-mx5tQKp!TDj2U1Ai!m4G qu_OONOT{5_wX=4X!c4dgBP~vt%JODHkq-~R=lalu$i+82mH990u@`{=