Skip to content

Commit

Permalink
Merge pull request #239 from 130s/impr/rm_overridden_getrtclist
Browse files Browse the repository at this point in the history
[NXO Client] Overridden getRTCList now simply calls a method from the parent class, HIRONX
  • Loading branch information
k-okada authored Oct 18, 2016
2 parents 9cf90de + f80d985 commit ff74d1b
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions nextage_ros_bridge/src/nextage_ros_bridge/nextage_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -330,20 +330,18 @@ def getRTCList(self):
'''
Overwriting HrpsysConfigurator.getRTCList
Returning predefined list of RT components.
As of March 2016, this method internally calls HIRONX.getRTCList() and
returns what it returns. Although we could simply remove this method
from NextageClient, we still keep it; it'd be easier
to modify an existing method than to add a new overridden method,
in case we might want to define RTC return list differently from HIRONX.
@rtype [[str]]
@rerutrn List of available components. Each element consists of a list
of abbreviated and full names of the component.
'''
return [
['seq', "SequencePlayer"],
['sh', "StateHolder"],
['fk', "ForwardKinematics"],
['el', "SoftErrorLimiter"],
# ['co', "CollisionDetector"],
# ['sc', "ServoController"],
['ic', "ImpedanceController"],
['log', "DataLogger"]
]
return HIRONX.getRTCList(self)

def goInitial(self, tm=7, wait=True, init_pose_type=0):
'''
Expand Down

0 comments on commit ff74d1b

Please sign in to comment.