From 1488098d6018321fee7bb35f9213946aa4da9bba Mon Sep 17 00:00:00 2001 From: ZHAISHUI04 <3150778793@qq.com> Date: Mon, 31 Mar 2025 16:13:20 +0800 Subject: [PATCH] =?UTF-8?q?3.30=E6=9B=B4=E6=94=B9=E7=9A=84=E6=9A=82?= =?UTF-8?q?=E5=AD=98=E5=8C=BA=E4=B8=A2=E5=A4=B1=EF=BC=8C=E8=BF=99=E4=B8=AA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E9=83=A8=E5=88=86=EF=BC=8C=E5=A4=84?= =?UTF-8?q?=E4=BA=8E=E5=8F=AF=E7=94=A8=E7=8A=B6=E6=80=81=EF=BC=8C=E4=BD=86?= =?UTF-8?q?=E4=B8=8D=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MDK-ARM/ELE_CHASSIS/AUTO_CHASSIS.axf | Bin 2759920 -> 2759920 bytes User/Module/up.c | 6 +++--- User/task/up_task.c | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/MDK-ARM/ELE_CHASSIS/AUTO_CHASSIS.axf b/MDK-ARM/ELE_CHASSIS/AUTO_CHASSIS.axf index 669a09dc3eac6868071d2839271ced72a01f4c6f..1624ed6cfefac777396862936eb83e9f346939cd 100644 GIT binary patch delta 5798 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 JYd~nb{{v8X8^r(s delta 5875 zcmZWt2~?F;*S`Cl_q-q%5Cw4ng%r8(#R+5%#WA&V3{z73WOC@s6o1XkG(jyVN=$8Q zPFR?vsF1^UN^!~w0nMpCO>C0Pfy&av;opZ#eg9g&YwdMB)85a1_Hf=y_3i?wW+__t ziHGgO!;!WBe79}-r2przj~=`TNfHXE|4R@7FrBi7!4rVXlr;j5DY5SYej(&5^m!VT z0raKp40ulRSULu_8<0!cS!|TGGI%dI90XcYo7VMQ3mjGvOg(=i_4(t=cc8PAh3k9tpnU-vX zXps4*fVx~234n>4zz6*|L#8Y^3iPN_3K^2$!E6zr?lElya$))ZFkXBKqp-8AJw<&Jf@yI>@vFBiCqUqq?=m5a=ZQYlx=b_)hH;d5TLk#RJQ@Zv6~Ll>LiQG%TZWQ71oPO(O%lMao%Q5j z02%baLk{s^NP`;5C;(4-*I%vz&pGG77B)-xwHWxycx-S4nozGMGLA9P%%<`(KqZX` zkiP=>QUB)hk~^bugvt@^q;U~&LZoa;Ym;PuFZcm(r^r&sq`j#!02su@G#L-fV}lIY zNHIvqD{>>qxDp%PTp(9@Qsx`dVM@RAHuBye6M)XYEf+}0#gtjH2nJ(=+43}m3;k@+3S&SjTq_ytYp6Vq+hDEVsfgeC`vu43e?(6S)#D zgHp_q; za1mRe@c{N?)8)p)rfu_WHp5V_jGxSdF?!sD)XBEQM*usp{R-oH!>rovzt^)RJV%a? zjQ;_j!u9{$OWYu!1AVsA2!y76KGn;0=j-$)t`bn6zFlS50Vd;()y6T7!sly@Jb+b{ zlxIu;`>JA_txKMOKctD__Z@z8ZJnX`G+qDLZ~zRZ`uPTv*_9I38`lA%`+ktN1T0C%c6XtdJR5_DKwO`-H78f6I4Q9VCLHD4OBz~vHoTvJj_T}~K_ zfb+ckq~QjzoGzZy`YgIrYSh=Q_{nKK&Y}9{MsMKK9a>@d0+;TqXN`ZMm%7 z8Avy-7{kGyd(~!3ER^s_cw+V{Mt9R9H0VQ3w04X(IcS- zXf6E=HB@U|uhb%dJ{0YyI4pVC&s{y?lIvGb{SHyo%|o5yBtafSDbiCl5+Yfkx2FoB z@!o0=#}A!8d~!QAZ=eDUPSW^Bieb#7*Zoz14&&m+DoJoj{Mc0e!mzyPY=H6x$f0Y2 zYLVc$PYhBVZ%=wBSOp1YXMIaGMhD6(M6X|>r&_C4V6XB6TjFvF)xrlGEae(X4^=Y& z9?~_3Y9lzlUSZm=zVvb%Fx~5{J^^lqE4#1~`wvdAb>UvKqKOxF%XRo-a5wcGcWl{R0|_SI9?GtJL{Lw~ zc^yY1pV3;XXkjnK@!W@tdaD{3hzt9ud-i?pS=VELzx=##e3hdW7Co!Z+N};Q3-cOz zVfZ3POWgXL`iftY+0QF4;3r~nUv-aR&F`lp9fjBWtGjIH!T?QFPYNBRdUIaT_!sn; zOgocwz|PUx!MtxD9K${z6i^-PivzDano+MIDo9@&Jyb>Na{ee;k5yFmk{)-F7_P?* zj2WTsKsAQGtZM8dIx#?g%>Hcah1ae-nqbd=sWbNDdi5^A9$p=^&=G(MBh^{XHSZKn zKpZ`ts@yoT*gZ|%v5)P-hif)JDs6Pzn#%Our7d;aZYwNfYMv?)4pIke{uwM1up|2K8u?&1s6SX&^y z@Rs6^u^mrN=V>sWoWVeI@XNQ=6Z`!kjDtTCK5D?c>Y3^cb9X35C=bI-1k& zxr!g-YC1VjJ+C{Z{{luNY%kNIh00&I_)l}xaNYXF``Ynf@?WGqD8y#DTqA*KE@rB8 z=$pmrfo>q@mv93Kr_D<>4fpBFGM&fA>DGsOoKBBWEd;lWF^qnez@q8032s=y8J|H5 zKGHW*XwOO=q-r{}N;x!vH&&~3{o?drtLNb~B~Pc&VA{A&$F>udeXRNdjKF|=cCwNh zuh)i>$?>V~ROhJ623Og=TA*uoIeqn+PUJZhut}RSs8ylP*zMS3v#R8F8M1|mE2Y4# zdUr5|6saEi*&17{ea@qCpX>ENn!HWVm($ekdTvqH4h`-m73@^&b!X_mi@|Ki=XUd8 zVXr-`bQLA;)#+AE)As3<*iL)CP}B6Q5q&^2-<7gUG~|7>;-D_Yp7iS>eeMWF9AS^` zUFUM(iUh3k@W7Izq0K4hsPe2m{-wSaPQ}OcSV$+1>o{3-<%IUUfa;xc5!Sg>j}K|$ zX$}F`;-fOHekpaX&^{JW_8DFBo^rJ{148 z_PK;oztId%rR@J`yWzC#vJT8c+pI+J#Pt10?{4qnw`GM%W@YH~<@r{VUc=HKgU zt0>|JO{phE|ESmJP`{s4Pwo8&*R`1}+Ec}&z0VqEp+vwFZ(qzj8S1z5hH4G=n|gJH zfZx46@Tn;df9&-O6Q4reZ?bE`mPd1Msg@f1#@i}MV|{!_w=qv@_N$t$`~RBX)C8T| z-gi0K>=heW-6H{ye41gmH~8IO{D(@>RR8v;&e5LK^1jA=6J!2TkNF!l`hhykAH9D) zP{;TcJXpg+9L|5pi@DhE5f4?^;4u$f@%&@nTaK%r@KC*Mlz9yLU^_4m@RNEA%){JP ziUltY#5X0+3b3_=LVS9`H`L)Xx6rtBh5`_*&U;T%x&BXtAfmV{EdbapJIch*si5{kwc(bu>t1# zObEl`-^VjT+3qfS#$mS6-_8>)b2lel8>d-19YXQ`dUF_mkSBd=R)+Ftebi}oX%4d^EDcy1viP$2u{2`wXKBpRgrzA*jnx7WVt(Mavj8vuFbDQoO8CA;`{Sxf#uZ+kvPH%mZ><%XvV8@75 z?M4N)Yv=6EkmJ%_il|qlGqs+Ksypq{JH4}W7?)iH7v+DA74~qB&^cCT=9_1oeHc(o zM4g_y1DxF%a8y*?+)24QJ0~+cX_0l;pMT4_RG+T{NX6OCvAiG4k*sCw=3Hk-gOWbb zH5(oE_o)|_I#ZO0tm_uDKXSgvJf;5)cw?S(Q9Th6<3i-Q$@vZgjE>Z-l~a1LGlPpR zI^M20P3a5gaHg0!tUdh0VRl`nxk6b%-Y1>S4GgMq)@I&bY+ddQg9x3d z6%<_I?8%T~U9*@A&gYeg8jb7f@m|tp=Ioz#Mhm`ke#rc%#cP0P>5nRBrV_EKcrD9W zf%Qe0qE2_56Zix>q+#ealV<+qQ;qE=-p>@CG16S2n&}nG3mtArI|7| zaI%0b#B9xjh&V=HTBkKkMNL kHV6!J2-|slIxsAhKPpmr%AW!Ac~GT~9kxo`5g3;6zd#ikj{pDw diff --git a/User/Module/up.c b/User/Module/up.c index 9c35bbd..174531b 100644 --- a/User/Module/up.c +++ b/User/Module/up.c @@ -201,7 +201,7 @@ int8_t ALL_Motor_Control(UP_t *u,CAN_Output_t *out) - GO_SendData(u,0 ,u->motor_target .go_shoot ); + GO_SendData(u,0 ,u->motor_target .go_shoot ); GO_SendData(u,1 ,u->motor_target .go_spin); @@ -273,10 +273,10 @@ int8_t UP_control(UP_t *u,CAN_Output_t *out,CMD_t *c) if(u->state .last_state == Not_started_Pit) { - u->motor_target .go_shoot =-300; + u->motor_target .go_shoot =-2050; u->motor_target .M2006_angle =-140; - if(u->motorfeedback .GO_motor_info[0]->Pos < (-4.8)) //到达位置后再扣扳机 + if(u->motorfeedback .GO_motor_info[0]->Pos < (-35.20)) //到达位置后再扣扳机 { u->motor_target .M2006_angle =0; if(u->motorfeedback .M2006.total_angle>-5) diff --git a/User/task/up_task.c b/User/task/up_task.c index 1fe2e44..7064042 100644 --- a/User/task/up_task.c +++ b/User/task/up_task.c @@ -69,6 +69,8 @@ void Task_up(void *argument) // GO_SendData(&UP, 1,CCC); // GO_SendData(&UP, 0,aaa); UP_control(&UP,&UP_CAN_out,&up_cmd); +// UP.motor_target .go_shoot =aaa; +// UP.motor_target .M2006_angle =bbb ; ALL_Motor_Control(&UP,&UP_CAN_out); osDelay(1);