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

Devel #28

Open
wants to merge 29 commits into
base: ascent
Choose a base branch
from
Open

Devel #28

wants to merge 29 commits into from

Commits on Nov 11, 2014

  1. added export xenomai

    @zchen24
    zchen24 committed Nov 11, 2014
    Configuration menu
    Copy the full SHA
    56f42b3 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2014

  1. Merge pull request #3 from zchen24/master 

    added XENOMAI_ROOT_DIR to readme
    @jbohren
    jbohren committed Dec 8, 2014
    Configuration menu
    Copy the full SHA
    bc488c4 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2015

  1. updated wam 40 zero calibration, wrist rotate now calibrated to hard … 

    …stop
    @zchen24
    zchen24 committed Feb 25, 2015
    Configuration menu
    Copy the full SHA
    5061add View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:jhu-lcsr/lcsr_barrett 

    Conflicts:
	config/wam_40.yaml
    @zchen24
    zchen24 committed Feb 25, 2015
    Configuration menu
    Copy the full SHA
    6747d86 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2015

  1. tweaks

    @cpaxton
    cpaxton committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    0416ada View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2015

  1. added color to platform

    @cpaxton
    cpaxton committed Jul 14, 2015
    Configuration menu
    Copy the full SHA
    30fb5e4 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2015

  1. other tweaks to open/close settings for marker

    @cpaxton
    cpaxton committed Jul 15, 2015
    Configuration menu
    Copy the full SHA
    662e20a View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2015

  1. Merge branch 'devel' of github.com:jhu-lcsr/lcsr_barrett into jon_devel

    @cpaxton
    cpaxton committed Aug 19, 2015
    Configuration menu
    Copy the full SHA
    46ad151 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'devel' of github.com:jhu-lcsr/lcsr_barrett into jon_devel

    @cpaxton
    cpaxton committed Aug 19, 2015
    Configuration menu
    Copy the full SHA
    5ad3dda View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2015

  1. fixing gravity precision (to match with gazebo) and decreasing rml d … 

    …gains
    @jbohren
    jbohren committed Aug 31, 2015
    Configuration menu
    Copy the full SHA
    33bec74 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2015

  1. Merge branch 'devel' of github.com:jhu-lcsr/lcsr_barrett into devel

    @jbohren
    jbohren committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    425bd14 View commit details
    Browse the repository at this point in the history

  2. smallening platform

    @jbohren
    jbohren committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    8956769 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2015

  1. reducing d-gains for pid with hand, adding some colors to the environ… 

    …ment
    @jbohren
    jbohren committed Oct 29, 2015
    Configuration menu
    Copy the full SHA
    e4a00a7 View commit details
    Browse the repository at this point in the history

  2. adding platform material

    @jbohren
    jbohren committed Oct 29, 2015
    Configuration menu
    Copy the full SHA
    86612d7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'devel' of github.com:jhu-lcsr/lcsr_barrett into devel

    @jbohren
    jbohren committed Oct 29, 2015
    Configuration menu
    Copy the full SHA
    e7b14b4 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2015

  1. adding queue size arguments

    @cpaxton
    cpaxton committed Nov 19, 2015
    Configuration menu
    Copy the full SHA
    d982649 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'jon_devel' of github.com:cpaxton/lcsr_barrett into devel 

    Conflicts:
	models/manipulation_platform.urdf.xacro
    @cpaxton
    cpaxton committed Nov 19, 2015
    Configuration menu
    Copy the full SHA
    b6e48d5 View commit details
    Browse the repository at this point in the history

  3. adding queue size

    @cpaxton
    cpaxton committed Nov 19, 2015
    Configuration menu
    Copy the full SHA
    9954113 View commit details
    Browse the repository at this point in the history

  4. augmenter off by default

    @cpaxton
    cpaxton committed Nov 19, 2015
    Configuration menu
    Copy the full SHA
    1009159 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #24 from cpaxton/teleop_fixes 

    Teleop fixes
    @cpaxton
    cpaxton committed Nov 19, 2015
    Configuration menu
    Copy the full SHA
    9b00f54 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #25 from cpaxton/jon_devel 

    fixing platform color and marker control
    @cpaxton
    cpaxton committed Nov 19, 2015
    Configuration menu
    Copy the full SHA
    2b479fa View commit details
    Browse the repository at this point in the history

  7. adding gitignore

    @cpaxton
    cpaxton committed Nov 19, 2015
    Configuration menu
    Copy the full SHA
    65537fb View commit details
    Browse the repository at this point in the history

  8. added manipulation platform color

    @cpaxton
    cpaxton committed Nov 19, 2015
    Configuration menu
    Copy the full SHA
    d26cb45 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #26 from cpaxton/teleop_fixes 

    Teleop fixes: color and gitignore
    @cpaxton
    cpaxton committed Nov 19, 2015
    Configuration menu
    Copy the full SHA
    8e73612 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #27 from jhu-lcsr/master 

    syncing devel and master
    @jbohren
    jbohren committed Nov 19, 2015
    Configuration menu
    Copy the full SHA
    ffc0e32 View commit details
    Browse the repository at this point in the history

  11. adding some lua fixes; removing logwarn with twist

    @cpaxton
    cpaxton committed Nov 19, 2015
    Configuration menu
    Copy the full SHA
    1ea2f56 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #30 from cpaxton/lua_fixes 

    adding some lua fixes; removing logwarn with twist
    @cpaxton
    cpaxton committed Nov 19, 2015
    Configuration menu
    Copy the full SHA
    364fd34 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2016

  1. Merge branch 'master' of github.com:jhu-lcsr/lcsr_barrett into devel

    @cpaxton
    cpaxton committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    13e5e19 View commit details
    Browse the repository at this point in the history

  2. marker teleop never uses the augmenter

    @cpaxton
    cpaxton committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    4c18a9d View commit details
    Browse the repository at this point in the history