Skip to content

Commit 1e319e0

Browse files
committed
minor changes
1 parent 5ff6908 commit 1e319e0

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

gaden_preprocessing/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ set(AMENT_DEPS
4646
)
4747
if(GENERATE_COPPELIA_SCENE)
4848
list(APPEND AMENT_DEPS coppelia_remote_api)
49+
target_link_libraries(preprocessing zmq)
4950
endif()
5051

5152

@@ -54,7 +55,6 @@ ament_target_dependencies(
5455
${AMENT_DEPS}
5556
)
5657

57-
target_link_libraries(preprocessing zmq)
5858

5959
install(
6060
TARGETS preprocessing

test_env/navigation_config/nav2_launch.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,17 @@ def generate_launch_description():
2626
# Get the launch directory
2727
my_dir = get_package_share_directory('test_env')
2828

29+
map_file = DeclareLaunchArgument('map_yaml', default_value=os.path.join(my_dir, '10x6_central_obstacle', 'occupancy.yaml')) #required
30+
params_yaml_file = DeclareLaunchArgument('nav_params_yaml', default_value=os.path.join(my_dir, 'navigation_config', 'nav2_params.yaml') )
31+
32+
33+
34+
2935
# common variables
36+
logger = LaunchConfiguration("log_level")
3037
use_sim_time = True
3138
remappings = [('/tf', 'tf'),
3239
('/tf_static', 'tf_static')]
33-
params_yaml_file = os.path.join(my_dir, 'navigation_config', 'nav2_params.yaml')# DeclareLaunchArgument('nav_params_yaml', default_value=os.path.join(my_dir, 'navigation_config', 'nav2_params.yaml') )
34-
map_file = os.path.join(my_dir, '10x6_central_obstacle', 'occupancy.yaml') #DeclareLaunchArgument('map_yaml', default_value=os.path.join(my_dir, '10x6_central_obstacle', 'occupancy.yaml')) #required
35-
36-
logger = LaunchConfiguration("log_level")
3740

3841
configured_params = RewrittenYaml(
3942
source_file=params_yaml_file,

0 commit comments

Comments
 (0)