Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ボールの回り込みの改良 #636

Open
wants to merge 42 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
e3ee46c
回り込みアルゴリズムを変更
HansRobo Dec 4, 2024
11626f7
AROUND_BALLでKICKを代用
HansRobo Dec 7, 2024
f6360e5
ball lineが長すぎたので短く
HansRobo Dec 7, 2024
7a91537
Merge branch 'develop' into improve_ball_around
HansRobo Dec 11, 2024
00d7993
cspellエラーを回避
HansRobo Dec 11, 2024
a663975
backward_rosを一旦外す
HansRobo Dec 12, 2024
940121e
backward_rosを一旦外す
HansRobo Dec 12, 2024
23075f3
Merge branch 'develop' into improve_ball_around
HansRobo Dec 13, 2024
c16c28b
Merge branch 'develop' into improve_ball_around
HansRobo Dec 15, 2024
54c5ae2
Merge branch 'develop' into improve_ball_around
HansRobo Dec 18, 2024
236ffc8
Merge branch 'develop' into improve_ball_around
HansRobo Dec 23, 2024
26558f4
style(pre-commit): autofix
pre-commit-ci[bot] Dec 23, 2024
6162416
Merge branch 'develop' into improve_ball_around
HansRobo Dec 26, 2024
7f58df2
Merge branch 'develop' into improve_ball_around
HansRobo Jan 5, 2025
65bb22c
Merge branch 'develop' into improve_ball_around
HansRobo Jan 10, 2025
080d209
角度計算のミスを修正
HansRobo Jan 10, 2025
6e405d0
可視化をアップデート
HansRobo Jan 10, 2025
2e722f2
style(pre-commit): autofix
pre-commit-ci[bot] Jan 10, 2025
65c6e45
CHASE_BALLを削除
HansRobo Jan 10, 2025
733b2f3
AROUND_BALLとKICKを統合してAROUND_BALL_AND_KICKに
HansRobo Jan 10, 2025
7d82c2a
ロボット重複のエラーメッセージを充実させる
HansRobo Jan 10, 2025
1904d2d
うるさいデバッグメッセージを削除
HansRobo Jan 10, 2025
3d24bb7
Attackerが不正なIDを選択することがあるバグを修正
HansRobo Jan 10, 2025
bc9fff1
デバッグメッセージ
HansRobo Jan 10, 2025
d773b87
style(pre-commit): autofix
pre-commit-ci[bot] Jan 10, 2025
3f87c3b
デバッグメッセージ
HansRobo Jan 11, 2025
8ce0c22
style(pre-commit): autofix
pre-commit-ci[bot] Jan 11, 2025
ace28e6
Merge branch 'develop' into improve_ball_around
HansRobo Jan 11, 2025
76d6e87
Merge remote-tracking branch 'origin/develop' into improve_ball_around
HansRobo Jan 11, 2025
b357d9b
Merge remote-tracking branch 'origin/develop' into improve_ball_around
HansRobo Jan 11, 2025
88b04e0
可視化
HansRobo Jan 11, 2025
befb4b5
ロボットの角度を基準にするのをやめて安定化
HansRobo Jan 11, 2025
051aace
style(pre-commit): autofix
pre-commit-ci[bot] Jan 11, 2025
00a2bbc
Merge remote-tracking branch 'origin/develop' into improve_ball_around
HansRobo Jan 11, 2025
4ef737c
各dockerフォルダにconfigをシンボリックリンクでv共有
HansRobo Jan 11, 2025
556956b
Merge remote-tracking branch 'origin/fix/docker' into improve_ball_ar…
HansRobo Jan 11, 2025
154bbe9
Merge branch 'develop' into improve_ball_around
HansRobo Jan 12, 2025
72bc823
Merge branch 'develop' into improve_ball_around
HansRobo Jan 13, 2025
f485f94
Merge branch 'develop' into improve_ball_around
HansRobo Jan 15, 2025
8ef8d87
Merge branch 'develop' into improve_ball_around
HansRobo Jan 15, 2025
6b11e16
Merge branch 'develop' into improve_ball_around
HansRobo Jan 16, 2025
54ea7ca
Merge branch 'develop' into improve_ball_around
HansRobo Jan 16, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion crane_robot_skills/include/crane_robot_skills/kick.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ namespace crane::skills
{
enum class KickState {
ENTRY_POINT,
CHASE_BALL,
AROUND_BALL_AND_KICK,
REDIRECT_KICK,
POSITIVE_REDIRECT_KICK,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@ class AttackerSkillPlanner : public PlannerBase
3, "red", 0.5, "");
}
auto status = skill->run();
if (skill->getID() != robots.front().robot_id) {
std::stringstream ss;
ss << "スキルのIDは" << static_cast<int>(skill->getID())
<< "ですが、選択されたロボットのIDは" << static_cast<int>(robots.front().robot_id)
<< "です。";
ss << "スキルのStateは" << magic_enum::enum_name(skill->getCurrentState()) << "です。";
std::cout << ss.str() << std::endl;
}
return {static_cast<PlannerBase::Status>(status), {skill->getRobotCommand()}};
}
}
Expand Down
Loading