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

Jump to bottom

Click ik #673

Open
wants to merge 75 commits into
base: integration
Choose a base branch
from
Open

Click ik #673

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
9d5c131
Add initial click ik node
qhdwight Feb 13, 2024
b81546f
Add action
qhdwight Feb 13, 2024
c65b102
Save point cloud, create IK publisher
Depicar Feb 14, 2024
1771f20
Add plugin files so the nodelet can get loaded
qhdwight Feb 14, 2024
b63073f
Initialize action server
Depicar Feb 15, 2024
1278bcf
Add action client script
Depicar Feb 16, 2024
be76d77
working on limits
Crypt1cG Feb 18, 2024
c5abcbe
Merge branch 'click-ik' of github.com:umrover/mrover-ros into click-ik
Crypt1cG Feb 18, 2024
f04aebc
added arm_targeet to tf tree
Crypt1cG Feb 18, 2024
43e7d2b
worked on stuff
Crypt1cG Feb 18, 2024
92495b7
Start work on click ik action server
RobbieGM Feb 16, 2024
70f22ba
Fix some limits and rename stuff in arm_controller.cpp
RobbieGM Feb 20, 2024
659318d
server client
Depicar Feb 22, 2024
24cea9e
fixed compile bug
Depicar Feb 22, 2024
16aece7
click ik action server
RobbieGM Feb 23, 2024
1f12603
fixed ik
Crypt1cG Feb 23, 2024
2ad8859
Merge branch 'click-ik' of github.com:umrover/mrover-ros into click-ik
Crypt1cG Feb 23, 2024
0053863
Merge remote-tracking branch 'origin/integration' into click-ik
qhdwight Feb 23, 2024
aa9c2f3
Minor updateS
qhdwight Feb 23, 2024
831f547
updated comment
MarshallVielmetti Mar 6, 2024
ad58d09
added spiral search
MarshallVielmetti Mar 6, 2024
e2a4bb8
fixing poitncloud callback
MarshallVielmetti Mar 6, 2024
61448fa
cleaned up arm controller a bit
Crypt1cG Mar 6, 2024
46476c5
Merge branch 'click-ik' of github.com:umrover/mrover-ros into click-ik
Crypt1cG Mar 6, 2024
450c73d
worked on click ik transformations
Crypt1cG Mar 6, 2024
2acf605
Added action server client
Depicar Mar 7, 2024
f784620
Published IK from action client
Depicar Mar 8, 2024
28b409e
Merge remote-tracking branch 'origin/integration' into click-ik
qhdwight Mar 8, 2024
1f2a4a2
More stable so3d creation
qhdwight Mar 8, 2024
d54d366
Actually more stable
qhdwight Mar 8, 2024
912260a
Sensible default
qhdwight Mar 8, 2024
111ce92
merge
Crypt1cG Mar 10, 2024
786ae17
removed ros param
MarshallVielmetti Mar 10, 2024
0e57d8f
changed ik to use stamped pose
MarshallVielmetti Mar 10, 2024
7424cca
added static transforms
MarshallVielmetti Mar 10, 2024
726bac7
fixed broadcast rate
MarshallVielmetti Mar 10, 2024
88bb2e7
refactored arm ik to use less magic numbers
Crypt1cG Mar 10, 2024
09a3cf6
worked on click_ik
Crypt1cG Mar 13, 2024
1cfad33
Add event handler for clicking within a camera stream, implementation…
jnnanni Mar 17, 2024
c20aec9
added motor timeout to sim
Crypt1cG Mar 17, 2024
0b71a1e
Click IK periodic publishing to arm IK, update consumers.py for click IK
RobbieGM Mar 17, 2024
8e62a1d
fixed click_ik issues
Crypt1cG Mar 19, 2024
895873a
publish feedback
Depicar Mar 19, 2024
fa5e543
Merge branch 'click-ik' of github.com:umrover/mrover-ros into jnn/cli…
jnnanni Mar 19, 2024
c98f2df
Add frontend handlers for click ik, remove capacity and set to always…
jnnanni Mar 20, 2024
1ef02ff
Merge branch 'click-ik' into jnn/click-ik
alisonryckman Mar 21, 2024
44529c4
Merge branch 'jnn/click-ik' of github.com:umrover/mrover-ros into jnn…
alisonryckman Mar 21, 2024
1d6a9e6
Fix consumers.py click ik
RobbieGM Mar 21, 2024
02eb0ad
frontend video fixes
alisonryckman Mar 22, 2024
ed5c6a2
switch arm base frame and static transform error debugging
alisonryckman Mar 22, 2024
15fa58e
Merge branch 'jnn/click-ik' into click-ik
alisonryckman Mar 22, 2024
94e141b
modify simulator ik base link
alisonryckman Mar 22, 2024
30e1da8
add click ik feedback in consumers.py
RobbieGM Mar 24, 2024
b9eda52
Set up different camera feed types for each GUI
jnnanni Mar 24, 2024
91f0283
Merge branch 'integration' of github.com:umrover/mrover-ros into jnn/…
jnnanni Mar 24, 2024
99987cb
Merge branch 'integration' of github.com:umrover/mrover-ros into jnn/…
jnnanni Mar 24, 2024
1b39363
Set up camera feed types with new camera code
jnnanni Mar 24, 2024
8dee4a8
Merge branch 'jnn/click-ik' of github.com:umrover/mrover-ros into jnn…
jnnanni Mar 24, 2024
c3b98c9
Moved a lot of CameraInfo stuff to Cameras and CameraDisplay
sshapin Mar 27, 2024
1d688a2
added arm controller status publishing
Crypt1cG Mar 28, 2024
f8d3827
merge integration
alisonryckman Apr 2, 2024
fc60c93
fix arm controller limits
alisonryckman Apr 2, 2024
c7a277c
womp womp
alisonryckman Apr 2, 2024
2a6126b
Auton cameras working, CameraInfo now fully unnecessary
sshapin Apr 3, 2024
4e03cdd
fixed camera stream and click_ik
Crypt1cG Apr 9, 2024
670075e
click ik error handling
RobbieGM Apr 14, 2024
51f27be
merged integration
neuenfeldttj Apr 18, 2024
f261b3f
merged jnn/click-ik
neuenfeldttj Apr 18, 2024
c9accdc
format
neuenfeldttj Apr 18, 2024
b024fda
fixed integration merge
neuenfeldttj Apr 19, 2024
a294c1e
Merge remote-tracking branch 'origin/integration' into click-ik
qhdwight Apr 19, 2024
ee5b60b
Merge remote-tracking branch 'origin/integration' into click-ik
qhdwight Apr 19, 2024
5d02939
Make simulator achieve 120hz instead of dropping frames to be more de…
qhdwight Apr 19, 2024
822230e
Merge remote-tracking branch 'origin/integration' into click-ik
qhdwight Apr 19, 2024
5db85b6
Merge remote-tracking branch 'origin/integration' into click-ik
qhdwight Apr 19, 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
8 changes: 0 additions & 8 deletions src/teleoperation/frontend/src/components/CameraFeed.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,6 @@ export default defineComponent({
},

mounted: function () {
this.$nextTick(() => {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try to use git add -p so you don't accidentally commit stuff

const canvas: HTMLCanvasElement = document.getElementById(
'canvas' + this.id
) as HTMLCanvasElement
const context = canvas.getContext('2d') ?? new CanvasRenderingContext2D()
context.fillStyle = 'black'
context.fillRect(0, 0, canvas.width, canvas.height)
}),
this.startStream(this.id)
},
methods: {
Expand Down
2 changes: 1 addition & 1 deletion urdf/rover/rover.urdf.xacro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
<link name ="arm_base_link"/>

<joint name="base_link_to_arm_base_link" type="fixed">
<origin xyz="0.199228 0.200235 0.540196" />
<origin xyz="0.199228 -0.200235 0.540196" />
<parent link="base_link" />
<child link="arm_base_link" />
</joint>
Expand Down