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

Integration #32

Merged
merged 169 commits into from
Apr 28, 2020
Merged

Integration #32

merged 169 commits into from
Apr 28, 2020

Conversation

fjulian
Copy link
Member

@fjulian fjulian commented Jan 20, 2020

Let's get this branch into a mergable state, before it grows out of control...

After this, we can look into making this run on Panda as well.

kekeblom and others added 30 commits January 6, 2020 18:43
@kekeblom
Scaffold dynamic buttons
55a859d
@kekeblom
Messages, get scene cloud, publish message for instance labels
3dfdc64
@kekeblom
Recover semantic button panel
713221c
@kekeblom
Semantic grasp selection action
b769cd4
@kekeblom
Hook up semantic grasping to fetch commander script
f024e08
@kekeblom
Use scipy.spatial.transform for quaternions
492648f
@kekeblom
Depend on vpp_msgs package instead of voxblox++
b9abc4a
@fjulian
Minor typo
5414ab1
@kekeblom
Generate messages before compiling rviz plugin
93d90bb
@kekeblom
Return from sequential run script if grasp planning fails
890a8fd
@kekeblom
Remove no longer needed service files
ef310d0
@kekeblom
Forgotten class inheritance
949115d
@kekeblom
Refactor playbooks into roles
69335e9
@mobmi
Added separate config files for Yumi
b558bfe
@mobmi
Added dependencies to package.xml
bd03c01
@kekeblom
add gpd and gpd_ros as submodules
63098fc
@kekeblom
Install gpd as part of moma ansible task
632348c
@kekeblom
Ignore ansible retry files
a405ae8
@kekeblom
Merge branch 'master' into semantic-grasping
c74ea62
@kekeblom
Update README.md to reflect changes in ansible scripts
603fa8f
@kekeblom
Setup yumi task
11a6255
@margaritaG
Launch Voxblox++
79df2dc
@mobmi
Merge remote-tracking branch 'origin/master' into yumi-grasp-demo
6f5a90e
@fjulian
Improved ssh commands to launch remote nodes
8b21f46
@kekeblom
Install system and python dependencies in moma ansible role
d91f183
@fjulian
Turn visualization off
83d817b
@mobmi
Checked out earlier release of the ridgeback repo
136e4f8
@mobmi
Added table to Yumi's URDF
19de654
@mobmi
Added option to load base in yumi moveit
1e25c6e
@fjulian
added yumi code as submodule
651f1df
@fjulian
Copy link
Member Author

fjulian commented Jan 28, 2020

How would y'all feel if we renamed the moma_demos directory to simply demos?

TBH, I like that the part before the _ gives away what arm/base combination this applies to. But then, no robot name before the _ could also just imply "moma", i.e. any arm on any base. So I can live with either option.

fjulian and others added 25 commits February 25, 2020 16:07
@fjulian
Added argument to select either Maplab or AMCL localization.
5c1143a
@fjulian
Moved old maps to "retired" folder.
9eca623
@fjulian
Deleted old maps
01c9cc7
@fjulian
Unified voxblox++ scan and simple pointcloud-stitching scan
a7401f0 
Testing required
@fjulian
Read based frame depending on which robot is used
5c4ba76
@fjulian
Minor changes
381e56a
@fjulian
Added separate config files for panda and yumi in fetch demo
854ea5c
@fjulian
Fetch demo launch files robot agnostic
aa7ced3
@fjulian
Switched to using our transform class
2fbb9c2
@fjulian
Made search node arm agnostic
625901e
@fjulian
Add argument when calling search node. Remove unused params.
ad2cc4d
@fjulian
Made grasp action robot arm agnostic
d7cba77
@fjulian
Moved parameters to where they make more sense
7b16df7
@fjulian
Made drop node arm agnostic
05e70db
@fjulian
Made drop_move node robot arm agnostic
0173d20
@fjulian
Only correct position if working with yumi
87aed8c
@aslpanda
Various bug fixes
c6b4db4
@aslpanda
Minor
8959b5b
@aslpanda
Various changes to make grasp_demo work on panda
ae2e3ad
@fjulian
Updated rviz config
7b35da6
@fjulian
rosmon to deps
3ab699d
@fjulian
Attempt to launch ridgeback nodes in namespace, to avoid robot_descri…
d157d11 
…ption clashes

Needs testing
@fjulian
Revert this, didn't work
e453e49
@fjulian
Added some instructions and updated dependencies
342d1cc
@fjulian
GPD config files are now completed with absolute paths at compile time
6369ea6
mbreyer
mbreyer approved these changes Apr 28, 2020
View reviewed changes
Copy link
Contributor

@mbreyer mbreyer left a comment

Choose a reason for hiding this comment

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

lgtm

@mbreyer mbreyer merged commit db9acb6 into master Apr 28, 2020
@mbreyer mbreyer deleted the integration branch April 28, 2020 07:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kekeblom kekeblom kekeblom left review comments

@mbreyer mbreyer mbreyer approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@fjulian @mbreyer @kekeblom @mobmi @margaritaG @smauq @aslpanda