Fix cup uprighting auto execution - #48
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
변경 내용
기존 side grasp flow와 optimized cup-uprighting flow를 직접 수정하지 않고, 컵 상태에 따라 자동으로 적절한 flow를 선택하는
auto_cup_flow_router를 추가했습니다.라우터는 observe 위치 이동 후 RG2 gripper를 open하고, YOLO perception과
cup_classifier_best.pthResNet18 classifier를 사용해 컵이 upright인지 lying인지 판별합니다./azas/cup_detectionstatus가detected:upright...이면 기존 side grasp launch를auto_pick:=true로 실행하고,rejected:lying...이면 기존 optimized cup-uprighting launch를auto_pick:=true로 실행합니다.분류 오차를 줄이기 위해 단일 프레임이 아니라 동일 route가 여러 샘플과 안정 시간 동안 유지될 때만 확정하도록 했습니다. 또한 분류 확인용 OpenCV overlay를 추가해 bbox, 중심점, orientation, classifier confidence, 선택 route를 화면에서 확인할 수 있게 했습니다.
추가로 cup-uprighting 노드에 남아 있던 문법 오류(
诚然:)를finally:로 수정해 노드가 import 단계에서 죽지 않도록 했고,auto_pick + exit_after_pick흐름이 정상 종료 판단을 할 수 있도록 pick 성공/실패 값을 반환하게 보강했습니다.변경 타입
관련 이슈
Refs: #
테스트 방법