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.

Sign up for GitHub

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

Jump to bottom

close #KLI-217 スマートキャリー実装 #44

Merged
merged 41 commits into from
Nov 7, 2024
Merged

close #KLI-217 スマートキャリー実装 #44

merged 41 commits into from
Nov 7, 2024

Conversation

CHIHAYATAKU
Copy link
Collaborator

チェックリスト

  • clang-format している
  • コーディング規約に準じている
  • チケットの完了条件を満たしている

変更点

  • コマンドcsvファイルに地区大会時点の内容を反映
  • 角度補正回頭を色を指定できるように拡張
    • front_camera/Makefileのcorrection-angleコマンドのオプションで色を受け取るように変更
    • front_camera/front_camera/yellow_rectangle_detector.pyをfront_camera/front_camera/color_rectangle_detector.pyに変更し、他の色に対応できるように変更
  • その他、color_rectangle_detector.pyに対応するように処理を変更
    • module/MotionParser.cpp
    • module/Motion/CorrectingRotation.h
    • module/Motion/CorrectingRotation.cpp
    • module/Motion/AreaBCameraAction.h
    • module/Motion/AreaBCameraAction.cpp
    • front_camera/front_camera/get_correction_angle.py
    • front_camera/front_camera/frame_timing_calculator.py
  • test/AreaMasterTest.cppのスマートキャリーRunのテストで、シェルからコマンド実行するとその先のテストに進めないため、一旦コメントアウト

動作テスト

https://www.notion.so/uom-katlab/126dd5b1cc1880ba9491dc65ced36c9e?pvs=4#131dd5b1cc18806fb4dcf0a0eeb10691

添付資料

https://www.notion.so/uom-katlab/126dd5b1cc1880ba9491dc65ced36c9e?pvs=4

CHIHAYATAKU and others added 30 commits September 18, 2024 08:08
@CHIHAYATAKU
update: ライントレース、ダブルループ調整
979b933
@takahashitom
update: 物体検出に失敗した時の処理を変更
0b4fe21
@takahashitom
fix: char型の定義を修正
fc7cd11
@CHIHAYATAKU
Merge branch 'ticket-KLI-200' of https://github.com/KatLab-MiyazakiUn…
a8e77b2 
…iv/etrobocon2024 into adjustment1-after-0919
@CHIHAYATAKU
update: 調整0919_1436
6aa6841
@CHIHAYATAKU
update: ダブルループ調整_0919_1736
d26cd10
@CHIHAYATAKU
update: 全体調整_0919_2218
43b245d
@CHIHAYATAKU
update: 全体調整_0920_1927
3cb8d61
@YKhm20020
add: Rコースでの動きがLコースと変わるため、ゴール直帰のCSVファイルをRコース用に追加
334e7d1
@takahashitom
add: DoubleLoopRightEnd.csvの追加
35af6b5
@aridome222
add: DoubleLoopRightFirst_0.csv
0118877
@takahashitom
add: DoubleLoopRightEnd_5.csvを追加
f321826
@aridome222
add: DoubleLoopRightFirst_1.csv
540965d
@takahashitom
add: DoubleLoopRightEnd_4.csvを追加
67d3a2a
@aridome222
add, update: DoubleLoopRightFirst_2.csv, DoubleLoopRightFirst_1.csv
080e3b4
@takahashitom
add: DoubleLoopRightFirst_3.csvを追加
600bdfe
@aridome222
add: DoubleLoopRightFirst.csv
4a1dad9
@aridome222
update: DoubleLoopRightFirst.csv
0ab9d9f
@takahashitom
fix: correctionAngleを初期化するように調整
cb0ad5a
@CHIHAYATAKU
update: 補正回頭を他の色でも対応できるように拡張
79a2d99
@CHIHAYATAKU
update: 角度補正を黄色以外でも出来るように修正
5d72b61
@CHIHAYATAKU
fix: 文字化けを防ぐため、色にはCOLORを使うように修正
a2476e3
@CHIHAYATAKU
refactor: コメントの追加および不要な行の削除
24a8e3e
@CHIHAYATAKU
update: 赤のマスクを低色相と高色相の二つを付ける
ebd8020
@CHIHAYATAKU
update: 赤補正回頭が出来るように、閾値の調整
5adbec9
@CHIHAYATAKU
update: デブリを抜けるためのコマンド処理作成
4b71f6f
@CHIHAYATAKU
update: スマートキャリー攻略のためのコマンド処理作成
b5ed52a
@CHIHAYATAKU
update: 地区大会時のcsvコマンドファイルをマージ
4e482bb
@CHIHAYATAKU
update: SmartCarryのエリアマスターを追加
d120c31
@CHIHAYATAKU
refactor: フォーマット
b063b9f
@notion-workspace Notion Workspace
Copy link

