7 Commits

Author SHA1 Message Date
c37c55cdac Finished SOArm100 movement logic. Need to get the jaw working 2025-04-11 17:20:51 -06:00
2a2517bd79 Rebasing from main 2025-04-10 13:46:14 -06:00
8b904426a9 More changes for SOArm100
More merge conflicts
2025-04-10 13:46:07 -06:00
91845521dd Pick and place logic
More merge conflicts.
2025-04-10 13:45:53 -06:00
9f7023cfd5 Workspace.xml changes
re merge conflicts.
2025-04-10 13:20:29 -06:00
4e1c6bf590 Finished SOArm100 UI
More merge conflicts. Taking main changes
2025-04-10 13:20:27 -06:00
60aaea751f Finished fixing merge conflicts and touched up camera settings.
More merge conflicts. Taking main changes then will integrate mine.
2025-04-10 13:20:26 -06:00