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.

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

rtm.py : fix wrong commit on #634 (isConnected() and False: ) #978

Merged
merged 2 commits into from
Apr 16, 2016
Merged

rtm.py : fix wrong commit on #634 (isConnected() and False: ) #978

merged 2 commits into from
Apr 16, 2016

Conversation

k-okada
Copy link
Contributor

@k-okada k-okada commented Apr 14, 2016 •
edited
Loading

@k-okada k-okada mentioned this pull request Apr 14, 2016
Open
@k-okada
Copy link
Contributor Author

k-okada commented Apr 14, 2016

さすがに今日は無理だけど、頑張ってテスト作ろうと思うのでマージはちょっと待って下さい

@130s
Copy link
Contributor

130s commented Apr 15, 2016

+1
Confirmed with NEXTAGE Open (simulation) that this fixes the issue #979

$ rtcat -l localhost:15005/sh.rtc | grep Connect | uniq -c
      1  +Connected to  /localhost:15005/HiroNX(Robot)0.rtc:q
      1  +Connected to  /localhost:15005/seq.rtc:qRef
      1  +Connected to  /localhost:15005/seq.rtc:tqRef
      1  +Connected to  /localhost:15005/seq.rtc:basePos
      1  +Connected to  /localhost:15005/seq.rtc:baseRpy
      1  +Connected to  /localhost:15005/seq.rtc:zmpRef
      1  +Connected to  /localhost:15005/seq.rtc:optionalData
      1  +Connected to  /localhost:15005/el.rtc:qRef
      1  +Connected to  /localhost:15005/fk.rtc:qRef
      1  +Connected to  /localhost:15005/seq.rtc:qInit
      1  +Connected to  /localhost:15005/log.rtc:sh_qOut
      1  +Connected to  /localhost:15005/tork-kudu1.host_cxt/manager.mgr/ic.rtc:qRef
      1  +Connected to  /localhost:15005/HrpsysSeqStateROSBridge0.rtc:mcangle
      1  +Connected to  /localhost:15005/log.rtc:sh_tqOut
      1  +Connected to  /localhost:15005/seq.rtc:basePosInit
      1  +Connected to  /localhost:15005/fk.rtc:basePosRef
      1  +Connected to  /localhost:15005/log.rtc:sh_basePosOut
      1  +Connected to  /localhost:15005/tork-kudu1.host_cxt/manager.mgr/ic.rtc:basePosIn
      1  +Connected to  /localhost:15005/seq.rtc:baseRpyInit
      1  +Connected to  /localhost:15005/fk.rtc:baseRpyRef
      1  +Connected to  /localhost:15005/log.rtc:sh_baseRpyOut
      1  +Connected to  /localhost:15005/tork-kudu1.host_cxt/manager.mgr/ic.rtc:baseRpyIn
      1  +Connected to  /localhost:15005/HrpsysSeqStateROSBridge0.rtc:baseTform
      1  +Connected to  /localhost:15005/seq.rtc:zmpRefInit
      1  +Connected to  /localhost:15005/log.rtc:sh_zmpOut
      1  +Connected to  /localhost:15005/tork-kudu1.host_cxt/manager.mgr/StateHolderServiceROSBridge.rtc:StateHolderService

