fix: support context dict key for humble

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>
tier4 · May 25, 2022 · e358a50 · e358a50
1 parent 2be4ea7
commit e358a50
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/aip_x1_launch/launch/velodyne_node_container.launch.py b/aip_x1_launch/launch/velodyne_node_container.launch.py
@@ -26,6 +26,8 @@
 
 def get_vehicle_info(context):
     gp = context.launch_configurations.get("ros_params", {})
+    if not gp:
+        gp = self.context.launch_configurations.get("global_params", {})
     p = {}
     p["vehicle_length"] = gp["front_overhang"] + gp["wheel_base"] + gp["rear_overhang"]
     p["vehicle_width"] = gp["wheel_tread"] + gp["left_overhang"] + gp["right_overhang"]

diff --git a/aip_x2_launch/launch/pandar_node_container.launch.py b/aip_x2_launch/launch/pandar_node_container.launch.py
@@ -36,6 +36,8 @@ def get_dual_return_filter_info(context):
 
 def get_vehicle_info(context):
     gp = context.launch_configurations.get("ros_params", {})
+    if not gp:
+        gp = self.context.launch_configurations.get("global_params", {})
     p = {}
     p["vehicle_length"] = gp["front_overhang"] + gp["wheel_base"] + gp["rear_overhang"]
     p["vehicle_width"] = gp["wheel_tread"] + gp["left_overhang"] + gp["right_overhang"]

diff --git a/common_sensor_launch/launch/livox_horizon.launch.py b/common_sensor_launch/launch/livox_horizon.launch.py
@@ -28,6 +28,8 @@
 
 def get_vehicle_info(context):
     gp = context.launch_configurations.get("ros_params", {})
+    if not gp:
+        gp = self.context.launch_configurations.get("global_params", {})
     p = {}
     p["vehicle_length"] = gp["front_overhang"] + gp["wheel_base"] + gp["rear_overhang"]
     p["vehicle_width"] = gp["wheel_tread"] + gp["left_overhang"] + gp["right_overhang"]

diff --git a/common_sensor_launch/launch/velodyne_node_container.launch.py b/common_sensor_launch/launch/velodyne_node_container.launch.py
@@ -27,6 +27,8 @@
 
 def get_vehicle_info(context):
     gp = context.launch_configurations.get("ros_params", {})
+    if not gp:
+        gp = self.context.launch_configurations.get("global_params", {})
     p = {}
     p["vehicle_length"] = gp["front_overhang"] + gp["wheel_base"] + gp["rear_overhang"]
     p["vehicle_width"] = gp["wheel_tread"] + gp["left_overhang"] + gp["right_overhang"]