Skip to content

Commit

Permalink
Merge pull request #1031 from tue-robotics/small_fixes_docs
Browse files Browse the repository at this point in the history
(robot_skills) small doc fixes
  • Loading branch information
MatthijsBurgh committed Apr 21, 2020
2 parents 3cd1544 + 6a4cf83 commit fca5071
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 4 deletions.
12 changes: 11 additions & 1 deletion robot_skills/src/robot_skills/amigo.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
from __future__ import print_function

from robot_skills import robot, api, arms, base, ebutton, head, ears, lights, perception, speech, \
sound_source_localisation, torso, world_model_ed
from .simulation import is_sim_mode, SimEButton


class Amigo(robot.Robot):
"""docstring for Amigo"""
"""
Amigo
"""
def __init__(self, dontInclude=None, wait_services=False):
"""
Constructor
:param dontInclude: Not supported anymore
:param wait_services: Not supported anymore by robot class
"""
if dontInclude is None:
dontInclude = []
super(Amigo, self).__init__(robot_name="amigo", wait_services=wait_services)
Expand Down
8 changes: 7 additions & 1 deletion robot_skills/src/robot_skills/hero.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,15 @@
import rospy
import math


class Hero(robot.Robot):
"""docstring for Hero"""
"""Hero"""
def __init__(self, wait_services=False):
"""
Constructor
:param wait_services: Not supported anymore by robot class
"""
super(Hero, self).__init__(robot_name="hero", wait_services=wait_services)

self._ignored_parts = ["leftArm", "torso", "spindle", "head"]
Expand Down
13 changes: 13 additions & 0 deletions robot_skills/src/robot_skills/robot.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,19 @@ class Robot(object):
Interface to all parts of the robot.
"""
def __init__(self, robot_name="", wait_services=False, tf_listener=None):
"""
Constructor
:param robot_name: Name of the robot
:type robot_name: str
:param wait_services: Not used anymore
:type wait_services: bool
:param tf_listener: tf_listener object
:type tf_listener: Optional[tf.TransformListener]
"""

if wait_services:
rospy.logwarn("(Robot) wait_services is not used anymore and will be removed in the future")

self.robot_name = robot_name
self.tf_listener = tf.TransformListener() if tf_listener is None else tf_listener
Expand Down
9 changes: 8 additions & 1 deletion robot_skills/src/robot_skills/sergio.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,15 @@


class Sergio(robot.Robot):
"""docstring for Sergio"""
"""
Sergio
"""
def __init__(self, wait_services=False):
"""
Constructor
:param wait_services: Not supported anymore by robot class
"""
super(Sergio, self).__init__(robot_name="sergio", wait_services=wait_services)

self._ignored_parts = ["leftArm", "rightArm", "torso", "spindle", "head"]
Expand Down
3 changes: 2 additions & 1 deletion robot_skills/src/robot_skills/world_model_ed.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ def __init__(self, robot_name, tf_listener):
self.robot_name = robot_name

def wait_for_connections(self, timeout, log_failing_connections=True):
""" Waits for the connections until they are connected
"""
Waits for the connections until they are connected
:param timeout: timeout in seconds
:param log_failing_connections: (bool) whether to log errors if not connected. This is useful when checking
Expand Down

0 comments on commit fca5071

Please sign in to comment.