(ran `rosrun nextage_ros_bridge nextage.py`)
$ rtcat -l localhost:15005/sh.rtc | grep Connect | uniq -c
      1  +Connected to  /localhost:15005/HiroNX(Robot)0.rtc:q
      1  +Connected to  /localhost:15005/seq.rtc:qRef
      1  +Connected to  /localhost:15005/seq.rtc:tqRef
      1  +Connected to  /localhost:15005/seq.rtc:basePos
      1  +Connected to  /localhost:15005/seq.rtc:baseRpy
      1  +Connected to  /localhost:15005/seq.rtc:zmpRef
      1  +Connected to  /localhost:15005/seq.rtc:optionalData
      1  +Connected to  /localhost:15005/el.rtc:qRef
      1  +Connected to  /localhost:15005/fk.rtc:qRef
      1  +Connected to  /localhost:15005/seq.rtc:qInit
      1  +Connected to  /localhost:15005/log.rtc:sh_qOut
      1  +Connected to  /localhost:15005/tork-kudu1.host_cxt/manager.mgr/ic.rtc:qRef
      1  +Connected to  /localhost:15005/HrpsysSeqStateROSBridge0.rtc:mcangle
      1  +Connected to  /localhost:15005/log.rtc:sh_tqOut
      1  +Connected to  /localhost:15005/seq.rtc:basePosInit
      1  +Connected to  /localhost:15005/fk.rtc:basePosRef
      1  +Connected to  /localhost:15005/log.rtc:sh_basePosOut
      1  +Connected to  /localhost:15005/tork-kudu1.host_cxt/manager.mgr/ic.rtc:basePosIn
      1  +Connected to  /localhost:15005/seq.rtc:baseRpyInit
      1  +Connected to  /localhost:15005/fk.rtc:baseRpyRef
      1  +Connected to  /localhost:15005/log.rtc:sh_baseRpyOut
      1  +Connected to  /localhost:15005/tork-kudu1.host_cxt/manager.mgr/ic.rtc:baseRpyIn
      1  +Connected to  /localhost:15005/HrpsysSeqStateROSBridge0.rtc:baseTform
      1  +Connected to  /localhost:15005/seq.rtc:zmpRefInit
      1  +Connected to  /localhost:15005/log.rtc:sh_zmpOut
      1  +Connected to  /localhost:15005/tork-kudu1.host_cxt/manager.mgr/StateHolderServiceROSBridge.rtc:StateHolderService

(ran `ipython -i `rospack find nextage_ros_bridge`/script/nextage.py`)
$ rtcat -l localhost:15005/sh.rtc | grep Connect | uniq -c
      1  +Connected to  /localhost:15005/HiroNX(Robot)0.rtc:q
      1  +Connected to  /localhost:15005/seq.rtc:qRef
      1  +Connected to  /localhost:15005/seq.rtc:tqRef
      1  +Connected to  /localhost:15005/seq.rtc:basePos
      1  +Connected to  /localhost:15005/seq.rtc:baseRpy
      1  +Connected to  /localhost:15005/seq.rtc:zmpRef
      1  +Connected to  /localhost:15005/seq.rtc:optionalData
      1  +Connected to  /localhost:15005/el.rtc:qRef
      1  +Connected to  /localhost:15005/fk.rtc:qRef
      1  +Connected to  /localhost:15005/seq.rtc:qInit
      1  +Connected to  /localhost:15005/log.rtc:sh_qOut
      1  +Connected to  /localhost:15005/tork-kudu1.host_cxt/manager.mgr/ic.rtc:qRef
      1  +Connected to  /localhost:15005/HrpsysSeqStateROSBridge0.rtc:mcangle
      1  +Connected to  /localhost:15005/log.rtc:sh_tqOut
      1  +Connected to  /localhost:15005/seq.rtc:basePosInit
      1  +Connected to  /localhost:15005/fk.rtc:basePosRef
      1  +Connected to  /localhost:15005/log.rtc:sh_basePosOut
      1  +Connected to  /localhost:15005/tork-kudu1.host_cxt/manager.mgr/ic.rtc:basePosIn
      1  +Connected to  /localhost:15005/seq.rtc:baseRpyInit
      1  +Connected to  /localhost:15005/fk.rtc:baseRpyRef
      1  +Connected to  /localhost:15005/log.rtc:sh_baseRpyOut
      1  +Connected to  /localhost:15005/tork-kudu1.host_cxt/manager.mgr/ic.rtc:baseRpyIn
      1  +Connected to  /localhost:15005/HrpsysSeqStateROSBridge0.rtc:baseTform
      1  +Connected to  /localhost:15005/seq.rtc:zmpRefInit
      1  +Connected to  /localhost:15005/log.rtc:sh_zmpOut
      1  +Connected to  /localhost:15005/tork-kudu1.host_cxt/manager.mgr/StateHolderServiceROSBridge.rtc:StateHolderService

@k-okada
Copy link
Contributor Author

k-okada commented Apr 16, 2016

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

@k-okada
Copy link
Contributor Author

k-okada commented Apr 16, 2016

@fkanehiro 期待通りのテストコード＋修正コードがコミットできました

@fkanehiro fkanehiro merged commit 0a1d387 into fkanehiro:master Apr 16, 2016
This was referenced Apr 19, 2016
Closed
Closed
@k-okada k-okada deleted the fix_stupid_code branch May 11, 2016 02:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@k-okada @130s @fkanehiro