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

Update ST, ABC, OCTD for manipulation #1192

Merged
merged 4 commits into from
Aug 3, 2017

Conversation

snozawa
Copy link
Contributor

@snozawa snozawa commented Aug 3, 2017

ST, ABC, OCTDの変更をしました

  • ST, ABC : ABCの接地時間の初期値をかえて、stの計算が一ヶ所コンパイラの最適化でなくなってる(volatileにしたらなくならない)ので修正しました
  • OCTD : 推定機で、手先モーメントなどを入れた計算、摩擦係数にかかる項の計算をいれました。

よろしくお願いします。

…some PC, previous version does not work because of optimized out.
…naroundDetector, sample/SampleRobot/samplerobot_carry_object.py] Add friction coefficient wrench. Update samples to print it.
…naroundDetector] Add TOTAL_MOMENT2 to use end-effector moments
@snozawa
Copy link
Contributor Author

snozawa commented Aug 3, 2017

travisとおったようです。
お手すきの時で構いませんので、ご確認いただけますと幸いです。

@fkanehiro fkanehiro merged commit 4a01349 into fkanehiro:master Aug 3, 2017
@snozawa
Copy link
Contributor Author

snozawa commented Aug 3, 2017

ありがとうございます。

@snozawa snozawa deleted the update_st_abc_otd branch August 3, 2017 10:06
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

2 participants