Skip to content

Commit 81a52ab

Browse files
committed
Update launcher drones_ros2
1 parent 743a3de commit 81a52ab

File tree

1 file changed

+2
-17
lines changed

1 file changed

+2
-17
lines changed

manager/manager/launcher/launcher_drones_ros2.py

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,9 @@
66

77

88
class LauncherDronesRos2(ILauncher):
9-
exercise_id: str
109
type: str
1110
module: str
12-
resource_folders: List[str]
13-
model_folders: List[str]
14-
plugin_folders: List[str]
1511
launch_file: str
16-
running = False
1712
threads: List[Any] = []
1813

1914
def run(self, callback):
@@ -25,7 +20,6 @@ def run(self, callback):
2520
self.threads.append(xserver_thread)
2621

2722
# expand variables in configuration paths
28-
self._set_environment()
2923
world_file = os.path.expandvars(self.launch_file)
3024

3125
# Launching MicroXRCE and Aerostack2 nodes
@@ -42,7 +36,7 @@ def run(self, callback):
4236
px4_launch_thread.start()
4337
self.threads.append(px4_launch_thread)
4438

45-
self.running = True
39+
4640

4741
def is_running(self):
4842
return True
@@ -52,13 +46,4 @@ def terminate(self):
5246
for thread in self.threads:
5347
thread.terminate()
5448
thread.join()
55-
self.running = False
56-
57-
def _set_environment(self):
58-
resource_folders = [os.path.expandvars(path) for path in self.resource_folders]
59-
model_folders = [os.path.expandvars(path) for path in self.model_folders]
60-
plugin_folders = [os.path.expandvars(path) for path in self.plugin_folders]
61-
62-
os.environ["GAZEBO_RESOURCE_PATH"] = f"{os.environ.get('GAZEBO_RESOURCE_PATH', '')}:{':'.join(resource_folders)}"
63-
os.environ["GAZEBO_MODEL_PATH"] = f"{os.environ.get('GAZEBO_MODEL_PATH', '')}:{':'.join(model_folders)}"
64-
os.environ["GAZEBO_PLUGIN_PATH"] = f"{os.environ.get('GAZEBO_PLUGIN_PATH', '')}:{':'.join(plugin_folders)}"
49+

0 commit comments

Comments
 (0)