search

uw-biorobotics / raven2

Raven II Surgical Robot
http://brl.ee.washington.edu/
GNU Lesser General Public License v3.0
47 stars 38 forks source link

Patches to catkinize and clean up #22

Closed kschwan closed 6 years ago

kschwan commented 6 years ago

Patches to catkinize and clean up

kschwan commented 6 years ago

I added a number of additional "cleaning-up" patches which I think should go in

awlewi commented 6 years ago

Hi Kim, I've finally got a robot and some time to look this over. I've got a merge conflict with the gitignore. Can you briefly explain the changes?

awlewi commented 6 years ago

Hi Kim, so far so good (after turning both power switches on). My robot has initialized and sinusoided. I'll try to teleop with it tomorrow and should have it approved soon after!

kschwan commented 6 years ago

Hi Kim, so far so good (after turning both power switches on). My robot has initialized and sinusoided. I'll try to teleop with it tomorrow and should have it approved soon after!

Sounds great :)

I've got a merge conflict with the gitignore. Can you briefly explain the changes?

Maybe you are trying to merge into "master"? I based these changes on the "test" branch. 716730d (on master) also has a change to gitignore, which I'm guessing causes the merge conflict. I can rebase on "master" and resolve the conflict if you want, or we can leave it as it is to merge into "test".

I removed most of the gitignore entries because with catkin you have an entirely out-of-source build, so the build artifacts should never end up in the same directories as the source files anyway.

Edit: I just realise that I might have been a little too fast and deleted gitignore entries for Eclipse project files. I suppose they should have stayed in. I will re-add them right away.

awlewi commented 6 years ago

Teleop was successful. Thanks for working on this, Kim! You've just completed the first community pull request for the RAVEN code! Here's to many more :)

blake5634 commented 6 years ago

Awesome! Blake

On Fri, Mar 9, 2018 at 1:32 PM, Andy notifications@github.com wrote:

Teleop was successful. Thanks for working on this, Kim! You've just completed the first community pull request for the RAVEN code! Here's to many more :)

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/uw-biorobotics/raven2/pull/22#issuecomment-371951124, or mute the thread https://github.com/notifications/unsubscribe-auth/AGN3SejgaPpqLDHTMk4qqq0gDU5q1oprks5tcvTwgaJpZM4QyYDC .

-- Blake Hannaford

kschwan commented 6 years ago

You're welcome. I'm happy if this work can be of use to others. I think I have a lot more changes that may be of interest to you, but we can discuss this elsewhere :)