修改弹速
This commit is contained in:
parent
fe7d4bd705
commit
1b0ed78b10
File diff suppressed because one or more lines are too long
Binary file not shown.
@ -37,45 +37,9 @@ Note: source file '..\User\task\ai.c' - object file renamed from 'DevC\ai.o' to
|
|||||||
Note: source file '..\User\task\can.c' - object file renamed from 'DevC\can.o' to 'DevC\can_3.o'.
|
Note: source file '..\User\task\can.c' - object file renamed from 'DevC\can.o' to 'DevC\can_3.o'.
|
||||||
Note: source file '..\User\task\cap.c' - object file renamed from 'DevC\cap.o' to 'DevC\cap_1.o'.
|
Note: source file '..\User\task\cap.c' - object file renamed from 'DevC\cap.o' to 'DevC\cap_1.o'.
|
||||||
Note: source file '..\User\task\referee.c' - object file renamed from 'DevC\referee.o' to 'DevC\referee_1.o'.
|
Note: source file '..\User\task\referee.c' - object file renamed from 'DevC\referee.o' to 'DevC\referee_1.o'.
|
||||||
compiling ballistics.c...
|
|
||||||
compiling freertos.c...
|
|
||||||
compiling ahrs.c...
|
|
||||||
compiling capacity.c...
|
|
||||||
compiling crc16.c...
|
|
||||||
compiling cmd.c...
|
|
||||||
compiling filter.c...
|
|
||||||
compiling mixer.c...
|
|
||||||
compiling pid.c...
|
|
||||||
compiling user_math.c...
|
|
||||||
compiling bmi088.c...
|
|
||||||
compiling ui.c...
|
|
||||||
compiling can.c...
|
|
||||||
compiling dr16.c...
|
|
||||||
compiling ist8310.c...
|
|
||||||
compiling ai.c...
|
|
||||||
compiling cap.c...
|
|
||||||
compiling referee.c...
|
|
||||||
compiling config.c...
|
compiling config.c...
|
||||||
compiling chassis.c...
|
|
||||||
compiling gimbal.c...
|
|
||||||
compiling shoot.c...
|
|
||||||
compiling ai.c...
|
|
||||||
compiling atti_esti.c...
|
|
||||||
compiling can.c...
|
|
||||||
compiling cap.c...
|
|
||||||
compiling cli.c...
|
|
||||||
compiling command.c...
|
|
||||||
compiling ctrl_chassis.c...
|
|
||||||
compiling ctrl_gimbal.c...
|
|
||||||
compiling ctrl_shoot.c...
|
|
||||||
compiling info.c...
|
|
||||||
compiling init.c...
|
|
||||||
compiling monitor.c...
|
|
||||||
compiling rc.c...
|
|
||||||
compiling referee.c...
|
|
||||||
compiling user_task.c...
|
|
||||||
linking...
|
linking...
|
||||||
Program Size: Code=149536 RO-data=6928 RW-data=1104 ZI-data=43832
|
Program Size: Code=149584 RO-data=6928 RW-data=1104 ZI-data=43832
|
||||||
FromELF: creating hex file...
|
FromELF: creating hex file...
|
||||||
"DevC\DevC.axf" - 0 Error(s), 0 Warning(s).
|
"DevC\DevC.axf" - 0 Error(s), 0 Warning(s).
|
||||||
|
|
||||||
@ -91,7 +55,7 @@ Package Vendor: Keil
|
|||||||
C:\Users\lvzucheng\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
|
C:\Users\lvzucheng\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
|
||||||
|
|
||||||
<h2>Collection of Component Files used:</h2>
|
<h2>Collection of Component Files used:</h2>
|
||||||
Build Time Elapsed: 00:00:08
|
Build Time Elapsed: 00:00:02
|
||||||
</pre>
|
</pre>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
17489
MDK-ARM/DevC/DevC.hex
17489
MDK-ARM/DevC/DevC.hex
File diff suppressed because it is too large
Load Diff
@ -3,7 +3,7 @@
|
|||||||
<title>Static Call Graph - [DevC\DevC.axf]</title></head>
|
<title>Static Call Graph - [DevC\DevC.axf]</title></head>
|
||||||
<body><HR>
|
<body><HR>
|
||||||
<H1>Static Call Graph for image DevC\DevC.axf</H1><HR>
|
<H1>Static Call Graph for image DevC\DevC.axf</H1><HR>
|
||||||
<BR><P>#<CALLGRAPH># ARM Linker, 6160001: Last Updated: Sun Mar 16 10:24:19 2025
|
<BR><P>#<CALLGRAPH># ARM Linker, 6160001: Last Updated: Sun Mar 16 23:01:30 2025
|
||||||
<BR><P>
|
<BR><P>
|
||||||
<H3>Maximum Stack Usage = 632 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
|
<H3>Maximum Stack Usage = 632 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
|
||||||
Call chain for Maximum Stack Depth:</H3>
|
Call chain for Maximum Stack Depth:</H3>
|
||||||
@ -1353,7 +1353,7 @@ Global Symbols
|
|||||||
<BR>[Called By]<UL><LI><a href="#[268]">>></a> Referee_Parse
|
<BR>[Called By]<UL><LI><a href="#[268]">>></a> Referee_Parse
|
||||||
</UL>
|
</UL>
|
||||||
|
|
||||||
<P><STRONG><a name="[280]"></a>CalculateRpm</STRONG> (Thumb, 284 bytes, Stack size 20 bytes, user_math.o(.text.CalculateRpm))
|
<P><STRONG><a name="[280]"></a>CalculateRpm</STRONG> (Thumb, 320 bytes, Stack size 20 bytes, user_math.o(.text.CalculateRpm))
|
||||||
<BR><BR>[Stack]<UL><LI>Max Depth = 20<LI>Call Chain = CalculateRpm
|
<BR><BR>[Stack]<UL><LI>Max Depth = 20<LI>Call Chain = CalculateRpm
|
||||||
</UL>
|
</UL>
|
||||||
<BR>[Called By]<UL><LI><a href="#[27c]">>></a> Shoot_Control
|
<BR>[Called By]<UL><LI><a href="#[27c]">>></a> Shoot_Control
|
||||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -107,6 +107,7 @@ inline float CalculateRpm(float bullet_speed, float fric_radius, bool is17mm) {
|
|||||||
if (is17mm) {
|
if (is17mm) {
|
||||||
if (bullet_speed == 15.0f) return 4670.f;
|
if (bullet_speed == 15.0f) return 4670.f;
|
||||||
if (bullet_speed == 18.0f) return 5200.f;
|
if (bullet_speed == 18.0f) return 5200.f;
|
||||||
|
if (bullet_speed == 30.0f) return 6600.f;
|
||||||
if (bullet_speed == 30.0f) return 7350.f;
|
if (bullet_speed == 30.0f) return 7350.f;
|
||||||
} else {
|
} else {
|
||||||
if (bullet_speed == 10.0f) return 4450.f;
|
if (bullet_speed == 10.0f) return 4450.f;
|
||||||
|
1287
User/module/config.c
1287
User/module/config.c
File diff suppressed because it is too large
Load Diff
@ -15,7 +15,7 @@
|
|||||||
#define HEAT_INCREASE_17MM (10.f) /* 每发射一颗17mm弹丸增加10热量 */
|
#define HEAT_INCREASE_17MM (10.f) /* 每发射一颗17mm弹丸增加10热量 */
|
||||||
|
|
||||||
#define BULLET_SPEED_LIMIT_42MM (16.0)
|
#define BULLET_SPEED_LIMIT_42MM (16.0)
|
||||||
#define BULLET_SPEED_LIMIT_17MM (30.0)
|
#define BULLET_SPEED_LIMIT_17MM (25.0)
|
||||||
|
|
||||||
/* Private macro ------------------------------------------------------------ */
|
/* Private macro ------------------------------------------------------------ */
|
||||||
/* Private variables -------------------------------------------------------- */
|
/* Private variables -------------------------------------------------------- */
|
||||||
|
Loading…
Reference in New Issue
Block a user