From 9b7c723a3ad9b7c82139c4a9e86c888aa53acc1d Mon Sep 17 00:00:00 2001 From: li204200 <2042004419@qq.com> Date: Sun, 22 Dec 2024 17:43:16 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=9E=E9=95=96=E7=AC=AC=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NewBoomerang_test/application/robot.c | 1 - .../application/cmd/robot_cmd.c.obj | Bin 36012 -> 36016 bytes .../application/robot.c.obj | Bin 18872 -> 18872 bytes .../master_machine/master_process.c.obj | Bin 10384 -> 10384 bytes .../basic_framework.elf | Bin 1274680 -> 1274684 bytes .../basic_framework.map | 86 +++++++++--------- 6 files changed, 43 insertions(+), 44 deletions(-) diff --git a/NewBoomerang_test/application/robot.c b/NewBoomerang_test/application/robot.c index d5ce34a..34fb6ee 100644 --- a/NewBoomerang_test/application/robot.c +++ b/NewBoomerang_test/application/robot.c @@ -50,7 +50,6 @@ void RobotTask() { #if defined(ONE_BOARD) || defined(GIMBAL_BOARD) RobotCMDTask(); - //暂时注释云台和发射任务 调试底盘 //GimbalTask(); ShootTask(); #endif diff --git a/NewBoomerang_test/cmake-build-debug-mingw/CMakeFiles/basic_framework.elf.dir/application/cmd/robot_cmd.c.obj b/NewBoomerang_test/cmake-build-debug-mingw/CMakeFiles/basic_framework.elf.dir/application/cmd/robot_cmd.c.obj index d5fbf3b2fc2973831e05eae95b73b842fdbf8bf6..0a0e84ada33352c1e30bd7ba809b8be17929c45a 100644 GIT binary patch delta 251 zcmZ28lWD_DrU?p+4>l@>=r9^gF4Nh=D6`pEH-eSXW^<2`Du<%F9xEpsBP)jjD zh|TP$z{&#@;Z|VfV`Jvln|#4alQD1dFDpf6W=@;QGS=ygvp2U`^Dr{5-#pPq*;Vj6 z2Ll5WKLbNGCy*9pU|`vNwDCPNXFM^v7Dzfw{@UixsIl3#{W}xm zgUPmC<%}AWw|4n6Moeby)&@!&b}KWkm>k-z&UkuqEs(66yc9^Dn0yvUUYPt9NP0|` e?NMi}nd}NA_e{?1QI}9?VqiGH!~h43P!<5JVMc8L delta 247 zcmdlmlWEONrU?p+cQz`9=rHO`F4Nh=D6!dCH-eSXVsnp?Du=wX9xEpsBP)jjD zh|L_Nz{&#@;Z|VfV>6w6$x4&4X!0K`MMlTT3fAe2(>Hfm^Dr{5-aOSt*;Vi}2Ll5W zKLbNKCy*9pU|`sMvhh7L``Z| bnCuB8cT6tqQJ0WuVqiGH1hf?j7@;%(S7}B| diff --git a/NewBoomerang_test/cmake-build-debug-mingw/CMakeFiles/basic_framework.elf.dir/application/robot.c.obj b/NewBoomerang_test/cmake-build-debug-mingw/CMakeFiles/basic_framework.elf.dir/application/robot.c.obj index 9002673965e8598b67393275bdd2a0a727a05ebd..9505857600e42531d92d69b267ddfc03491b9446 100644 GIT binary patch delta 16 XcmdlnnQ_Nt#tm+=j0T(CWearxHRlD9 delta 16 XcmdlnnQ_Nt#tm+=jE0-tWearxHSGnG diff --git a/NewBoomerang_test/cmake-build-debug-mingw/CMakeFiles/basic_framework.elf.dir/modules/master_machine/master_process.c.obj b/NewBoomerang_test/cmake-build-debug-mingw/CMakeFiles/basic_framework.elf.dir/modules/master_machine/master_process.c.obj index afe36ed13e64770359871d74595505a2127c38e3..7cabadbb71b21dcd1a950b526b3c8c597b5453b9 100644 GIT binary patch delta 116 zcmbObI3aLDEvs;w;1UJ~23BSu!5~z~$iTq3V)6u5QN~S^m$3$DO&2O+0m(2h1OPGP z91u_NFo-!zd^S)I)5HQnVUVVIlNH$X7&|8WvxzcxY))m%We0LD^DbhXKDms~j&a52 It$ep70klIKvj6}9 delta 116 zcmbObI3aLDEvs;=;1UJ~23BSu!5~z~$iTq3eDVZVQO1pvm$3$DO%p0&0m(2h1OPGP z91u_NFo-!*d^S)I)5HQnVUVV|lNH$X7~3cNvxzdcZ%$>)We0LD^DbhXHo1(?j&b?s It$ep70kS3=r~m)} diff --git a/NewBoomerang_test/cmake-build-debug-mingw/basic_framework.elf b/NewBoomerang_test/cmake-build-debug-mingw/basic_framework.elf index 6ff177f5de77584ca4352c9f00766ec9a7c59e4e..e7a4d04bb7c3f5b6eb053ee383a75ea8b32b35fa 100644 GIT binary patch delta 1069 zcmZWoYiv|S6uxI>@67Dp-M#w=yVPA}FAXdW*nnU)>0|jpRe}@}EU)-Ojfn)Y+efHk z{n0fpEinot%29zDYnzk^XjaNW!=p;ofCi~iZ2Lp~L$@TvG-@Ix8l2lS+o(UjIddN0 zojK>5duC$&*@^WBQm`!NR6Ebs8VL#4Ps|vmruFh@gN$Hk9gksWgS05PO1|!c+jO)} z?y-I8s{b=cGm?Vctp3koSht(|>CR(vH{+W#9FOf3kI;oJvNjAY^!E<=u4K<|EOG8a z`#xDsu@hJ<_RRTaQu!?W%~9m)f2)mO7_rb`V0Tsgf@ zbp~LVa)*>UJUsWg8V8Hsx~R+;{M6MmrZl`7J`GF5uMyA) zQqP$ElnFHiKii9xldd$q0!)=Mfd}0^Z%CPb9kEhoP;jdf>x*^;G-0-AJDhuK@La%9f4M1C2LoN+Y)B)l5g~6jx|D;1_qRsN gVJ&WJji#X=bFO(BkGW8r-7+wkNlgOsbEd*sIR^|r;WD06PgMeVR{Ub53LP88tqiAgK++}tVZ}Pj}^LOw0 z9_Qp(-LbK{-Ek=EOr#T#POx->rxUJp!W>M9FVDd&%$*Y_p_uy4i!g%+=-9WS-@|(D zVxU(Xzzb33!_+EeQFvH1l(P5kVMn#tKtKE@N`36Izy(|-vEmZ9X$F%@FmBPBzfM;Qn8_ea3{%qjq$IS@F|J1K%mdOwXYIy`ZmPw2JkIS7N_?^0IFMFWq}iwlTgU#qsbu@id)&K~@K0Bjwl1cO`3GUf?{4_M>t> zMK;OD80%YE@Q+vTC0*rK$=-V2Y1C3&Kdc+o-!4-jSV=c_$j&&s-dv!Je`*ok`bfHY zc{3FBb{X-|!4boNL!$Yvp`O%UI1q3dMsVzJt$vKLtXvLVxFIV`0{f%yaKm7G znu85aup9SfpIw0Ky~wOReH$yuYG^=6uRQ$}NOg;HEi3$w=e5w@$SGYh}dk|OMmC}J)BPI;v` zt5<~a^@#H0&}Ns3cLsSC>E*iPX88{a4OmTj*!7&{2MVMabaA?REzTYuoXje$#Hfn~ zYSmvB%bb`bpe9_SZ&sI*drlHNX}%m|ETdPbCnTf?JaX?Qh!8h+{- zv0pJ^F2RrXbTu_O+jI*sRon#bcXYlYZhE!Hikp7%1TM+h<O#zLdMu>b(;R+5@a9&F|35)Ti kmhenCh-pWx!2w6y#;cAvf_W{9iyFg50Q7E5JpZcy0122@`v3p{ diff --git a/NewBoomerang_test/cmake-build-debug-mingw/basic_framework.map b/NewBoomerang_test/cmake-build-debug-mingw/basic_framework.map index 89c026c..81fb6a1 100644 --- a/NewBoomerang_test/cmake-build-debug-mingw/basic_framework.map +++ b/NewBoomerang_test/cmake-build-debug-mingw/basic_framework.map @@ -8401,7 +8401,7 @@ LOAD d:/clion.ture/gcc-arm-none-eabi-10.3-2021.10/bin/../lib/gcc/arm-none-eabi/1 .debug_ranges 0x00003138 0x10 C:\Users\20420\Desktop\learnc++andgit\NewBoomerang_test\Middlewares\ST\ARM\DSP\Lib\libarm_cortexM4lf_math.a(arm_sin_f32.o) .debug_ranges 0x00003148 0x10 C:\Users\20420\Desktop\learnc++andgit\NewBoomerang_test\Middlewares\ST\ARM\DSP\Lib\libarm_cortexM4lf_math.a(arm_cos_f32.o) -.debug_line 0x00000000 0x3dd1d +.debug_line 0x00000000 0x3dd21 .debug_line 0x00000000 0x639 CMakeFiles/basic_framework.elf.dir/Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal.c.obj .debug_line 0x00000639 0x114d CMakeFiles/basic_framework.elf.dir/Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc.c.obj .debug_line 0x00001786 0x11b1 CMakeFiles/basic_framework.elf.dir/Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_can.c.obj @@ -8459,48 +8459,48 @@ LOAD d:/clion.ture/gcc-arm-none-eabi-10.3-2021.10/bin/../lib/gcc/arm-none-eabi/1 .debug_line 0x0002d717 0x915 CMakeFiles/basic_framework.elf.dir/Src/usbd_conf.c.obj .debug_line 0x0002e02c 0x3f4 CMakeFiles/basic_framework.elf.dir/Src/usbd_desc.c.obj .debug_line 0x0002e420 0xb8 CMakeFiles/basic_framework.elf.dir/Startup/startup_stm32f407ighx.s.obj - .debug_line 0x0002e4d8 0xa3c CMakeFiles/basic_framework.elf.dir/application/cmd/robot_cmd.c.obj - .debug_line 0x0002ef14 0x98a CMakeFiles/basic_framework.elf.dir/application/robot.c.obj - .debug_line 0x0002f89e 0x702 CMakeFiles/basic_framework.elf.dir/application/shoot/shoot.c.obj - .debug_line 0x0002ffa0 0x732 CMakeFiles/basic_framework.elf.dir/bsp/can/bsp_can.c.obj - .debug_line 0x000306d2 0x431 CMakeFiles/basic_framework.elf.dir/bsp/dwt/bsp_dwt.c.obj - .debug_line 0x00030b03 0x418 CMakeFiles/basic_framework.elf.dir/bsp/gpio/bsp_gpio.c.obj - .debug_line 0x00030f1b 0x57c CMakeFiles/basic_framework.elf.dir/bsp/iic/bsp_iic.c.obj - .debug_line 0x00031497 0x21b CMakeFiles/basic_framework.elf.dir/bsp/log/bsp_log.c.obj - .debug_line 0x000316b2 0x532 CMakeFiles/basic_framework.elf.dir/bsp/pwm/bsp_pwm.c.obj - .debug_line 0x00031be4 0x545 CMakeFiles/basic_framework.elf.dir/bsp/usart/bsp_usart.c.obj - .debug_line 0x00032129 0x218 CMakeFiles/basic_framework.elf.dir/bsp/usb/bsp_usb.c.obj - .debug_line 0x00032341 0x4b5 CMakeFiles/basic_framework.elf.dir/modules/alarm/buzzer.c.obj - .debug_line 0x000327f6 0xe2d CMakeFiles/basic_framework.elf.dir/modules/algorithm/QuaternionEKF.c.obj - .debug_line 0x00033623 0x5c5 CMakeFiles/basic_framework.elf.dir/modules/algorithm/controller.c.obj - .debug_line 0x00033be8 0x36a CMakeFiles/basic_framework.elf.dir/modules/algorithm/crc16.c.obj - .debug_line 0x00033f52 0xa1b CMakeFiles/basic_framework.elf.dir/modules/algorithm/kalman_filter.c.obj - .debug_line 0x0003496d 0x706 CMakeFiles/basic_framework.elf.dir/modules/algorithm/user_lib.c.obj - .debug_line 0x00035073 0x331 CMakeFiles/basic_framework.elf.dir/modules/daemon/daemon.c.obj - .debug_line 0x000353a4 0x2e7 CMakeFiles/basic_framework.elf.dir/modules/imu/BMI088Middleware.c.obj - .debug_line 0x0003568b 0xbc8 CMakeFiles/basic_framework.elf.dir/modules/imu/BMI088driver.c.obj - .debug_line 0x00036253 0xe91 CMakeFiles/basic_framework.elf.dir/modules/imu/ins_task.c.obj - .debug_line 0x000370e4 0x422 CMakeFiles/basic_framework.elf.dir/modules/master_machine/master_process.c.obj - .debug_line 0x00037506 0x4cd CMakeFiles/basic_framework.elf.dir/modules/message_center/message_center.c.obj - .debug_line 0x000379d3 0xc7e CMakeFiles/basic_framework.elf.dir/modules/motor/DJImotor/dji_motor.c.obj - .debug_line 0x00038651 0x8fe CMakeFiles/basic_framework.elf.dir/modules/motor/ECmotor/ECA8210.c.obj - .debug_line 0x00038f4f 0xb85 CMakeFiles/basic_framework.elf.dir/modules/motor/HTmotor/HT04.c.obj - .debug_line 0x00039ad4 0x89a CMakeFiles/basic_framework.elf.dir/modules/motor/LKmotor/LK9025.c.obj - .debug_line 0x0003a36e 0x204 CMakeFiles/basic_framework.elf.dir/modules/motor/motor_task.c.obj - .debug_line 0x0003a572 0x58b CMakeFiles/basic_framework.elf.dir/modules/motor/servo_motor/servo_motor.c.obj - .debug_line 0x0003aafd 0x300 CMakeFiles/basic_framework.elf.dir/modules/referee/crc_ref.c.obj - .debug_line 0x0003adfd 0x732 CMakeFiles/basic_framework.elf.dir/modules/referee/referee_task.c.obj - .debug_line 0x0003b52f 0x558 CMakeFiles/basic_framework.elf.dir/modules/referee/rm_referee.c.obj - .debug_line 0x0003ba87 0x65b CMakeFiles/basic_framework.elf.dir/modules/remote/remote_control.c.obj - .debug_line 0x0003c0e2 0x330 C:\Users\20420\Desktop\learnc++andgit\NewBoomerang_test\Middlewares\ST\ARM\DSP\Lib\libarm_cortexM4lf_math.a(arm_mat_trans_f32.o) - .debug_line 0x0003c412 0x31e C:\Users\20420\Desktop\learnc++andgit\NewBoomerang_test\Middlewares\ST\ARM\DSP\Lib\libarm_cortexM4lf_math.a(arm_mat_sub_f32.o) - .debug_line 0x0003c730 0x39a C:\Users\20420\Desktop\learnc++andgit\NewBoomerang_test\Middlewares\ST\ARM\DSP\Lib\libarm_cortexM4lf_math.a(arm_mat_mult_f32.o) - .debug_line 0x0003caca 0x4f6 C:\Users\20420\Desktop\learnc++andgit\NewBoomerang_test\Middlewares\ST\ARM\DSP\Lib\libarm_cortexM4lf_math.a(arm_mat_inverse_f32.o) - .debug_line 0x0003cfc0 0x259 C:\Users\20420\Desktop\learnc++andgit\NewBoomerang_test\Middlewares\ST\ARM\DSP\Lib\libarm_cortexM4lf_math.a(arm_mat_init_f32.o) - .debug_line 0x0003d219 0x31e C:\Users\20420\Desktop\learnc++andgit\NewBoomerang_test\Middlewares\ST\ARM\DSP\Lib\libarm_cortexM4lf_math.a(arm_mat_add_f32.o) - .debug_line 0x0003d537 0x2d0 C:\Users\20420\Desktop\learnc++andgit\NewBoomerang_test\Middlewares\ST\ARM\DSP\Lib\libarm_cortexM4lf_math.a(arm_sin_f32.o) - .debug_line 0x0003d807 0x2d3 C:\Users\20420\Desktop\learnc++andgit\NewBoomerang_test\Middlewares\ST\ARM\DSP\Lib\libarm_cortexM4lf_math.a(arm_cos_f32.o) - .debug_line 0x0003dada 0x243 C:\Users\20420\Desktop\learnc++andgit\NewBoomerang_test\Middlewares\ST\ARM\DSP\Lib\libarm_cortexM4lf_math.a(arm_common_tables.o) + .debug_line 0x0002e4d8 0xa40 CMakeFiles/basic_framework.elf.dir/application/cmd/robot_cmd.c.obj + .debug_line 0x0002ef18 0x98a CMakeFiles/basic_framework.elf.dir/application/robot.c.obj + .debug_line 0x0002f8a2 0x702 CMakeFiles/basic_framework.elf.dir/application/shoot/shoot.c.obj + .debug_line 0x0002ffa4 0x732 CMakeFiles/basic_framework.elf.dir/bsp/can/bsp_can.c.obj + .debug_line 0x000306d6 0x431 CMakeFiles/basic_framework.elf.dir/bsp/dwt/bsp_dwt.c.obj + .debug_line 0x00030b07 0x418 CMakeFiles/basic_framework.elf.dir/bsp/gpio/bsp_gpio.c.obj + .debug_line 0x00030f1f 0x57c CMakeFiles/basic_framework.elf.dir/bsp/iic/bsp_iic.c.obj + .debug_line 0x0003149b 0x21b CMakeFiles/basic_framework.elf.dir/bsp/log/bsp_log.c.obj + .debug_line 0x000316b6 0x532 CMakeFiles/basic_framework.elf.dir/bsp/pwm/bsp_pwm.c.obj + .debug_line 0x00031be8 0x545 CMakeFiles/basic_framework.elf.dir/bsp/usart/bsp_usart.c.obj + .debug_line 0x0003212d 0x218 CMakeFiles/basic_framework.elf.dir/bsp/usb/bsp_usb.c.obj + .debug_line 0x00032345 0x4b5 CMakeFiles/basic_framework.elf.dir/modules/alarm/buzzer.c.obj + .debug_line 0x000327fa 0xe2d CMakeFiles/basic_framework.elf.dir/modules/algorithm/QuaternionEKF.c.obj + .debug_line 0x00033627 0x5c5 CMakeFiles/basic_framework.elf.dir/modules/algorithm/controller.c.obj + .debug_line 0x00033bec 0x36a CMakeFiles/basic_framework.elf.dir/modules/algorithm/crc16.c.obj + .debug_line 0x00033f56 0xa1b CMakeFiles/basic_framework.elf.dir/modules/algorithm/kalman_filter.c.obj + .debug_line 0x00034971 0x706 CMakeFiles/basic_framework.elf.dir/modules/algorithm/user_lib.c.obj + .debug_line 0x00035077 0x331 CMakeFiles/basic_framework.elf.dir/modules/daemon/daemon.c.obj + .debug_line 0x000353a8 0x2e7 CMakeFiles/basic_framework.elf.dir/modules/imu/BMI088Middleware.c.obj + .debug_line 0x0003568f 0xbc8 CMakeFiles/basic_framework.elf.dir/modules/imu/BMI088driver.c.obj + .debug_line 0x00036257 0xe91 CMakeFiles/basic_framework.elf.dir/modules/imu/ins_task.c.obj + .debug_line 0x000370e8 0x422 CMakeFiles/basic_framework.elf.dir/modules/master_machine/master_process.c.obj + .debug_line 0x0003750a 0x4cd CMakeFiles/basic_framework.elf.dir/modules/message_center/message_center.c.obj + .debug_line 0x000379d7 0xc7e CMakeFiles/basic_framework.elf.dir/modules/motor/DJImotor/dji_motor.c.obj + .debug_line 0x00038655 0x8fe CMakeFiles/basic_framework.elf.dir/modules/motor/ECmotor/ECA8210.c.obj + .debug_line 0x00038f53 0xb85 CMakeFiles/basic_framework.elf.dir/modules/motor/HTmotor/HT04.c.obj + .debug_line 0x00039ad8 0x89a CMakeFiles/basic_framework.elf.dir/modules/motor/LKmotor/LK9025.c.obj + .debug_line 0x0003a372 0x204 CMakeFiles/basic_framework.elf.dir/modules/motor/motor_task.c.obj + .debug_line 0x0003a576 0x58b CMakeFiles/basic_framework.elf.dir/modules/motor/servo_motor/servo_motor.c.obj + .debug_line 0x0003ab01 0x300 CMakeFiles/basic_framework.elf.dir/modules/referee/crc_ref.c.obj + .debug_line 0x0003ae01 0x732 CMakeFiles/basic_framework.elf.dir/modules/referee/referee_task.c.obj + .debug_line 0x0003b533 0x558 CMakeFiles/basic_framework.elf.dir/modules/referee/rm_referee.c.obj + .debug_line 0x0003ba8b 0x65b CMakeFiles/basic_framework.elf.dir/modules/remote/remote_control.c.obj + .debug_line 0x0003c0e6 0x330 C:\Users\20420\Desktop\learnc++andgit\NewBoomerang_test\Middlewares\ST\ARM\DSP\Lib\libarm_cortexM4lf_math.a(arm_mat_trans_f32.o) + .debug_line 0x0003c416 0x31e C:\Users\20420\Desktop\learnc++andgit\NewBoomerang_test\Middlewares\ST\ARM\DSP\Lib\libarm_cortexM4lf_math.a(arm_mat_sub_f32.o) + .debug_line 0x0003c734 0x39a C:\Users\20420\Desktop\learnc++andgit\NewBoomerang_test\Middlewares\ST\ARM\DSP\Lib\libarm_cortexM4lf_math.a(arm_mat_mult_f32.o) + .debug_line 0x0003cace 0x4f6 C:\Users\20420\Desktop\learnc++andgit\NewBoomerang_test\Middlewares\ST\ARM\DSP\Lib\libarm_cortexM4lf_math.a(arm_mat_inverse_f32.o) + .debug_line 0x0003cfc4 0x259 C:\Users\20420\Desktop\learnc++andgit\NewBoomerang_test\Middlewares\ST\ARM\DSP\Lib\libarm_cortexM4lf_math.a(arm_mat_init_f32.o) + .debug_line 0x0003d21d 0x31e C:\Users\20420\Desktop\learnc++andgit\NewBoomerang_test\Middlewares\ST\ARM\DSP\Lib\libarm_cortexM4lf_math.a(arm_mat_add_f32.o) + .debug_line 0x0003d53b 0x2d0 C:\Users\20420\Desktop\learnc++andgit\NewBoomerang_test\Middlewares\ST\ARM\DSP\Lib\libarm_cortexM4lf_math.a(arm_sin_f32.o) + .debug_line 0x0003d80b 0x2d3 C:\Users\20420\Desktop\learnc++andgit\NewBoomerang_test\Middlewares\ST\ARM\DSP\Lib\libarm_cortexM4lf_math.a(arm_cos_f32.o) + .debug_line 0x0003dade 0x243 C:\Users\20420\Desktop\learnc++andgit\NewBoomerang_test\Middlewares\ST\ARM\DSP\Lib\libarm_cortexM4lf_math.a(arm_common_tables.o) .debug_str 0x00000000 0x11e5c .debug_str 0x00000000 0xb6e CMakeFiles/basic_framework.elf.dir/Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal.c.obj