robofish/rm_balance
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: robofish:539dc0a2f47aa60599f30a36c36ddf5f57d93276
Branches Tags
robofish:main
robofish:MC_02
robofish:ai
..
compare: robofish:3c4f62e041a88e3291d7cd31b8ddb19d988499c0
Branches Tags
robofish:MC_02
robofish:main
robofish:ai

No commits in common. "539dc0a2f47aa60599f30a36c36ddf5f57d93276" and "3c4f62e041a88e3291d7cd31b8ddb19d988499c0" have entirely different histories.
539dc0a2f4 ... 3c4f62e041

3 changed files with 12 additions and 13 deletions
Show Stats Expand all files Collapse all files

20
User/module/cmd/cmd.c
View File

@ -635,19 +635,19 @@ int8_t CMD_Arbitrate(CMD_t *ctx) {
CMD_Behavior_ProcessAll(ctx, &ctx->input, &ctx->last_input, CMD_MODULE_NONE); CMD_Behavior_ProcessAll(ctx, &ctx->input, &ctx->last_input, CMD_MODULE_NONE);
// #if CMD_ENABLE_SRC_NUC && CMD_ENABLE_SRC_RC && CMD_ENABLE_MODULE_GIMBAL && CMD_ENABLE_MODULE_SHOOT #if CMD_ENABLE_SRC_NUC && CMD_ENABLE_SRC_RC && CMD_ENABLE_MODULE_GIMBAL && CMD_ENABLE_MODULE_SHOOT
// if (ctx->input.online[CMD_SRC_NUC]) { if (ctx->input.online[CMD_SRC_NUC]) {
// if (ctx->active_source==CMD_SRC_RC) { if (ctx->active_source==CMD_SRC_RC) {
// if (ctx->input.rc.sw[0] == CMD_SW_DOWN) { if (ctx->input.rc.sw[0] == CMD_SW_DOWN) {
// ctx->output.gimbal.source = CMD_SRC_NUC; ctx->output.gimbal.source = CMD_SRC_NUC;
// ctx->output.shoot.source = CMD_SRC_NUC; ctx->output.shoot.source = CMD_SRC_NUC;
#if CMD_ENABLE_MODULE_REFUI #if CMD_ENABLE_MODULE_REFUI
ctx->output.refui.source = CMD_SRC_NUC; ctx->output.refui.source = CMD_SRC_NUC;
#endif #endif
// } }
// } }
// } }
// #endif #endif
return CMD_OK; return CMD_OK;
} }

3
User/module/config.c
View File

@ -4,7 +4,6 @@
/* Includes ----------------------------------------------------------------- */ /* Includes ----------------------------------------------------------------- */
#include "module/config.h" #include "module/config.h"
#include "module/balance_chassis.h"
#include <stdbool.h> #include <stdbool.h>
@ -508,7 +507,7 @@ Config_RobotParam_t robot_config = {
#if CMD_ENABLE_MODULE_BALANCE_CHASSIS #if CMD_ENABLE_MODULE_BALANCE_CHASSIS
.balance_sw_up = CHASSIS_MODE_RELAX, .balance_sw_up = CHASSIS_MODE_RELAX,
.balance_sw_mid = CHASSIS_MODE_WHELL_LEG_BALANCE, .balance_sw_mid = CHASSIS_MODE_WHELL_LEG_BALANCE,
.balance_sw_down = CHASSIS_MODE_BALANCE_ROTOR, .balance_sw_down = CHASSIS_MODE_CLIMB_STEP,
#endif #endif
}, },
}, },

2
User/module/shoot.c
View File

@ -995,5 +995,5 @@ void Shoot_DumpUI(Shoot_t *s, Shoot_RefereeUI_t *ui) {
void Shoot_DumpAI(Shoot_t *s, Shoot_AI_t *ai) { void Shoot_DumpAI(Shoot_t *s, Shoot_AI_t *ai) {
ai->num_shooted=s->var_trig.num_shooted; ai->num_shooted=s->var_trig.num_shooted;
ai->bullet_speed=22.0f; ai->bullet_speed=12.0f;
} }