@@ -40,8 +40,7 @@ class Job(object):
40
40
""" Represents a ROS configuration to launch on machine startup. """
41
41
42
42
def __init__ (self , name = "ros" , interface = None , user = None , workspace_setup = None ,
43
- rosdistro = None , master_uri = None , log_path = None ,
44
- systemd_after = None ):
43
+ rosdistro = None , master_uri = None , log_path = None , model = None , systemd_after = None ):
45
44
"""Construct a new Job definition.
46
45
47
46
:param name: Name of job to create. Defaults to "ros", but you might
@@ -68,6 +67,8 @@ def __init__(self, name="ros", interface=None, user=None, workspace_setup=None,
68
67
default of using /tmp, it is the user's responsibility to manage log
69
68
rotation.
70
69
:type log_path: str
70
+ :param model: Your robot model if not specified under ROBOT_MODEL.
71
+ :type model: str
71
72
"""
72
73
73
74
self .name = name
@@ -110,6 +111,16 @@ def __init__(self, name="ros", interface=None, user=None, workspace_setup=None,
110
111
# startup job itself. List of strs.
111
112
self .files = []
112
113
114
+ # Sets the model environment variable if provided, else results in
115
+ # ROBOT_MODEL=ROBOT
116
+ if model :
117
+ self .model = name .upper () + '_MODEL=' + model
118
+ else :
119
+ try :
120
+ self .model = name .upper () + '_MODEL=' + os .environ [name .upper () + '_MODEL' ]
121
+ except KeyError :
122
+ self .model = name .upper () + '_MODEL=ROBOT'
123
+
113
124
def add (self , package = None , filename = None , glob = None ):
114
125
""" Add launch or other configuration files to Job.
115
126
0 commit comments