mirror of
https://github.com/orbbec/OrbbecSDK_ROS2.git
synced 2026-10-04 12:07:46 +08:00
fix: update launch files to standardize device preset and enhance plugin parameter handling
This commit is contained in:
@@ -43,10 +43,28 @@ def load_parameters(context, args):
|
|||||||
yaml_params = load_yaml(config_file_path)
|
yaml_params = load_yaml(config_file_path)
|
||||||
default_params = merge_params(default_params, yaml_params)
|
default_params = merge_params(default_params, yaml_params)
|
||||||
skip_convert = {'config_file_path', 'usb_port', 'serial_number'}
|
skip_convert = {'config_file_path', 'usb_port', 'serial_number'}
|
||||||
return {
|
|
||||||
key: (value if key in skip_convert else convert_value(value))
|
result = {}
|
||||||
for key, value in default_params.items()
|
for key, value in default_params.items():
|
||||||
}
|
if key in skip_convert:
|
||||||
|
result[key] = value
|
||||||
|
elif 'enable_pub_plugins' in key:
|
||||||
|
if isinstance(value, str):
|
||||||
|
if value.startswith('[') and value.endswith(']'):
|
||||||
|
try:
|
||||||
|
result[key] = yaml.safe_load(value)
|
||||||
|
except:
|
||||||
|
result[key] = [value]
|
||||||
|
else:
|
||||||
|
result[key] = [value]
|
||||||
|
elif isinstance(value, list):
|
||||||
|
result[key] = value
|
||||||
|
else:
|
||||||
|
result[key] = [str(value)]
|
||||||
|
else:
|
||||||
|
result[key] = convert_value(value)
|
||||||
|
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
def generate_launch_description():
|
def generate_launch_description():
|
||||||
@@ -180,13 +198,22 @@ def generate_launch_description():
|
|||||||
DeclareLaunchArgument('align_target_stream', default_value='COLOR'),# COLOR or DEPTH
|
DeclareLaunchArgument('align_target_stream', default_value='COLOR'),# COLOR or DEPTH
|
||||||
DeclareLaunchArgument('diagnostic_period', default_value='1.0'),
|
DeclareLaunchArgument('diagnostic_period', default_value='1.0'),
|
||||||
DeclareLaunchArgument('depth_precision', default_value=''),
|
DeclareLaunchArgument('depth_precision', default_value=''),
|
||||||
DeclareLaunchArgument('device_preset', default_value='Default'),
|
DeclareLaunchArgument('device_preset', default_value='Standard'),
|
||||||
DeclareLaunchArgument('retry_on_usb3_detection_failure', default_value='false'),
|
DeclareLaunchArgument('retry_on_usb3_detection_failure', default_value='false'),
|
||||||
DeclareLaunchArgument('enable_sync_host_time', default_value='true'),
|
DeclareLaunchArgument('enable_sync_host_time', default_value='true'),
|
||||||
DeclareLaunchArgument('time_domain', default_value='global'),# global, device, system
|
DeclareLaunchArgument('time_domain', default_value='global'),# global, device, system
|
||||||
DeclareLaunchArgument('enable_color_undistortion', default_value='false'),
|
DeclareLaunchArgument('enable_color_undistortion', default_value='false'),
|
||||||
DeclareLaunchArgument('config_file_path', default_value=''),
|
DeclareLaunchArgument('config_file_path', default_value=''),
|
||||||
DeclareLaunchArgument('enable_heartbeat', default_value='false'),
|
DeclareLaunchArgument('enable_heartbeat', default_value='false'),
|
||||||
|
|
||||||
|
#color image transport plugins
|
||||||
|
DeclareLaunchArgument('color.image_raw.enable_pub_plugins',default_value='["image_transport/compressed", "image_transport/raw", "image_transport/theora"]'),
|
||||||
|
#depth image transport plugins
|
||||||
|
DeclareLaunchArgument('depth.image_raw.enable_pub_plugins',default_value='["image_transport/compressedDepth", "image_transport/raw"]'),
|
||||||
|
#infra1
|
||||||
|
DeclareLaunchArgument('left_ir.image_raw.enable_pub_plugins',default_value='["image_transport/compressed", "image_transport/raw", "image_transport/theora"]'),
|
||||||
|
#infra2
|
||||||
|
DeclareLaunchArgument('right_ir.image_raw.enable_pub_plugins',default_value='["image_transport/compressed", "image_transport/raw", "image_transport/theora"]'),
|
||||||
]
|
]
|
||||||
|
|
||||||
def get_params(context, args):
|
def get_params(context, args):
|
||||||
|
|||||||
@@ -43,10 +43,28 @@ def load_parameters(context, args):
|
|||||||
yaml_params = load_yaml(config_file_path)
|
yaml_params = load_yaml(config_file_path)
|
||||||
default_params = merge_params(default_params, yaml_params)
|
default_params = merge_params(default_params, yaml_params)
|
||||||
skip_convert = {'config_file_path', 'usb_port', 'serial_number'}
|
skip_convert = {'config_file_path', 'usb_port', 'serial_number'}
|
||||||
return {
|
|
||||||
key: (value if key in skip_convert else convert_value(value))
|
result = {}
|
||||||
for key, value in default_params.items()
|
for key, value in default_params.items():
|
||||||
}
|
if key in skip_convert:
|
||||||
|
result[key] = value
|
||||||
|
elif 'enable_pub_plugins' in key:
|
||||||
|
if isinstance(value, str):
|
||||||
|
if value.startswith('[') and value.endswith(']'):
|
||||||
|
try:
|
||||||
|
result[key] = yaml.safe_load(value)
|
||||||
|
except:
|
||||||
|
result[key] = [value]
|
||||||
|
else:
|
||||||
|
result[key] = [value]
|
||||||
|
elif isinstance(value, list):
|
||||||
|
result[key] = value
|
||||||
|
else:
|
||||||
|
result[key] = [str(value)]
|
||||||
|
else:
|
||||||
|
result[key] = convert_value(value)
|
||||||
|
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
def generate_launch_description():
|
def generate_launch_description():
|
||||||
@@ -181,7 +199,7 @@ def generate_launch_description():
|
|||||||
DeclareLaunchArgument('diagnostic_period', default_value='1.0'),
|
DeclareLaunchArgument('diagnostic_period', default_value='1.0'),
|
||||||
DeclareLaunchArgument('enable_laser', default_value='true'),
|
DeclareLaunchArgument('enable_laser', default_value='true'),
|
||||||
DeclareLaunchArgument('depth_precision', default_value=''),
|
DeclareLaunchArgument('depth_precision', default_value=''),
|
||||||
DeclareLaunchArgument('device_preset', default_value='Default'),
|
DeclareLaunchArgument('device_preset', default_value='Standard'),
|
||||||
DeclareLaunchArgument('retry_on_usb3_detection_failure', default_value='false'),
|
DeclareLaunchArgument('retry_on_usb3_detection_failure', default_value='false'),
|
||||||
DeclareLaunchArgument('laser_energy_level', default_value='-1'),
|
DeclareLaunchArgument('laser_energy_level', default_value='-1'),
|
||||||
DeclareLaunchArgument('enable_sync_host_time', default_value='true'),
|
DeclareLaunchArgument('enable_sync_host_time', default_value='true'),
|
||||||
@@ -189,6 +207,15 @@ def generate_launch_description():
|
|||||||
DeclareLaunchArgument('enable_color_undistortion', default_value='false'),
|
DeclareLaunchArgument('enable_color_undistortion', default_value='false'),
|
||||||
DeclareLaunchArgument('config_file_path', default_value=''),
|
DeclareLaunchArgument('config_file_path', default_value=''),
|
||||||
DeclareLaunchArgument('enable_heartbeat', default_value='false'),
|
DeclareLaunchArgument('enable_heartbeat', default_value='false'),
|
||||||
|
|
||||||
|
#color image transport plugins
|
||||||
|
DeclareLaunchArgument('color.image_raw.enable_pub_plugins',default_value='["image_transport/compressed", "image_transport/raw", "image_transport/theora"]'),
|
||||||
|
#depth image transport plugins
|
||||||
|
DeclareLaunchArgument('depth.image_raw.enable_pub_plugins',default_value='["image_transport/compressedDepth", "image_transport/raw"]'),
|
||||||
|
#infra1
|
||||||
|
DeclareLaunchArgument('left_ir.image_raw.enable_pub_plugins',default_value='["image_transport/compressed", "image_transport/raw", "image_transport/theora"]'),
|
||||||
|
#infra2
|
||||||
|
DeclareLaunchArgument('right_ir.image_raw.enable_pub_plugins',default_value='["image_transport/compressed", "image_transport/raw", "image_transport/theora"]'),
|
||||||
]
|
]
|
||||||
|
|
||||||
def get_params(context, args):
|
def get_params(context, args):
|
||||||
|
|||||||
@@ -43,11 +43,28 @@ def load_parameters(context, args):
|
|||||||
yaml_params = load_yaml(config_file_path)
|
yaml_params = load_yaml(config_file_path)
|
||||||
default_params = merge_params(default_params, yaml_params)
|
default_params = merge_params(default_params, yaml_params)
|
||||||
skip_convert = {'config_file_path', 'usb_port', 'serial_number'}
|
skip_convert = {'config_file_path', 'usb_port', 'serial_number'}
|
||||||
return {
|
|
||||||
key: (value if key in skip_convert else convert_value(value))
|
|
||||||
for key, value in default_params.items()
|
|
||||||
}
|
|
||||||
|
|
||||||
|
result = {}
|
||||||
|
for key, value in default_params.items():
|
||||||
|
if key in skip_convert:
|
||||||
|
result[key] = value
|
||||||
|
elif 'enable_pub_plugins' in key:
|
||||||
|
if isinstance(value, str):
|
||||||
|
if value.startswith('[') and value.endswith(']'):
|
||||||
|
try:
|
||||||
|
result[key] = yaml.safe_load(value)
|
||||||
|
except:
|
||||||
|
result[key] = [value]
|
||||||
|
else:
|
||||||
|
result[key] = [value]
|
||||||
|
elif isinstance(value, list):
|
||||||
|
result[key] = value
|
||||||
|
else:
|
||||||
|
result[key] = [str(value)]
|
||||||
|
else:
|
||||||
|
result[key] = convert_value(value)
|
||||||
|
|
||||||
|
return result
|
||||||
|
|
||||||
def generate_launch_description():
|
def generate_launch_description():
|
||||||
args = [
|
args = [
|
||||||
@@ -180,13 +197,22 @@ def generate_launch_description():
|
|||||||
DeclareLaunchArgument('align_target_stream', default_value='COLOR'),# COLOR or DEPTH
|
DeclareLaunchArgument('align_target_stream', default_value='COLOR'),# COLOR or DEPTH
|
||||||
DeclareLaunchArgument('diagnostic_period', default_value='1.0'),
|
DeclareLaunchArgument('diagnostic_period', default_value='1.0'),
|
||||||
DeclareLaunchArgument('depth_precision', default_value=''),
|
DeclareLaunchArgument('depth_precision', default_value=''),
|
||||||
DeclareLaunchArgument('device_preset', default_value='Default'),
|
DeclareLaunchArgument('device_preset', default_value='Standard'),
|
||||||
DeclareLaunchArgument('retry_on_usb3_detection_failure', default_value='false'),
|
DeclareLaunchArgument('retry_on_usb3_detection_failure', default_value='false'),
|
||||||
DeclareLaunchArgument('enable_sync_host_time', default_value='true'),
|
DeclareLaunchArgument('enable_sync_host_time', default_value='true'),
|
||||||
DeclareLaunchArgument('time_domain', default_value='global'),# global, device, system
|
DeclareLaunchArgument('time_domain', default_value='global'),# global, device, system
|
||||||
DeclareLaunchArgument('enable_color_undistortion', default_value='false'),
|
DeclareLaunchArgument('enable_color_undistortion', default_value='false'),
|
||||||
DeclareLaunchArgument('config_file_path', default_value=''),
|
DeclareLaunchArgument('config_file_path', default_value=''),
|
||||||
DeclareLaunchArgument('enable_heartbeat', default_value='false'),
|
DeclareLaunchArgument('enable_heartbeat', default_value='false'),
|
||||||
|
|
||||||
|
#color image transport plugins
|
||||||
|
DeclareLaunchArgument('color.image_raw.enable_pub_plugins',default_value='["image_transport/compressed", "image_transport/raw", "image_transport/theora"]'),
|
||||||
|
#depth image transport plugins
|
||||||
|
DeclareLaunchArgument('depth.image_raw.enable_pub_plugins',default_value='["image_transport/compressedDepth", "image_transport/raw"]'),
|
||||||
|
#infra1
|
||||||
|
DeclareLaunchArgument('left_ir.image_raw.enable_pub_plugins',default_value='["image_transport/compressed", "image_transport/raw", "image_transport/theora"]'),
|
||||||
|
#infra2
|
||||||
|
DeclareLaunchArgument('right_ir.image_raw.enable_pub_plugins',default_value='["image_transport/compressed", "image_transport/raw", "image_transport/theora"]'),
|
||||||
]
|
]
|
||||||
|
|
||||||
def get_params(context, args):
|
def get_params(context, args):
|
||||||
|
|||||||
@@ -43,10 +43,28 @@ def load_parameters(context, args):
|
|||||||
yaml_params = load_yaml(config_file_path)
|
yaml_params = load_yaml(config_file_path)
|
||||||
default_params = merge_params(default_params, yaml_params)
|
default_params = merge_params(default_params, yaml_params)
|
||||||
skip_convert = {'config_file_path', 'usb_port', 'serial_number'}
|
skip_convert = {'config_file_path', 'usb_port', 'serial_number'}
|
||||||
return {
|
|
||||||
key: (value if key in skip_convert else convert_value(value))
|
result = {}
|
||||||
for key, value in default_params.items()
|
for key, value in default_params.items():
|
||||||
}
|
if key in skip_convert:
|
||||||
|
result[key] = value
|
||||||
|
elif 'enable_pub_plugins' in key:
|
||||||
|
if isinstance(value, str):
|
||||||
|
if value.startswith('[') and value.endswith(']'):
|
||||||
|
try:
|
||||||
|
result[key] = yaml.safe_load(value)
|
||||||
|
except:
|
||||||
|
result[key] = [value]
|
||||||
|
else:
|
||||||
|
result[key] = [value]
|
||||||
|
elif isinstance(value, list):
|
||||||
|
result[key] = value
|
||||||
|
else:
|
||||||
|
result[key] = [str(value)]
|
||||||
|
else:
|
||||||
|
result[key] = convert_value(value)
|
||||||
|
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
def generate_launch_description():
|
def generate_launch_description():
|
||||||
@@ -181,7 +199,7 @@ def generate_launch_description():
|
|||||||
DeclareLaunchArgument('diagnostic_period', default_value='1.0'),
|
DeclareLaunchArgument('diagnostic_period', default_value='1.0'),
|
||||||
DeclareLaunchArgument('enable_laser', default_value='true'),
|
DeclareLaunchArgument('enable_laser', default_value='true'),
|
||||||
DeclareLaunchArgument('depth_precision', default_value=''),
|
DeclareLaunchArgument('depth_precision', default_value=''),
|
||||||
DeclareLaunchArgument('device_preset', default_value='Default'),
|
DeclareLaunchArgument('device_preset', default_value='Standard'),
|
||||||
DeclareLaunchArgument('retry_on_usb3_detection_failure', default_value='false'),
|
DeclareLaunchArgument('retry_on_usb3_detection_failure', default_value='false'),
|
||||||
DeclareLaunchArgument('laser_energy_level', default_value='-1'),
|
DeclareLaunchArgument('laser_energy_level', default_value='-1'),
|
||||||
DeclareLaunchArgument('enable_sync_host_time', default_value='true'),
|
DeclareLaunchArgument('enable_sync_host_time', default_value='true'),
|
||||||
@@ -189,6 +207,15 @@ def generate_launch_description():
|
|||||||
DeclareLaunchArgument('enable_color_undistortion', default_value='false'),
|
DeclareLaunchArgument('enable_color_undistortion', default_value='false'),
|
||||||
DeclareLaunchArgument('config_file_path', default_value=''),
|
DeclareLaunchArgument('config_file_path', default_value=''),
|
||||||
DeclareLaunchArgument('enable_heartbeat', default_value='false'),
|
DeclareLaunchArgument('enable_heartbeat', default_value='false'),
|
||||||
|
|
||||||
|
#color image transport plugins
|
||||||
|
DeclareLaunchArgument('color.image_raw.enable_pub_plugins',default_value='["image_transport/compressed", "image_transport/raw", "image_transport/theora"]'),
|
||||||
|
#depth image transport plugins
|
||||||
|
DeclareLaunchArgument('depth.image_raw.enable_pub_plugins',default_value='["image_transport/compressedDepth", "image_transport/raw"]'),
|
||||||
|
#infra1
|
||||||
|
DeclareLaunchArgument('left_ir.image_raw.enable_pub_plugins',default_value='["image_transport/compressed", "image_transport/raw", "image_transport/theora"]'),
|
||||||
|
#infra2
|
||||||
|
DeclareLaunchArgument('right_ir.image_raw.enable_pub_plugins',default_value='["image_transport/compressed", "image_transport/raw", "image_transport/theora"]'),
|
||||||
]
|
]
|
||||||
|
|
||||||
def get_params(context, args):
|
def get_params(context, args):
|
||||||
|
|||||||
@@ -293,7 +293,7 @@ def generate_launch_description():
|
|||||||
#color image transport plugins
|
#color image transport plugins
|
||||||
DeclareLaunchArgument('color.image_raw.enable_pub_plugins',default_value='["image_transport/compressed", "image_transport/raw", "image_transport/theora"]'),
|
DeclareLaunchArgument('color.image_raw.enable_pub_plugins',default_value='["image_transport/compressed", "image_transport/raw", "image_transport/theora"]'),
|
||||||
#depth image transport plugins
|
#depth image transport plugins
|
||||||
DeclareLaunchArgument('depth.image_raw.enable_pub_plugins',default_value='["image_transport/compressedDepth", "image_transport/raw", "image_transport/theora"]'),
|
DeclareLaunchArgument('depth.image_raw.enable_pub_plugins',default_value='["image_transport/compressedDepth", "image_transport/raw"]'),
|
||||||
#infra1
|
#infra1
|
||||||
DeclareLaunchArgument('left_ir.image_raw.enable_pub_plugins',default_value='["image_transport/compressed", "image_transport/raw", "image_transport/theora"]'),
|
DeclareLaunchArgument('left_ir.image_raw.enable_pub_plugins',default_value='["image_transport/compressed", "image_transport/raw", "image_transport/theora"]'),
|
||||||
#infra2
|
#infra2
|
||||||
|
|||||||
Reference in New Issue
Block a user