Skip to content

Commit ddbe417

Browse files
committed
modify flash configs and adjust pa_hero's feedback for pid params
1 parent a9a7db1 commit ddbe417

File tree

5 files changed

+4
-47
lines changed

5 files changed

+4
-47
lines changed

config/RM_Board_Linux.cfg

-22
This file was deleted.

config/RM_Board_Mac.cfg

-22
This file was deleted.
File renamed without changes.

config/openocd_flash.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ cd "$config_base"
1616
exit_cmd="exit"
1717
# default flash file: hero
1818
flash_file="../build/HERO.elf"
19-
# default flash config file: RM_Board_Win.cfg
20-
config_file="RM_Board_Win.cfg"
19+
# default flash config file: RM_F4_Stlink.cfg
20+
config_file="RM_F4_Stlink.cfg"
2121

2222

2323

dev/application/param_adjusts/pa_hero/pa_hero.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -204,13 +204,14 @@ DEF_SHELL_CMD_START(cmd_echo_param)
204204

205205
unsigned pid_id = Shell::atoi(argv[1]);
206206
if (pid_id > 1) {
207+
// TODO, pid_id=2 for autostraightening
207208
Shell::printf("Invalid pid ID %d" SHELL_NEWLINE_STR, pid_id);
208209
return false;
209210
}
210211

211212
PIDController::pid_params_t pid_param = {0,0,0,0,0};
212213
pid_param = CANMotorController::getPIDParams((CANMotorCFG::motor_id_t)motor_id, (pid_id == 0));
213-
Shell::printf("kp: %.2f, ki: %.2f, kd: %.2f, i_limit: %.2f, out_limit: %.2f" SHELL_NEWLINE_STR,
214+
Shell::printf("!kp:%u,%.2f,ki:%.2f,kd:%.2f,il:%.2f,ol:%.2f" SHELL_NEWLINE_STR,pid_id,
214215
pid_param.kp, pid_param.ki, pid_param.kd, pid_param.i_limit, pid_param.out_limit);
215216
return true; // command executed successfully
216217
DEF_SHELL_CMD_END

0 commit comments

Comments
 (0)