From 27a336624c5f7d7eb875e175425eb49cf94ad39f Mon Sep 17 00:00:00 2001 From: Harold Kim Date: Sat, 18 Jul 2026 13:05:04 -0600 Subject: [PATCH 1/6] Create ground_station.launch.py --- .../launch/ground_station.launch.py | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 waybionic_bringup/launch/ground_station.launch.py diff --git a/waybionic_bringup/launch/ground_station.launch.py b/waybionic_bringup/launch/ground_station.launch.py new file mode 100644 index 0000000..1e2e861 --- /dev/null +++ b/waybionic_bringup/launch/ground_station.launch.py @@ -0,0 +1,63 @@ +import os +from ament_index_python.packages import get_package_share_directory +from launch import LaunchDescription +from launch.actions import DeclareLaunchArgument +from launch.conditions import IfCondition +from launch.substitutions import Command, LaunchConfiguration +from launch_ros.actions import Node + +def generate_launch_description(): + waybionic_desc_dir = get_package_share_directory('waybionic_description') + waybionic_bringup_dir = get_package_share_directory('waybionic_bringup') + + default_model_path = os.path.join(waybionic_desc_dir, 'urdf', 'waybionic_placeholder.urdf') + default_rviz_config_path = os.path.join(waybionic_bringup_dir, 'rviz', 'waybionic_unified.rviz') + + model_arg = DeclareLaunchArgument('model', default_value=default_model_path, description='Absolute path to robot urdf') + use_mock_diag_arg = DeclareLaunchArgument('use_mock_diagnostics', default_value='true', description='Use mock data for diagnostics') + diag_topic_arg = DeclareLaunchArgument('diagnostics_topic', default_value='/diagnostics', description='Diagnostics topic name') + start_temp_pub_arg = DeclareLaunchArgument('start_temporary_diagnostics_publisher', default_value='true', description='Start temporary diagnostics publisher') + use_jsp_gui_arg = DeclareLaunchArgument('use_joint_state_publisher_gui', default_value='true', description='Launch joint state publisher GUI') + use_sim_time_arg = DeclareLaunchArgument('use_sim_time', default_value='false', description='Use simulation time') + launch_rviz_arg = DeclareLaunchArgument('launch_rviz', default_value='true', description='Launch RViz (set false for headless validation)') + rviz_config_arg = DeclareLaunchArgument('rvizconfig', default_value=default_rviz_config_path, description='Absolute path to rviz config file') + + robot_description_content = {'robot_description': Command(['xacro ', LaunchConfiguration('model')])} + rsp_node = Node( + package='robot_state_publisher', + executable='robot_state_publisher', + parameters=[robot_description_content, {'use_sim_time': LaunchConfiguration('use_sim_time')}] + ) + + jsp_gui_node = Node( + package='joint_state_publisher_gui', + executable='joint_state_publisher_gui', + condition=IfCondition(LaunchConfiguration('use_joint_state_publisher_gui')) + ) + + temp_diag_pub_node = Node( + package='waybionic_rviz_plugins', + executable='temporary_diagnostics_publisher', + name='temp_diag_pub', + condition=IfCondition(LaunchConfiguration('start_temporary_diagnostics_publisher')), + parameters=[ + {'use_mock_diagnostics': LaunchConfiguration('use_mock_diagnostics')}, + {'diagnostics_topic': LaunchConfiguration('diagnostics_topic')} + ] + ) + + rviz_node = Node( + package='rviz2', + executable='rviz2', + name='rviz2', + output='screen', + arguments=['-d', LaunchConfiguration('rvizconfig')], + condition=IfCondition(LaunchConfiguration('launch_rviz')), + parameters=[{'use_sim_time': LaunchConfiguration('use_sim_time')}] + ) + + return LaunchDescription([ + model_arg, use_mock_diag_arg, diag_topic_arg, start_temp_pub_arg, + use_jsp_gui_arg, use_sim_time_arg, launch_rviz_arg, rviz_config_arg, + rsp_node, jsp_gui_node, temp_diag_pub_node, rviz_node + ]) From 27b6b4867c95059d4eb038dde496b25e71622c61 Mon Sep 17 00:00:00 2001 From: Harold Kim Date: Sat, 18 Jul 2026 13:59:17 -0600 Subject: [PATCH 2/6] Fixing BuildInstructions.md --- BuildInstructions.md | 8 +- .../launch/ground_station.launch.py | 86 +++++++++++++++---- 2 files changed, 75 insertions(+), 19 deletions(-) diff --git a/BuildInstructions.md b/BuildInstructions.md index 556c930..012cf11 100644 --- a/BuildInstructions.md +++ b/BuildInstructions.md @@ -10,14 +10,16 @@ cd ~/waybionic_ws ``` ## Build and Launch -- Run these commands in your workspace: +- Run these commands from the root of your workspace (`~/waybionic_ws`) to install dependencies and build the foundation: ``` source /opt/ros/jazzy/setup.bash -rosdep install --from-paths . --ignore-src -r -y +rosdep install --from-paths src --ignore-src -r -y colcon build --packages-select waybionic_description waybionic_bringup source install/setup.bash -ros2 launch waybionic_bringup display.launch.py ``` +- Launch using + + - **RViz** and **Joint State Publisher GUI** (separate small window) will pop up after the last command - RViz opens pre-configured with `base_link` fixed frame, `RobotModel`, and `TF` displays already loaded - Move the slider in the Joint State Publisher GUI (small window) to move the arm diff --git a/waybionic_bringup/launch/ground_station.launch.py b/waybionic_bringup/launch/ground_station.launch.py index 1e2e861..2416f3a 100644 --- a/waybionic_bringup/launch/ground_station.launch.py +++ b/waybionic_bringup/launch/ground_station.launch.py @@ -1,32 +1,77 @@ import os + from ament_index_python.packages import get_package_share_directory + from launch import LaunchDescription from launch.actions import DeclareLaunchArgument from launch.conditions import IfCondition from launch.substitutions import Command, LaunchConfiguration from launch_ros.actions import Node + def generate_launch_description(): waybionic_desc_dir = get_package_share_directory('waybionic_description') waybionic_bringup_dir = get_package_share_directory('waybionic_bringup') - default_model_path = os.path.join(waybionic_desc_dir, 'urdf', 'waybionic_placeholder.urdf') - default_rviz_config_path = os.path.join(waybionic_bringup_dir, 'rviz', 'waybionic_unified.rviz') + # Default paths + default_model_path = os.path.join( + waybionic_desc_dir, 'urdf', 'waybionic_placeholder.urdf') + default_rviz_config_path = os.path.join( + waybionic_bringup_dir, 'rviz', 'waybionic_unified.rviz') + + # --- Declare Launch Arguments --- + model_arg = DeclareLaunchArgument( + 'model', + default_value=default_model_path, + description='Absolute path to robot urdf') + + use_mock_diag_arg = DeclareLaunchArgument( + 'use_mock_diagnostics', + default_value='true', + description='Use mock data for diagnostics') + + diag_topic_arg = DeclareLaunchArgument( + 'diagnostics_topic', + default_value='/diagnostics', + description='Diagnostics topic name') + + start_temp_pub_arg = DeclareLaunchArgument( + 'start_temporary_diagnostics_publisher', + default_value='true', + description='Start temporary diagnostics publisher') - model_arg = DeclareLaunchArgument('model', default_value=default_model_path, description='Absolute path to robot urdf') - use_mock_diag_arg = DeclareLaunchArgument('use_mock_diagnostics', default_value='true', description='Use mock data for diagnostics') - diag_topic_arg = DeclareLaunchArgument('diagnostics_topic', default_value='/diagnostics', description='Diagnostics topic name') - start_temp_pub_arg = DeclareLaunchArgument('start_temporary_diagnostics_publisher', default_value='true', description='Start temporary diagnostics publisher') - use_jsp_gui_arg = DeclareLaunchArgument('use_joint_state_publisher_gui', default_value='true', description='Launch joint state publisher GUI') - use_sim_time_arg = DeclareLaunchArgument('use_sim_time', default_value='false', description='Use simulation time') - launch_rviz_arg = DeclareLaunchArgument('launch_rviz', default_value='true', description='Launch RViz (set false for headless validation)') - rviz_config_arg = DeclareLaunchArgument('rvizconfig', default_value=default_rviz_config_path, description='Absolute path to rviz config file') + use_jsp_gui_arg = DeclareLaunchArgument( + 'use_joint_state_publisher_gui', + default_value='true', + description='Launch joint state publisher GUI') + + use_sim_time_arg = DeclareLaunchArgument( + 'use_sim_time', + default_value='false', + description='Use simulation time') + + launch_rviz_arg = DeclareLaunchArgument( + 'launch_rviz', + default_value='true', + description='Launch RViz (set false for headless validation)') + + rviz_config_arg = DeclareLaunchArgument( + 'rvizconfig', + default_value=default_rviz_config_path, + description='Absolute path to rviz config file') + + # --- Nodes --- + robot_description_content = { + 'robot_description': Command(['xacro ', LaunchConfiguration('model')]) + } - robot_description_content = {'robot_description': Command(['xacro ', LaunchConfiguration('model')])} rsp_node = Node( package='robot_state_publisher', executable='robot_state_publisher', - parameters=[robot_description_content, {'use_sim_time': LaunchConfiguration('use_sim_time')}] + parameters=[ + robot_description_content, + {'use_sim_time': LaunchConfiguration('use_sim_time')} + ] ) jsp_gui_node = Node( @@ -37,7 +82,7 @@ def generate_launch_description(): temp_diag_pub_node = Node( package='waybionic_rviz_plugins', - executable='temporary_diagnostics_publisher', + executable='temporary_diagnostics_publisher.py', name='temp_diag_pub', condition=IfCondition(LaunchConfiguration('start_temporary_diagnostics_publisher')), parameters=[ @@ -57,7 +102,16 @@ def generate_launch_description(): ) return LaunchDescription([ - model_arg, use_mock_diag_arg, diag_topic_arg, start_temp_pub_arg, - use_jsp_gui_arg, use_sim_time_arg, launch_rviz_arg, rviz_config_arg, - rsp_node, jsp_gui_node, temp_diag_pub_node, rviz_node + model_arg, + use_mock_diag_arg, + diag_topic_arg, + start_temp_pub_arg, + use_jsp_gui_arg, + use_sim_time_arg, + launch_rviz_arg, + rviz_config_arg, + rsp_node, + jsp_gui_node, + temp_diag_pub_node, + rviz_node ]) From 3a338260b6e78b8a55a4122c9bfad823365ea0dd Mon Sep 17 00:00:00 2001 From: Harold Kim Date: Tue, 21 Jul 2026 15:33:48 -0600 Subject: [PATCH 3/6] Fixing BuildInstructions.md --- BuildInstructions.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/BuildInstructions.md b/BuildInstructions.md index 012cf11..9772877 100644 --- a/BuildInstructions.md +++ b/BuildInstructions.md @@ -17,9 +17,10 @@ rosdep install --from-paths src --ignore-src -r -y colcon build --packages-select waybionic_description waybionic_bringup source install/setup.bash ``` -- Launch using - - +- Launch ground station using: +``` +ros2 launch waybionic_bringup ground_station.launch.py +``` - **RViz** and **Joint State Publisher GUI** (separate small window) will pop up after the last command - RViz opens pre-configured with `base_link` fixed frame, `RobotModel`, and `TF` displays already loaded - Move the slider in the Joint State Publisher GUI (small window) to move the arm From 906263f3271def41f7e0c0fe9497940d19d0eff4 Mon Sep 17 00:00:00 2001 From: Harold Kim Date: Sat, 25 Jul 2026 12:35:32 -0600 Subject: [PATCH 4/6] Add waybionic_unified.rviz, add test for launching ground station --- .../launch/ground_station.launch.py | 90 ++++---- waybionic_bringup/rviz/waybionic_unified.rviz | 199 ++++++++++++++++++ .../test/test_ground_station_launch.py | 40 ++++ 3 files changed, 280 insertions(+), 49 deletions(-) create mode 100644 waybionic_bringup/rviz/waybionic_unified.rviz create mode 100644 waybionic_bringup/test/test_ground_station_launch.py diff --git a/waybionic_bringup/launch/ground_station.launch.py b/waybionic_bringup/launch/ground_station.launch.py index 2416f3a..e6ed90f 100644 --- a/waybionic_bringup/launch/ground_station.launch.py +++ b/waybionic_bringup/launch/ground_station.launch.py @@ -3,17 +3,26 @@ from ament_index_python.packages import get_package_share_directory from launch import LaunchDescription -from launch.actions import DeclareLaunchArgument +from launch.actions import DeclareLaunchArgument, OpaqueFunction from launch.conditions import IfCondition from launch.substitutions import Command, LaunchConfiguration from launch_ros.actions import Node +def check_files_exist(context, *args, **kwargs): + model_path = LaunchConfiguration('model').perform(context) + rviz_path = LaunchConfiguration('rvizconfig').perform(context) + if not os.path.exists(model_path): + raise FileNotFoundError(f'Model file not found: {model_path}') + if not os.path.exists(rviz_path): + raise FileNotFoundError(f'RViz config file not found: {rviz_path}') + return [] + + def generate_launch_description(): waybionic_desc_dir = get_package_share_directory('waybionic_description') waybionic_bringup_dir = get_package_share_directory('waybionic_bringup') - # Default paths default_model_path = os.path.join( waybionic_desc_dir, 'urdf', 'waybionic_placeholder.urdf') default_rviz_config_path = os.path.join( @@ -21,97 +30,80 @@ def generate_launch_description(): # --- Declare Launch Arguments --- model_arg = DeclareLaunchArgument( - 'model', - default_value=default_model_path, + 'model', default_value=default_model_path, description='Absolute path to robot urdf') use_mock_diag_arg = DeclareLaunchArgument( - 'use_mock_diagnostics', - default_value='true', - description='Use mock data for diagnostics') + 'use_mock_diagnostics', default_value='true', + description='Panel mode: true for internal mock, false for live topics') diag_topic_arg = DeclareLaunchArgument( - 'diagnostics_topic', - default_value='/diagnostics', + 'diagnostics_topic', default_value='/diagnostics', description='Diagnostics topic name') start_temp_pub_arg = DeclareLaunchArgument( - 'start_temporary_diagnostics_publisher', - default_value='true', - description='Start temporary diagnostics publisher') + 'start_temporary_diagnostics_publisher', default_value='false', + description='Start the optional temporary publisher for live demo') use_jsp_gui_arg = DeclareLaunchArgument( - 'use_joint_state_publisher_gui', - default_value='true', + 'use_joint_state_publisher_gui', default_value='true', description='Launch joint state publisher GUI') use_sim_time_arg = DeclareLaunchArgument( - 'use_sim_time', - default_value='false', + 'use_sim_time', default_value='false', description='Use simulation time') launch_rviz_arg = DeclareLaunchArgument( - 'launch_rviz', - default_value='true', + 'launch_rviz', default_value='true', description='Launch RViz (set false for headless validation)') rviz_config_arg = DeclareLaunchArgument( - 'rvizconfig', - default_value=default_rviz_config_path, + 'rvizconfig', default_value=default_rviz_config_path, description='Absolute path to rviz config file') + file_check = OpaqueFunction(function=check_files_exist) + # --- Nodes --- robot_description_content = { 'robot_description': Command(['xacro ', LaunchConfiguration('model')]) } rsp_node = Node( - package='robot_state_publisher', - executable='robot_state_publisher', - parameters=[ - robot_description_content, - {'use_sim_time': LaunchConfiguration('use_sim_time')} - ] + package='robot_state_publisher', executable='robot_state_publisher', + parameters=[robot_description_content, {'use_sim_time': LaunchConfiguration('use_sim_time')}] ) jsp_gui_node = Node( - package='joint_state_publisher_gui', - executable='joint_state_publisher_gui', + package='joint_state_publisher_gui', executable='joint_state_publisher_gui', condition=IfCondition(LaunchConfiguration('use_joint_state_publisher_gui')) ) + # Pass the correct arguments to the temporary publisher temp_diag_pub_node = Node( - package='waybionic_rviz_plugins', - executable='temporary_diagnostics_publisher.py', + package='waybionic_rviz_plugins', executable='temporary_diagnostics_publisher.py', name='temp_diag_pub', condition=IfCondition(LaunchConfiguration('start_temporary_diagnostics_publisher')), parameters=[ - {'use_mock_diagnostics': LaunchConfiguration('use_mock_diagnostics')}, - {'diagnostics_topic': LaunchConfiguration('diagnostics_topic')} + {'mode': 'mock'}, + {'topic': LaunchConfiguration('diagnostics_topic')}, + {'publish_rate_hz': 10.0} ] ) + # Pass the mock toggles into the RViz node parameters rviz_node = Node( - package='rviz2', - executable='rviz2', - name='rviz2', - output='screen', + package='rviz2', executable='rviz2', name='rviz2', output='screen', arguments=['-d', LaunchConfiguration('rvizconfig')], condition=IfCondition(LaunchConfiguration('launch_rviz')), - parameters=[{'use_sim_time': LaunchConfiguration('use_sim_time')}] + parameters=[ + {'use_sim_time': LaunchConfiguration('use_sim_time')}, + {'use_mock_diagnostics': LaunchConfiguration('use_mock_diagnostics')}, + {'diagnostics_topic': LaunchConfiguration('diagnostics_topic')} + ] ) return LaunchDescription([ - model_arg, - use_mock_diag_arg, - diag_topic_arg, - start_temp_pub_arg, - use_jsp_gui_arg, - use_sim_time_arg, - launch_rviz_arg, - rviz_config_arg, - rsp_node, - jsp_gui_node, - temp_diag_pub_node, - rviz_node + model_arg, use_mock_diag_arg, diag_topic_arg, start_temp_pub_arg, + use_jsp_gui_arg, use_sim_time_arg, launch_rviz_arg, rviz_config_arg, + file_check, rsp_node, jsp_gui_node, temp_diag_pub_node, rviz_node ]) diff --git a/waybionic_bringup/rviz/waybionic_unified.rviz b/waybionic_bringup/rviz/waybionic_unified.rviz new file mode 100644 index 0000000..135994e --- /dev/null +++ b/waybionic_bringup/rviz/waybionic_unified.rviz @@ -0,0 +1,199 @@ +Panels: + - Class: rviz_common/Displays + Help Height: 70 + Name: Displays + Property Tree Widget: + Expanded: + - /Global Options1 + - /Status1 + - /RobotModel1 + - /RobotModel1/Description Topic1 + Splitter Ratio: 0.5 + Tree Height: 70 + - Class: rviz_common/Selection + Name: Selection + - Class: rviz_common/Tool Properties + Expanded: + - /2D Goal Pose1 + - /Publish Point1 + Name: Tool Properties + Splitter Ratio: 0.5886790156364441 + - Class: rviz_common/Views + Expanded: + - /Current View1 + Name: Views + Splitter Ratio: 0.5 + - Class: rviz_common/Time + Experimental: false + Name: Time + SyncMode: 0 + SyncSource: "" + - Class: waybionic_rviz_plugins/DiagnosticsPanel + Diagnostics Topic: /diagnostics + Name: DiagnosticsPanel + Use Mock Diagnostics: true +Visualization Manager: + Class: "" + Displays: + - Alpha: 0.5 + Cell Size: 1 + Class: rviz_default_plugins/Grid + Color: 160; 160; 164 + Enabled: true + Line Style: + Line Width: 0.029999999329447746 + Value: Lines + Name: Grid + Normal Cell Count: 0 + Offset: + X: 0 + Y: 0 + Z: 0 + Plane: XY + Plane Cell Count: 10 + Reference Frame: + Value: true + - Alpha: 1 + Class: rviz_default_plugins/RobotModel + Collision Enabled: false + Description File: "" + Description Source: Topic + Description Topic: + Depth: 5 + Durability Policy: Volatile + History Policy: Keep Last + Reliability Policy: Reliable + Value: /robot_description + Enabled: true + Links: + All Links Enabled: true + Expand Joint Details: false + Expand Link Details: false + Expand Tree: false + Link Tree Style: Links in Alphabetic Order + arm_link: + Alpha: 1 + Show Axes: false + Show Trail: false + Value: true + base_link: + Alpha: 1 + Show Axes: false + Show Trail: false + Value: true + Mass Properties: + Inertia: false + Mass: false + Name: RobotModel + TF Prefix: "" + Update Interval: 0 + Value: true + Visual Enabled: true + - Class: rviz_default_plugins/TF + Enabled: true + Filter (blacklist): "" + Filter (whitelist): "" + Frame Timeout: 15 + Frames: + All Enabled: true + arm_link: + Value: true + base_link: + Value: true + Marker Scale: 1 + Name: TF + Show Arrows: true + Show Axes: true + Show Names: false + Tree: + base_link: + arm_link: + {} + Update Interval: 0 + Value: true + Enabled: true + Global Options: + Background Color: 48; 48; 48 + Fixed Frame: base_link + Frame Rate: 30 + Name: root + Tools: + - Class: rviz_default_plugins/Interact + Hide Inactive Objects: true + - Class: rviz_default_plugins/MoveCamera + - Class: rviz_default_plugins/Select + - Class: rviz_default_plugins/FocusCamera + - Class: rviz_default_plugins/Measure + Line color: 128; 128; 0 + - Class: rviz_default_plugins/SetInitialPose + Covariance x: 0.25 + Covariance y: 0.25 + Covariance yaw: 0.06853891909122467 + Topic: + Depth: 5 + Durability Policy: Volatile + History Policy: Keep Last + Reliability Policy: Reliable + Value: /initialpose + - Class: rviz_default_plugins/SetGoal + Topic: + Depth: 5 + Durability Policy: Volatile + History Policy: Keep Last + Reliability Policy: Reliable + Value: /goal_pose + - Class: rviz_default_plugins/PublishPoint + Single click: true + Topic: + Depth: 5 + Durability Policy: Volatile + History Policy: Keep Last + Reliability Policy: Reliable + Value: /clicked_point + Transformation: + Current: + Class: rviz_default_plugins/TF + Value: true + Views: + Current: + Class: rviz_default_plugins/Orbit + Distance: 1.5597326755523682 + Enable Stereo Rendering: + Stereo Eye Separation: 0.05999999865889549 + Stereo Focal Distance: 1 + Swap Stereo Eyes: false + Value: false + Focal Point: + X: 0 + Y: 0 + Z: 0 + Focal Shape Fixed Size: true + Focal Shape Size: 0.05000000074505806 + Invert Z Axis: false + Name: Current View + Near Clip Distance: 0.009999999776482582 + Pitch: 0.785398006439209 + Target Frame: + Value: Orbit (rviz) + Yaw: 0.785398006439209 + Saved: ~ +Window Geometry: + DiagnosticsPanel: + collapsed: false + Displays: + collapsed: false + Height: 2055 + Hide Left Dock: false + Hide Right Dock: false + QMainWindow State: 000000ff00000000fd0000000400000000000001a400000774fc020000000bfb0000001200530065006c0065006300740069006f006e00000001e10000009b0000005c00fffffffb0000001e0054006f006f006c002000500072006f007000650072007400690065007302000001ed000001df00000185000000a3fb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afb000000100044006900730070006c006100790073010000003b000000c7000000c700fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c00000261fb000000200044006900610067006e006f0073007400690063007300500061006e0065006c0100000108000002330000023400fffffffb000000200044006900610067006e006f0073007400690063007300500061006e0065006c0100000341000002340000023400fffffffb000000200044006900610067006e006f0073007400690063007300500061006e0065006c010000057b000002340000023400ffffff000000010000010f00000774fc0200000003fb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000000a00560069006500770073010000003b00000774000000a000fffffffb0000001200530065006c0065006300740069006f006e010000025a000000b200000000000000000000000200000490000000a9fc0100000001fb0000000a00560069006500770073030000004e00000080000002e10000019700000003000002ea00000037fc0100000002fb0000000800540069006d00650100000000000002ea0000025300fffffffb0000000800540069006d006501000000000000045000000000000000000000002b0000077500000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000 + Selection: + collapsed: false + Time: + collapsed: false + Tool Properties: + collapsed: false + Views: + collapsed: false + Width: 746 + X: 57 + Y: 4 diff --git a/waybionic_bringup/test/test_ground_station_launch.py b/waybionic_bringup/test/test_ground_station_launch.py new file mode 100644 index 0000000..a325882 --- /dev/null +++ b/waybionic_bringup/test/test_ground_station_launch.py @@ -0,0 +1,40 @@ +import os + +from ament_index_python.packages import get_package_share_directory + +import launch +from launch.actions import IncludeLaunchDescription +from launch.launch_description_sources import PythonLaunchDescriptionSource + +import launch_testing +import launch_testing.actions + +import pytest + +import unittest + + +@pytest.mark.launch_test +def generate_test_description(): + bringup_dir = get_package_share_directory('waybionic_bringup') + launch_file = os.path.join(bringup_dir, 'launch', 'ground_station.launch.py') + + ground_station_launch = IncludeLaunchDescription( + PythonLaunchDescriptionSource(launch_file), + launch_arguments={ + 'launch_rviz': 'false', + 'use_joint_state_publisher_gui': 'false', + 'start_temporary_diagnostics_publisher': 'true' + }.items() + ) + + return launch.LaunchDescription([ + ground_station_launch, + launch_testing.actions.ReadyToTest() + ]) + + +class TestGroundStationLaunch(unittest.TestCase): + def test_nodes_started(self, proc_info, proc_output): + proc_info.assertWaitForStartup(process=None, timeout=5) + assert True From 7d7523b73e5bd56350f35d338f3505dcad2a2096 Mon Sep 17 00:00:00 2001 From: Harold Kim Date: Sat, 25 Jul 2026 12:55:22 -0600 Subject: [PATCH 5/6] Fixes to pass CI --- .../launch/ground_station.launch.py | 5 ++++- .../test/test_ground_station_launch.py | 7 ++----- ...ackage_metadata.cpython-312-pytest-7.4.4.pyc | Bin 0 -> 13494 bytes 3 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 waybionic_rviz_plugins/test/__pycache__/test_package_metadata.cpython-312-pytest-7.4.4.pyc diff --git a/waybionic_bringup/launch/ground_station.launch.py b/waybionic_bringup/launch/ground_station.launch.py index e6ed90f..3fda602 100644 --- a/waybionic_bringup/launch/ground_station.launch.py +++ b/waybionic_bringup/launch/ground_station.launch.py @@ -70,7 +70,10 @@ def generate_launch_description(): rsp_node = Node( package='robot_state_publisher', executable='robot_state_publisher', - parameters=[robot_description_content, {'use_sim_time': LaunchConfiguration('use_sim_time')}] + parameters=[ + robot_description_content, + {'use_sim_time': LaunchConfiguration('use_sim_time')} + ] ) jsp_gui_node = Node( diff --git a/waybionic_bringup/test/test_ground_station_launch.py b/waybionic_bringup/test/test_ground_station_launch.py index a325882..f972628 100644 --- a/waybionic_bringup/test/test_ground_station_launch.py +++ b/waybionic_bringup/test/test_ground_station_launch.py @@ -1,18 +1,14 @@ import os +import unittest from ament_index_python.packages import get_package_share_directory - import launch from launch.actions import IncludeLaunchDescription from launch.launch_description_sources import PythonLaunchDescriptionSource - import launch_testing import launch_testing.actions - import pytest -import unittest - @pytest.mark.launch_test def generate_test_description(): @@ -35,6 +31,7 @@ def generate_test_description(): class TestGroundStationLaunch(unittest.TestCase): + def test_nodes_started(self, proc_info, proc_output): proc_info.assertWaitForStartup(process=None, timeout=5) assert True diff --git a/waybionic_rviz_plugins/test/__pycache__/test_package_metadata.cpython-312-pytest-7.4.4.pyc b/waybionic_rviz_plugins/test/__pycache__/test_package_metadata.cpython-312-pytest-7.4.4.pyc new file mode 100644 index 0000000000000000000000000000000000000000..1a88b57fe5739ded77a0397369d864fb78f323ab GIT binary patch literal 13494 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 literal 0 HcmV?d00001 From 6544d3929105994679f08e48145d2af21a482f90 Mon Sep 17 00:00:00 2001 From: Harold Kim Date: Mon, 27 Jul 2026 14:52:17 -0600 Subject: [PATCH 6/6] Address PR comments --- .gitignore | 3 ++- BuildInstructions.md | 2 +- scripts/check_waybionic_ws.sh | 2 +- waybionic_bringup/CMakeLists.txt | 7 ++----- .../launch/ground_station.launch.py | 2 +- waybionic_bringup/package.xml | 2 ++ .../test/test_ground_station_launch.py | 9 ++++++++- ...ackage_metadata.cpython-312-pytest-7.4.4.pyc | Bin 13494 -> 0 bytes 8 files changed, 17 insertions(+), 10 deletions(-) delete mode 100644 waybionic_rviz_plugins/test/__pycache__/test_package_metadata.cpython-312-pytest-7.4.4.pyc diff --git a/.gitignore b/.gitignore index 28b0c9f..5f94900 100644 --- a/.gitignore +++ b/.gitignore @@ -75,4 +75,5 @@ bld/ # NUNIT *.VisualState.xml -TestResult.xml \ No newline at end of file +TestResult.xml__pycache__/ +*.pyc diff --git a/BuildInstructions.md b/BuildInstructions.md index 9772877..31c0765 100644 --- a/BuildInstructions.md +++ b/BuildInstructions.md @@ -14,7 +14,7 @@ cd ~/waybionic_ws ``` source /opt/ros/jazzy/setup.bash rosdep install --from-paths src --ignore-src -r -y -colcon build --packages-select waybionic_description waybionic_bringup +colcon build source install/setup.bash ``` - Launch ground station using: diff --git a/scripts/check_waybionic_ws.sh b/scripts/check_waybionic_ws.sh index da07b4b..4a2ea32 100755 --- a/scripts/check_waybionic_ws.sh +++ b/scripts/check_waybionic_ws.sh @@ -16,7 +16,7 @@ echo "2. Checking dependencies with rosdep..." rosdep install --from-paths src --ignore-src -r -y echo "3. Building Waybionic packages..." -colcon build --packages-select waybionic_description waybionic_bringup +colcon build echo "4. Sourcing workspace..." source install/setup.bash diff --git a/waybionic_bringup/CMakeLists.txt b/waybionic_bringup/CMakeLists.txt index 962f006..fba831a 100644 --- a/waybionic_bringup/CMakeLists.txt +++ b/waybionic_bringup/CMakeLists.txt @@ -13,14 +13,11 @@ find_package(ament_cmake REQUIRED) if(BUILD_TESTING) find_package(ament_lint_auto REQUIRED) - # the following line skips the linter which checks for copyrights - # comment the line when a copyright and license is added to all source files + find_package(launch_testing_ament_cmake REQUIRED) set(ament_cmake_copyright_FOUND TRUE) - # the following line skips cpplint (only works in a git repo) - # comment the line when this package is in a git repo and when - # a copyright and license is added to all source files set(ament_cmake_cpplint_FOUND TRUE) ament_lint_auto_find_test_dependencies() + add_launch_test(test/test_ground_station_launch.py) endif() install(DIRECTORY launch diff --git a/waybionic_bringup/launch/ground_station.launch.py b/waybionic_bringup/launch/ground_station.launch.py index 3fda602..2183b8b 100644 --- a/waybionic_bringup/launch/ground_station.launch.py +++ b/waybionic_bringup/launch/ground_station.launch.py @@ -87,7 +87,7 @@ def generate_launch_description(): name='temp_diag_pub', condition=IfCondition(LaunchConfiguration('start_temporary_diagnostics_publisher')), parameters=[ - {'mode': 'mock'}, + {'mode': 'normal'}, {'topic': LaunchConfiguration('diagnostics_topic')}, {'publish_rate_hz': 10.0} ] diff --git a/waybionic_bringup/package.xml b/waybionic_bringup/package.xml index bb3772f..f262ccb 100644 --- a/waybionic_bringup/package.xml +++ b/waybionic_bringup/package.xml @@ -12,6 +12,7 @@ ament_index_python xacro waybionic_description + waybionic_rviz_plugins launch launch_ros robot_state_publisher @@ -20,6 +21,7 @@ ament_lint_auto ament_lint_common + launch_testing_ament_cmake ament_cmake diff --git a/waybionic_bringup/test/test_ground_station_launch.py b/waybionic_bringup/test/test_ground_station_launch.py index f972628..cee03d3 100644 --- a/waybionic_bringup/test/test_ground_station_launch.py +++ b/waybionic_bringup/test/test_ground_station_launch.py @@ -34,4 +34,11 @@ class TestGroundStationLaunch(unittest.TestCase): def test_nodes_started(self, proc_info, proc_output): proc_info.assertWaitForStartup(process=None, timeout=5) - assert True + assert len(proc_info.processes()) > 0, 'No processes were started!' + + +@launch_testing.post_shutdown_test() +class TestProcessOutput(unittest.TestCase): + + def test_exit_codes(self, proc_info): + launch_testing.asserts.assertExitCodes(proc_info, allowable_exit_codes=[0, -2]) diff --git a/waybionic_rviz_plugins/test/__pycache__/test_package_metadata.cpython-312-pytest-7.4.4.pyc b/waybionic_rviz_plugins/test/__pycache__/test_package_metadata.cpython-312-pytest-7.4.4.pyc deleted file mode 100644 index 1a88b57fe5739ded77a0397369d864fb78f323ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13494 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