Skip to content

Commit 37747bc

Browse files
authored
Merge pull request #13 from KumarRobotics/fix/rajant_launch
Use polling approach to trigger comms to other robots
2 parents b7d822c + 578dd8f commit 37747bc

1 file changed

Lines changed: 17 additions & 18 deletions

File tree

interface_rajant/launch/rajant_nodes.launch.py

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,40 +34,39 @@ def generate_launch_description():
3434
description='Path to radio configuration file'
3535
)
3636

37+
bcapi_jar_file_arg = DeclareLaunchArgument(
38+
'bcapi_jar_file',
39+
default_value=PathJoinSubstitution([
40+
FindPackageShare('interface_rajant'),
41+
'thirdParty', 'PeerRSSI-bcapi-11.26.1.jar'
42+
]),
43+
description='Path to jar file used to get rssi'
44+
)
45+
3746
# Get launch configurations
3847
robot_name = LaunchConfiguration('robot_name')
3948
robot_configs = LaunchConfiguration('robot_configs')
4049
radio_configs = LaunchConfiguration('radio_configs')
50+
bcapi_jar_file = LaunchConfiguration('bcapi_jar_file')
4151

4252
# Define nodes
43-
rajant_query_node = Node(
44-
package='interface_rajant',
45-
executable='rajant_query.py',
46-
name='rajant_query',
47-
output='screen',
48-
parameters=[{
49-
'robot_name': robot_name,
50-
'robot_configs': robot_configs,
51-
'radio_configs': radio_configs
52-
}]
53-
)
54-
55-
rajant_parser_node = Node(
53+
rajant_peer_rssi = Node(
5654
package='interface_rajant',
57-
executable='rajant_parser.py',
58-
name='rajant_parser',
55+
executable='rajant_peer_rssi.py',
56+
name='rajant_peer_rssi',
5957
output='screen',
6058
parameters=[{
6159
'robot_name': robot_name,
6260
'robot_configs': robot_configs,
63-
'radio_configs': radio_configs
61+
'radio_configs': radio_configs,
62+
'bcapi_jar_file': bcapi_jar_file
6463
}]
6564
)
6665

6766
return LaunchDescription([
6867
robot_name_arg,
6968
robot_configs_arg,
7069
radio_configs_arg,
71-
rajant_query_node,
72-
rajant_parser_node
70+
bcapi_jar_file_arg,
71+
rajant_peer_rssi,
7372
])

0 commit comments

Comments
 (0)