search

utra-robosoccer / soccer-embedded

Collection of embedded programs for an autonomous humanoid soccer robot
http://utrahumanoid.ca
32 stars 8 forks source link

Hannah sherry omnibot #166

Closed sherrychen127 closed 5 years ago

sherrychen127 commented 5 years ago

Added camera joint angle control (omnibot_control) and modified the motor ID (motor_test)

tygamvrelis commented 5 years ago

@sherrychen127 @han210 I think it looks good. Please resolve the merge conflicts and add labels to this pull request, then I will approve it

rfairley commented 5 years ago

Looks good. Just one nit is the language settings file somehow got in. Feel free to try git rm --cached Robot/.settings/language.settings.xml, which will remove the file from git but keep it on the disk, then commit that change and push here. We can do that later too though, that doesn't have to be done in this PR (so I'm fine merging this as it is)

tygamvrelis commented 5 years ago

@han210 @sherrychen127 Try to remove the language settings file like @rfairley said, then add labels to this PR and I think we're good to go.