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

Docking 2024 #1313

Open
wants to merge 39 commits into
base: master
Choose a base branch
from
Open

Docking 2024 #1313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
7a28791
simple square detection with aspect ratio
AlexanderWangY Sep 5, 2024
a26b723
Merge pull request #1270 from uf-mil/alex_dock_dev
AlexanderWangY Sep 5, 2024
b125537
moved docking mission over from 2022
andrew-aj Sep 5, 2024
faee33d
Merge remote-tracking branch 'origin/dock_color_detection' into docki…
andrew-aj Sep 9, 2024
31f9025
added more comments
andrew-aj Sep 9, 2024
0d454d2
added old stuff and fixed topic names
andrew-aj Sep 12, 2024
fb27d8a
fixed poi
andrew-aj Sep 12, 2024
84a8ab3
fixed docking so it now moves
andrew-aj Sep 13, 2024
06fa82e
Doing some debug printinh
Josht8601 Sep 13, 2024
8af7791
adding methods for square detection
AlexanderWangY Sep 15, 2024
16c3e23
Added rudimentary implementation of find_color(). Successfully determ…
willzoo Sep 20, 2024
70f9c77
Merge branch 'docking_2024' of https://github.com/uf-mil/mil into doc…
willzoo Sep 20, 2024
c91e7c2
Added way to check for a color and move to it
Sep 20, 2024
c80ae23
Getting cluster from lidar now loops for user input (temporary soluti…
willzoo Sep 25, 2024
8b90628
Repeatedly gets LIDAR points for docking bays until a correct image s…
danushsingla Sep 25, 2024
3957654
Now it autonomously finds the color of the dock, and moves to the doc…
willzoo Sep 26, 2024
eade720
Added basic square detection after finding colors and docking. Still …
danushsingla Oct 8, 2024
cabac6f
Fixed errors in shoot projectile funciton (call location, and cv to c…
willzoo Oct 9, 2024
0347312
Added vision pipeline file and section for it to go in docking.py
aaliao Oct 11, 2024
9cc6ac7
Cherry pick first commit from 2024-task6-testworld
willzoo Oct 14, 2024
54d001a
scan dock fling world name change
maxhv1 Oct 2, 2024
af860aa
pulled my files out of VRX submodule, now moved into navigator_gazebo
maxhv1 Oct 4, 2024
68d5248
Merge branch 'docking_2024' of https://github.com/uf-mil/mil into doc…
willzoo Oct 14, 2024
5201f9a
Andrew's rocking issue fix
danushsingla Oct 22, 2024
b859516
Changed poi in config file to match position of dock in Max's world
willzoo Oct 22, 2024
7624943
Merge branch 'docking_2024' of https://github.com/uf-mil/mil into doc…
willzoo Oct 22, 2024
8cdefa5
Increased offset of docking and takes a picture before shooting the b…
danushsingla Oct 23, 2024
33a9e57
Merge branch 'docking_2024' of https://github.com/uf-mil/mil into doc…
danushsingla Oct 23, 2024
050575e
verified pipeline, just need to add to docking.py
aaliao Oct 23, 2024
d907771
Changed dock position and attempted to fix lidar cropping issue
willzoo Oct 28, 2024
2ce1347
Commented out move to poi because its unreliable. Set the wamv pose t…
willzoo Oct 29, 2024
04c440a
Added anthony's change and clarified comments for RobotX 2024
willzoo Nov 1, 2024
37c9611
Added some more clarifying comments
willzoo Nov 3, 2024
436ac75
tuned docking
andrew-aj Nov 8, 2024
d04d55d
Merge branch 'master' into docking_2024
andrew-aj Nov 8, 2024
778e975
switched out ball launcher service
andrew-aj Nov 8, 2024
dba1b09
fixed merge conflicts
andrew-aj Nov 8, 2024
5ccc8d4
removed service shutdown
andrew-aj Nov 8, 2024
c70a2d2
Merge branch 'master' of github.com:uf-mil/mil into docking_2024
andrew-aj Nov 9, 2024
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
2 changes: 1 addition & 1 deletion NaviGator/mission_control/navigator_launch/config/poi_sim.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
global_frame: enu
initial_pois:
circle_totems: [26.09821319580078, 59.91523361206055, 0.0]
dock: [108.05, -1.07, 0.0]
dock: [28, 22, 0.0]
entrance_gate: [51.28, -48.69, 0.0]
obstacle_course: [-32.803, -83.41, 0.0]
ring_challenge: [61.271873474121094, 15.894840240478516, 0.0]
Expand Down
2 changes: 1 addition & 1 deletion NaviGator/mission_control/navigator_launch/launch/vrx/vrx_controller.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
izz: 500.58
</rosparam>
</node>
</launch>
</launch>
Loading
Loading