Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

S

sot-talos-balance
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

c40b2faf

Commit c40b2faf authored 6 years ago by François Bailly

Downloads
- Plain Diff

Merge branch 'devel' of gepgitlab.laas.fr:loco-3d/sot-talos-balance into devel

parents 54be43a8 1450938f

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 3 additions, 0 deletions

CMakeLists.txt
include/sot/talos_balance/admittance-controller.hh 2 additions, 1 deletion

include/sot/talos_balance/admittance-controller.hh
python/sot_talos_balance/test/appli_admittance_single_joint_velocity_based.py 50 additions, 0 deletions

...ance/test/appli_admittance_single_joint_velocity_based.py
python/sot_talos_balance/test/appli_ffSubscriber.py 62 additions, 0 deletions

python/sot_talos_balance/test/appli_ffSubscriber.py
python/sot_talos_balance/test/test_admittance_single_joint_velocity_based.py 16 additions, 0 deletions

...lance/test/test_admittance_single_joint_velocity_based.py
python/sot_talos_balance/test/test_ffSubscriber.py 64 additions, 115 deletions

python/sot_talos_balance/test/test_ffSubscriber.py
src/admittance-controller.cpp 24 additions, 5 deletions

src/admittance-controller.cpp

with 221 additions and 121 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment