|
|
df33be67be
|
Merge branch 'bg_add_armandpathfinding' of https://luckyrobots.com/luckyrobots/luckyworld into bg_add_armandpathfinding
|
2025-04-15 10:52:59 -06:00 |
|
|
|
d4725e3fbf
|
Prepping for rebase
|
2025-04-15 10:10:51 -06:00 |
|
|
|
f1240f01ed
|
Jaw and physics pick and place
|
2025-04-14 18:29:27 -06:00 |
|
|
|
d1a3147844
|
Preparing to rebase
|
2025-04-14 11:55:14 -06:00 |
|
|
|
461eb2e9c1
|
Finished SOArm100 movement logic. Need to get the jaw working
|
2025-04-14 11:55:02 -06:00 |
|
|
|
53289dde0c
|
Rebasing from main
|
2025-04-14 11:54:20 -06:00 |
|
|
|
89cf2787ad
|
More changes for SOArm100
More merge conflicts
|
2025-04-14 11:53:52 -06:00 |
|
|
|
3b8afbb1d5
|
Pick and place logic
More merge conflicts.
|
2025-04-14 11:51:37 -06:00 |
|
|
|
77813cc455
|
Workspace.xml changes
re merge conflicts.
|
2025-04-14 11:51:07 -06:00 |
|
|
|
bdb28f8a85
|
Finished SOArm100 UI
More merge conflicts. Taking main changes
|
2025-04-14 11:50:58 -06:00 |
|
|
|
3e39a34a7a
|
Finished fixing merge conflicts and touched up camera settings.
More merge conflicts. Taking main changes then will integrate mine.
|
2025-04-14 11:49:18 -06:00 |
|
