Skip to content
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.

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

Use ee name for impedancecontroller #467

Merged

Conversation

snozawa
Copy link
Contributor

@snozawa snozawa commented Feb 5, 2015

Impedance controllerの引数をセンサ名でなく、"rarm"などのエンドエフェクタ名を使えるようにしました。
(ロボットごとの差異をなくすため)
start-jsk/rtmros_common#646 (comment)

よろしくお願いいたします。

@k-okada
Copy link
Contributor

k-okada commented Feb 5, 2015

Refer to this link for build results (access rights to CI server needed):
http:https://jenkins.jsk.imi.i.u-tokyo.ac.jp:8080/job/hrpsys-qnx/1744/
Test PASSed.

@k-okada
Copy link
Contributor

k-okada commented Feb 6, 2015

@snozawa
Copy link
Contributor Author

snozawa commented Feb 6, 2015

https://github.com/start-jsk/rtmros_hironx/blob/hydro-devel/hironx_ros_bridge/src/hironx_ros_bridge/hironx_client.py#L624 は要変更でしょうか

hrpsys-baseを最新にするのであれば必要です。
pythonからの呼びだしサンプルは
https://github.com/fkanehiro/hrpsys-base/blob/master/sample/SampleRobot/samplerobot_impedance_controller.py.in
にあり、このPRでも最新版に対応させています。

ただ、hironxをhrpsys-base最新にしなければ変更は必要ないです。

fkanehiro added a commit that referenced this pull request Feb 6, 2015
@fkanehiro fkanehiro merged commit f1433a8 into fkanehiro:master Feb 6, 2015
@snozawa snozawa deleted the use_ee_name_for_impedancecontroller branch February 10, 2015 16:18
std::string ee_name;
bool is_ee_exists = false;
for ( std::map<std::string, ee_trans>::iterator it = ee_map.begin(); it != ee_map.end(); it++ ) {
if ( it->second.target_name == sensor->link->name ) {
Copy link
Contributor

Choose a reason for hiding this comment

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

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.

None yet

3 participants