Merge branch 'python' into python-MacWin
Showing
- CMakeLists.txt 2 additions, 2 deletionsCMakeLists.txt
- include/sot-dynamic/angle-estimator.h 1 addition, 0 deletionsinclude/sot-dynamic/angle-estimator.h
- include/sot-dynamic/dynamic-hrp2.h 4 additions, 0 deletionsinclude/sot-dynamic/dynamic-hrp2.h
- include/sot-dynamic/dynamic-hrp2_10.h 4 additions, 0 deletionsinclude/sot-dynamic/dynamic-hrp2_10.h
- include/sot-dynamic/dynamic.h 1 addition, 1 deletioninclude/sot-dynamic/dynamic.h
- include/sot-dynamic/force-compensation.h 1 addition, 0 deletionsinclude/sot-dynamic/force-compensation.h
- include/sot-dynamic/integrator-force.h 1 addition, 0 deletionsinclude/sot-dynamic/integrator-force.h
- include/sot-dynamic/mass-apparent.h 1 addition, 0 deletionsinclude/sot-dynamic/mass-apparent.h
- include/sot-dynamic/waist-attitude-from-sensor.h 1 addition, 0 deletionsinclude/sot-dynamic/waist-attitude-from-sensor.h
- include/sot-dynamic/zmpreffromcom.h 2 additions, 0 deletionsinclude/sot-dynamic/zmpreffromcom.h
- src/dynamic_graph/sot/dynamics/hrp2.py.in 12 additions, 7 deletionssrc/dynamic_graph/sot/dynamics/hrp2.py.in
- src/dynamic_graph/sot/dynamics/humanoid_robot.py 26 additions, 4 deletionssrc/dynamic_graph/sot/dynamics/humanoid_robot.py
- src/dynamic_graph/sot/dynamics/solver.py 18 additions, 4 deletionssrc/dynamic_graph/sot/dynamics/solver.py
- src/dynamic_graph/sot/dynamics/tools.py 11 additions, 1 deletionsrc/dynamic_graph/sot/dynamics/tools.py
- unitTesting/python/dynamic_walk.py 1 addition, 2 deletionsunitTesting/python/dynamic_walk.py
- unitTesting/python/feet_follower.py 1 addition, 1 deletionunitTesting/python/feet_follower.py
- unitTesting/python/quasistatic_walking.py 4 additions, 6 deletionsunitTesting/python/quasistatic_walking.py
- unitTesting/python/reach_both_hands.py 6 additions, 6 deletionsunitTesting/python/reach_both_hands.py
- unitTesting/python/reach_left_hand.py 6 additions, 6 deletionsunitTesting/python/reach_left_hand.py
- unitTesting/python/reach_right_hand.py 6 additions, 6 deletionsunitTesting/python/reach_right_hand.py
Loading
Please register or sign in to comment