Skip to content

【auto_stabilizer】 merge origin/master#76

Open
Naoki-Hiraoka wants to merge 23 commits intoYutaKojio:auto-stabilizerfrom
Naoki-Hiraoka:PR-merge-master
Open

【auto_stabilizer】 merge origin/master#76
Naoki-Hiraoka wants to merge 23 commits intoYutaKojio:auto-stabilizerfrom
Naoki-Hiraoka:PR-merge-master

Conversation

@Naoki-Hiraoka
Copy link
Copy Markdown
Collaborator

fkanehiro/hrpsys-baseのmasterを、auto_stabilizerにmergeします。

そのままPullRequestにするとCMakeLists.txtがコンフリクトするので、手元でauto_stabilizer側にあった以下のdiffが消えないようにコンフリクトを解消して、Naoki-Hiraoka/PR-merge-masterブランチとしてPushして、このPullRequestを出しました。

- option(USE_QPOASES "Build qpOASES" OFF)
+ option(USE_QPOASES "Build qpOASES" ON)
+ add_definitions(-DOPENHRP_PACKAGE_VERSION=\"\\"${OPENHRP_VERSION}\\"\")
+ message(STATUS "OpenHRP3 Version : ${OPENHRP_VERSION}")
+ if ("${OPENHRP_VERSION}" VERSION_GREATER "3.1.9")
+   message(STATUS "enable OpenHRP3 3.2")
+   add_definitions(-DOPENHRP_PACKAGE_VERSION_320)
+ endif()
+ add_definitions(-DOPENHRP_PACKAGE_VERSION_320) ### cheat ##
-    pkg_check_modules(OpenCV opencv-2.3.1)
+   # pkg_check_modules(OpenCV opencv-2.3.1)
+   pkg_check_modules(OpenCV opencv-3.3.1-dev)

YuyaNagamatsu and others added 23 commits September 4, 2021 22:12
…_sensorpos

[ImpedanceController] fix sensor localPos rotation
- Look for opencv4 via pkg-config
- Migrate some OpenCV 1 code to OpenCV >= 2
- The variable the module set is not used by hrpsys-base
- This interferes with PCL's module on Ubuntu 20.04
…_profile

[hrpEC/hroEC-common] fix memory leak
hrpsysext relies on Boost.Python and it can be difficult to:
1. Get it to work with the desired Python version
2. Let CMake find it

Since those bindings are not always required, introducing this option
allows to simplify the installation process
Introduce an option to skip hrpsysext build
Ports 'pgains' and 'dgains' will allow modifying
the servo PD gains (of all joints) at each timestep.
[ModifiedServo] Create InPorts and OutPorts for pdgains
…-error-limit-with-jointId

[SoftErrorLimiter/robot.cpp] check jointId >=0 in setServoErrorLimit
[RobotHardware/robot.cpp][robot::power] fix for robots which have a relay for each joint
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants