Skip to content

[DO NOT MERGE] devel branch of hiro014 #1283

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
Open
pazeshun wants to merge 14 commits into
base: master
Choose a base branch
from
Open

[DO NOT MERGE] devel branch of hiro014 #1283

pazeshun wants to merge 14 commits into from

Conversation

@pazeshun
Copy link

@pazeshun pazeshun commented Nov 14, 2019 •
edited
Loading

hiro014で実際に動いているブランチです。
#1282 + #1247 + #1286 + #1287 + #1296 + 力センサを読むためのRobotHardwareの変更　で構成されています。
cc @k-okada

@pazeshun
Fix memory fault in collision detector
20c35b3
@pazeshun
qhull is installed as libqhull in HIRONX
1458b92 
See start-jsk/rtmros_hironx#423 (comment)
See fkanehiro#83 (comment)
@pazeshun
math.h in HIRONX is only for C++
04d8e16 
See start-jsk/rtmros_hironx#423 (comment)
See fkanehiro#83 (comment)
@pazeshun
Adjust robot.cpp to HIRONX force sensor
c4643b3
@pazeshun
Include stdlib.h to compile abort() in hrpExecutionContext on QNX
377d7d0 
Fix fkanehiro#1208 for QNX
See fkanehiro#1078 (comment)
See http://www.qnx.co.jp/developers/docs/6.3.2/neutrino/lib_ref/a/abort.html
@pazeshun
Include string to compile std::string in logSplitter on QNX
4e3cfd4 
Fix fkanehiro#1198 for QNX
See fkanehiro#1078 (comment)
@pazeshun
[hrpEC] CPU_SET does not exist on QNX
13c286c 
Fix fkanehiro#1229 for QNX
cf. http://community.qnx.com/sf/discussion/do/listPosts/projects.community/discussion.community.topc22494?pageSize=-1#post_post95796
cf. http://community.qnx.com/sf/discussion/do/listPosts/projects.core_os/discussion.newcode.topc26148?pageSize=-1#post_post113740
@pazeshun
[ImpedanceController] Use std::isinf/isnan only when C++11
8d57802 
To fix fkanehiro#1234 for QNX
Using the same method as fkanehiro#1241
takayuki5168
takayuki5168 reviewed Nov 16, 2019
View reviewed changes
Copy link

@takayuki5168 takayuki5168 left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pazeshun
c4643b3
ちゃんと理解してないですが上記の変更は確か，HIRO用に配布されているlibhrysysなんちゃら.so(?)を使用するとforce sensorが読めない問題に対するでっちあげの対応で，少なくともHIRO専用のための変更であると思うので，条件分岐なしの現状をmasterにマージするべきではないかと．

@pazeshun
Copy link
Author

pazeshun commented Nov 16, 2019 •
edited
Loading

@takayuki5168

ちゃんと理解してないですが上記の変更は確か，HIRO用に配布されているlibhrysysなんちゃら.so(?)を使用するとforce sensorが読めない問題に対するでっちあげの対応で，少なくともHIRO専用のための変更であると思うので，条件分岐なしの現状をmasterにマージするべきではないかと．

なので、このPRには[DO NOT MERGE]をつけています。このPRは、現在hiro014ではどうなっているのかを伝承していきやすくするためのものです。
masterにマージできる（はず）の変更は、 #1282 , #1247 , #1286 , #1287 , #1296 にまとまっています。

@pazeshun pazeshun mentioned this pull request Nov 18, 2019
Merged
@Affonso-Gui Affonso-Gui mentioned this pull request Nov 19, 2019
Open
@pazeshun pazeshun mentioned this pull request Nov 22, 2019
Merged
@pazeshun pazeshun mentioned this pull request May 9, 2020
Merged
@pazeshun
Copy link
Author

pazeshun commented Jul 23, 2022

メモ: 次にhiro014内部のhrpsysを最新のものに更新する場合は、https://github.com/start-jsk/rtmros_hrp2/pull/613 と同じ変更をビルドスクリプトに加えないといけません

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@takayuki5168 takayuki5168 takayuki5168 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@pazeshun @takayuki5168