-
- Downloads
Merge branch 'topic/StairWalking' into topic/merge
Doesn t link... Conflicts: .gitignore src/FootTrajectoryGeneration/FootTrajectoryGenerationStandard.cpp src/FootTrajectoryGeneration/FootTrajectoryGenerationStandard.hh src/FootTrajectoryGeneration/OnLineFootTrajectoryGeneration.cpp src/GlobalStrategyManagers/CoMAndFootOnlyStrategy.cpp src/Mathematics/AnalyticalZMPCOGTrajectory.cpp src/Mathematics/PolynomeFoot.cpp src/Mathematics/PolynomeFoot.hh src/MotionGeneration/ComAndFootRealizationByGeometry.cpp src/MotionGeneration/ComAndFootRealizationByGeometry.hh src/PatternGeneratorInterfacePrivate.cpp src/PreviewControl/LinearizedInvertedPendulum2D.cpp src/ZMPRefTrajectoryGeneration/AnalyticalMorisawaCompact.cpp src/ZMPRefTrajectoryGeneration/AnalyticalMorisawaCompact.hh src/ZMPRefTrajectoryGeneration/OrientationsPreview.cpp src/ZMPRefTrajectoryGeneration/ZMPVelocityReferencedQP.cpp src/ZMPRefTrajectoryGeneration/ZMPVelocityReferencedQP.h tests/CMakeLists.txt tests/TestKajita2003.cpp tests/TestMorisawa2007.cpp tests/TestObject.cpp tests/TestObject.hh
Showing
- .gitignore 36 additions, 24 deletions.gitignore
- CMakeLists.txt 3 additions, 1 deletionCMakeLists.txt
- ChangeLog 200 additions, 0 deletionsChangeLog
- include/jrl/walkgen/pgtypes.hh 38 additions, 2 deletionsinclude/jrl/walkgen/pgtypes.hh
- src/CMakeLists.txt 2 additions, 1 deletionsrc/CMakeLists.txt
- src/FootTrajectoryGeneration/FootTrajectoryGenerationAbstract.cpp 15 additions, 11 deletions...TrajectoryGeneration/FootTrajectoryGenerationAbstract.cpp
- src/FootTrajectoryGeneration/FootTrajectoryGenerationAbstract.hh 46 additions, 34 deletions...tTrajectoryGeneration/FootTrajectoryGenerationAbstract.hh
- src/FootTrajectoryGeneration/FootTrajectoryGenerationMultiple.cpp 49 additions, 39 deletions...TrajectoryGeneration/FootTrajectoryGenerationMultiple.cpp
- src/FootTrajectoryGeneration/FootTrajectoryGenerationMultiple.hh 27 additions, 27 deletions...tTrajectoryGeneration/FootTrajectoryGenerationMultiple.hh
- src/FootTrajectoryGeneration/FootTrajectoryGenerationStandard.cpp 175 additions, 92 deletions...TrajectoryGeneration/FootTrajectoryGenerationStandard.cpp
- src/FootTrajectoryGeneration/FootTrajectoryGenerationStandard.hh 36 additions, 33 deletions...tTrajectoryGeneration/FootTrajectoryGenerationStandard.hh
- src/FootTrajectoryGeneration/LeftAndRightFootTrajectoryGenerationMultiple.cpp 614 additions, 148 deletions...neration/LeftAndRightFootTrajectoryGenerationMultiple.cpp
- src/FootTrajectoryGeneration/LeftAndRightFootTrajectoryGenerationMultiple.hh 37 additions, 26 deletions...eneration/LeftAndRightFootTrajectoryGenerationMultiple.hh
- src/FootTrajectoryGeneration/OnLineFootTrajectoryGeneration.cpp 46 additions, 16 deletions...otTrajectoryGeneration/OnLineFootTrajectoryGeneration.cpp
- src/Mathematics/AnalyticalZMPCOGTrajectory.cpp 35 additions, 36 deletionssrc/Mathematics/AnalyticalZMPCOGTrajectory.cpp
- src/Mathematics/Bsplines.cpp 453 additions, 0 deletionssrc/Mathematics/Bsplines.cpp
- src/Mathematics/Bsplines.hh 145 additions, 0 deletionssrc/Mathematics/Bsplines.hh
- src/Mathematics/PolynomeFoot.cpp 4 additions, 4 deletionssrc/Mathematics/PolynomeFoot.cpp
- src/Mathematics/PolynomeFoot.hh 10 additions, 8 deletionssrc/Mathematics/PolynomeFoot.hh
- src/MotionGeneration/ComAndFootRealizationByGeometry.cpp 6 additions, 6 deletionssrc/MotionGeneration/ComAndFootRealizationByGeometry.cpp
Loading
Please register or sign in to comment