Code

Docking 2024#1313

Code

Open

andrew-aj wants to merge 39 commits intomasteruf-mil/mil:masterfrom docking_2024uf-mil/mil:docking_2024Copy head branch name to clipboard

+3,602-210

Commits

Commits on Sep 5, 2024

• simple square detection with aspect ratio

  AlexanderWangY

  committed
  7a28791

  Copy full SHA for 7a28791

• Merge pull request #1270 from uf-mil/alex_dock_dev

  Show description for a26b723
  AlexanderWangY

  authored
  a26b723

  Copy full SHA for a26b723

• moved docking mission over from 2022

  andrew-aj

  committed
  b125537

  Copy full SHA for b125537

Commits on Sep 9, 2024

• Merge remote-tracking branch 'origin/dock_color_detection' into docking_2024

  andrew-aj

  committed
  faee33d

  Copy full SHA for faee33d

• added more comments

  andrew-aj

  committed
  31f9025

  Copy full SHA for 31f9025

Commits on Sep 12, 2024

• added old stuff and fixed topic names

  andrew-aj

  committed
  0d454d2

  Copy full SHA for 0d454d2

• fixed poi

  andrew-aj

  committed
  fb27d8a

  Copy full SHA for fb27d8a

Commits on Sep 13, 2024

• fixed docking so it now moves

  andrew-aj

  committed
  84a8ab3

  Copy full SHA for 84a8ab3

• Doing some debug printinh

  Josht8601

  committed
  06fa82e

  Copy full SHA for 06fa82e

Commits on Sep 15, 2024

• adding methods for square detection

  AlexanderWangY

  committed
  8af7791

  Copy full SHA for 8af7791

Commits on Sep 20, 2024

• Added rudimentary implementation of find_color(). Successfully determines dock color sometimes.

  willzoo

  committed
  16c3e23

  Copy full SHA for 16c3e23

• Merge branch 'docking_2024' of https://github.com/uf-mil/mil into docking_2024

  willzoo

  committed
  70f9c77

  Copy full SHA for 70f9c77

• Added way to check for a color and move to it

  

  Keith Khadar

  committed
  c91e7c2

  Copy full SHA for c91e7c2

Commits on Sep 25, 2024

• Getting cluster from lidar now loops for user input (temporary solution). Press e if the image-lidar transformation is correct to move on to find_color()

  willzoo

  committed
  c80ae23

  Copy full SHA for c80ae23

• Repeatedly gets LIDAR points for docking bays until a correct image shape is found with a one color majority in each picture

  danushsingla

  committed
  8b90628

  Copy full SHA for 8b90628

Commits on Sep 26, 2024

• Now it autonomously finds the color of the dock, and moves to the dock with the matching color. However, the boat sits there for ~30 seconds trying to get a correct LIDAR to Image mapping.

  willzoo

  committed
  3957654

  Copy full SHA for 3957654

Commits on Oct 8, 2024

• Added basic square detection after finding colors and docking. Still needs some improvement in the event that it cannot find exactly three squares.

  danushsingla

  committed
  eade720

  Copy full SHA for eade720

Commits on Oct 9, 2024

• Fixed errors in shoot projectile funciton (call location, and cv to cv2 rename)

  willzoo

  committed
  cabac6f

  Copy full SHA for cabac6f

Commits on Oct 11, 2024

• Added vision pipeline file and section for it to go in docking.py

  aaliao

  committed
  0347312

  Copy full SHA for 0347312

Commits on Oct 14, 2024

• Cherry pick first commit from 2024-task6-testworld

  willzoo

  committed
  9cc6ac7

  Copy full SHA for 9cc6ac7

• scan dock fling world name change

  

  maxhv1

  authored and

  willzoo

  committed
  54d001a

  Copy full SHA for 54d001a

• pulled my files out of VRX submodule, now moved into navigator_gazebo

  

  maxhv1

  authored and

  willzoo

  committed
  af860aa

  Copy full SHA for af860aa

• Merge branch 'docking_2024' of https://github.com/uf-mil/mil into docking_2024

  willzoo

  committed
  68d5248

  Copy full SHA for 68d5248

Commits on Oct 22, 2024

• Andrew's rocking issue fix

  danushsingla

  committed
  5201f9a

  Copy full SHA for 5201f9a

• Changed poi in config file to match position of dock in Max's world

  willzoo

  committed
  b859516

  Copy full SHA for b859516

• Merge branch 'docking_2024' of https://github.com/uf-mil/mil into docking_2024

  willzoo

  committed
  7624943

  Copy full SHA for 7624943

Commits on Oct 23, 2024

• Increased offset of docking and takes a picture before shooting the ball (uses fresh image)

  danushsingla

  committed
  8cdefa5

  Copy full SHA for 8cdefa5

• Merge branch 'docking_2024' of https://github.com/uf-mil/mil into docking_2024

  danushsingla

  committed
  33a9e57

  Copy full SHA for 33a9e57

• verified pipeline, just need to add to docking.py

  aaliao

  committed
  050575e

  Copy full SHA for 050575e

Commits on Oct 28, 2024

• Changed dock position and attempted to fix lidar cropping issue

  willzoo

  committed
  d907771

  Copy full SHA for d907771

Commits on Oct 29, 2024

• Commented out move to poi because its unreliable. Set the wamv pose to -501 x and 186 y before running docking mission from now on.

  willzoo

  committed
  2ce1347

  Copy full SHA for 2ce1347

Commits on Nov 1, 2024

• Added anthony's change and clarified comments for RobotX 2024

  willzoo

  committed
  04c440a

  Copy full SHA for 04c440a

Commits on Nov 3, 2024

• Added some more clarifying comments

  willzoo

  committed
  37c9611

  Copy full SHA for 37c9611

Commits on Nov 8, 2024

• tuned docking

  andrew-aj

  committed
  436ac75

  Copy full SHA for 436ac75

• Merge branch 'master' into docking_2024

  andrew-aj

  committed
  d04d55d

  Copy full SHA for d04d55d

• switched out ball launcher service

  andrew-aj

  committed
  778e975

  Copy full SHA for 778e975

• fixed merge conflicts

  andrew-aj

  committed
  dba1b09

  Copy full SHA for dba1b09

• removed service shutdown

  andrew-aj

  committed
  5ccc8d4

  Copy full SHA for 5ccc8d4

Commits on Nov 9, 2024

• Merge branch 'master' of github.com:uf-mil/mil into docking_2024

  andrew-aj

  committed
  c70a2d2

  Copy full SHA for c70a2d2