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

Lfd modifications #23

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Lfd modifications #23

wants to merge 12 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 jhu-lcsr#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. inertia; adding var to get rid of bhand action server

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

Commits on Aug 21, 2015

  1. tweaking parameters for DMP reproductions

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

Commits on Sep 21, 2015

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

    …difications
    @cpaxton
    cpaxton committed Sep 21, 2015
    Configuration menu
    Copy the full SHA
    546aaaa View commit details
    Browse the repository at this point in the history

  2. Fixes and Merge branch 'devel' of github.com:jhu-lcsr/lcsr_barrett in… 

    …to lfd_modifications

Conflicts:
	launch/sim/orocos_component_params.launch
	launch/sim/wam7_sim.launch
    @cpaxton
    cpaxton committed Sep 21, 2015
    Configuration menu
    Copy the full SHA
    1ad8bce View commit details
    Browse the repository at this point in the history

  3. fixing meshes

    @cpaxton
    cpaxton committed Sep 21, 2015
    Configuration menu
    Copy the full SHA
    011e430 View commit details
    Browse the repository at this point in the history