CCNYRoboticsLab / phidgets_drivers

phidgets_drivers
6 stars 15 forks source link

Catkinised phidgets_drivers metapackage (take 2) #6

Closed mintar closed 10 years ago

mintar commented 10 years ago

This is the same pull request as #5, only with the history somewhat cleaned up. We haven't had time to test this on our hardware yet, so please wait a little before merging this.

Some things which are a little confusing at the moment:

What I'd like to have in the end:

What I've done in this pull request to do achieve that:

What still needs to be done after merging:

git checkout hydro
git merge groovy
git push
mintar commented 10 years ago

Ok, I've tested this with our Phidgets Spatial 3/3/3 1044 on both Groovy and Hydro, and it runs without problems. Good work! I think you can merge this.

muhrix commented 10 years ago

Great! Thank for testing!

mintar commented 10 years ago

Great! Now, could you also do the following (assuming you have ccny-ros-pkg/phidgets_drivers checked out as remote 'origin'):

git checkout -b hydro origin/hydro
git merge origin/groovy
git push