Skip to content

Commit

Permalink
Merge pull request #18 from CMU-Robotics-Club/sw/20230331
Browse files Browse the repository at this point in the history
Merge 2023 Raceday code with Main
  • Loading branch information
Jackack authored Sep 20, 2023
2 parents c742340 + 67cee23 commit 637454e
Show file tree
Hide file tree
Showing 11 changed files with 763 additions and 61 deletions.
5 changes: 2 additions & 3 deletions rb_ws/src/buggy/launch/main.launch
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<launch>
<arg name="controller" default="stanley" />
<arg name="start_dist" default="0.0" />
<include file="$(find microstrain_inertial_driver)/launch/microstrain.launch">
<arg name="params_file" value="/rb_ws/src/buggy/INS_params.yml"/>
</include>
Expand All @@ -23,10 +24,8 @@
<param name="baud" type="int" value="115200"/>
</node>
<node name="foxglove" pkg="foxglove_bridge" type="foxglove_bridge" />
<node name="asset_server" pkg="buggy" type="asset_server.py" args="--directory='/rb_ws/src/buggy/assets'" />
<node name="asset_publish" pkg="buggy" type="asset_publish.py" />
<node name="telematics" pkg="buggy" type="telematics.py" />

<!-- ENABLE AUTON -->
<node name="auton_system" pkg="buggy" type="autonsystem.py" output="screen" args="$(arg controller)"/>
<node name="auton_system" pkg="buggy" type="autonsystem.py" output="screen" args="$(arg controller) $(arg start_dist)"/>
</launch>
3 changes: 2 additions & 1 deletion rb_ws/src/buggy/launch/sim_2d.launch
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

<launch>
<arg name="controller" default="stanley" />
<arg name="start_dist" default="0.0" />
<node name="foxglove" pkg="foxglove_bridge" type="foxglove_bridge" />
<node name="mpc_calculator" pkg="buggy" type="model_predictive_controller.py" output="screen"/>

Expand All @@ -12,5 +13,5 @@
<!-- <node name="sim_2d_visualizer" pkg="buggy" type="grapher.py" output="screen"/> -->
<node name="sim_2d_controller" pkg="buggy" type="controller_2d.py" output="screen"/>

<node name="auton_system" pkg="buggy" type="autonsystem.py" output="screen" args="$(arg controller)"/>
<node name="auton_system" pkg="buggy" type="autonsystem.py" output="screen" args="$(arg controller) $(arg start_dist)"/>
</launch>
Loading

0 comments on commit 637454e

Please sign in to comment.