7 Commits

Author SHA1 Message Date
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