スマートキャリー実装

YKhm20020
YKhm20020 requested changes Nov 3, 2024
View reviewed changes
Copy link
Collaborator

@YKhm20020 YKhm20020 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

レビュー遅くなりました、すみません🙇‍♂️
いくつか見ていただきたいところがあるので、お願いします🙏

front_camera/front_camera/color_rectangle_detector.py Show resolved Hide resolved
front_camera/front_camera/color_rectangle_detector.py Outdated Show resolved Hide resolved
front_camera/front_camera/color_rectangle_detector.py Show resolved Hide resolved
keiya121
keiya121 requested changes Nov 5, 2024
View reviewed changes
front_camera/front_camera/frame_timing_calculator.py Outdated Show resolved Hide resolved
front_camera/work/RasPike Outdated Show resolved Hide resolved
work/RasPike Outdated Show resolved Hide resolved
keiya121
keiya121 requested changes Nov 5, 2024
View reviewed changes
module/Motion/CorrectingRotation.cpp Outdated Show resolved Hide resolved
bizyutyu
bizyutyu requested changes Nov 5, 2024
View reviewed changes
Copy link
Collaborator

@bizyutyu bizyutyu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

よろしくお願いします。

front_camera/front_camera/get_correction_angle.py Outdated Show resolved Hide resolved
front_camera/front_camera/color_rectangle_detector.py Outdated Show resolved Hide resolved
front_camera/front_camera/get_correction_angle.py Outdated Show resolved Hide resolved
front_camera/front_camera/frame_timing_calculator.py Outdated Show resolved Hide resolved
module/Motion/CorrectingRotation.h Outdated Show resolved Hide resolved
front_camera/front_camera/get_correction_angle.py Show resolved Hide resolved
front_camera/front_camera/get_correction_angle.py Show resolved Hide resolved
bizyutyu
bizyutyu requested changes Nov 5, 2024
View reviewed changes
Copy link
Collaborator

@bizyutyu bizyutyu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

少し追加です。
カスタムエラー関連の変更点については、やらなくても大丈夫です。

front_camera/front_camera/get_correction_angle.py Show resolved Hide resolved
YKhm20020
YKhm20020 approved these changes Nov 6, 2024
View reviewed changes
Copy link
Collaborator

@YKhm20020 YKhm20020 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

自分が聞いたところは全部答えてもらえたので、先にLGTM出しておきます！
214057

keiya121
keiya121 approved these changes Nov 6, 2024
View reviewed changes
Copy link
Collaborator

@keiya121 keiya121 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gitignoreにまで入れていただいてありがとうございます

LGTM

bizyutyu
bizyutyu approved these changes Nov 6, 2024
View reviewed changes
Copy link
Collaborator

@bizyutyu bizyutyu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
LGTM

@YKhm20020 YKhm20020 merged commit ada420a into main Nov 7, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@takahashitom takahashitom takahashitom left review comments

@keiya121 keiya121 keiya121 approved these changes

@YKhm20020 YKhm20020 YKhm20020 approved these changes

@bizyutyu bizyutyu bizyutyu approved these changes

Assignees

@CHIHAYATAKU CHIHAYATAKU

@takahashitom takahashitom

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@CHIHAYATAKU @keiya121 @YKhm20020 @bizyutyu @takahashitom @aridome222