Skip to content

Commit

Permalink
updated garmin topic for the new simulation
Browse files Browse the repository at this point in the history
  • Loading branch information
klaxalk committed Jan 31, 2024
1 parent d0ef05c commit fccf071
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
3 changes: 1 addition & 2 deletions launch/api.launch
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@
<remap if="$(eval arg('OLD_PX4_FW') == 0)" from="~mavros_local_position_in" to="mavros/odometry/in" />
<remap if="$(eval arg('OLD_PX4_FW') == 1)" from="~mavros_local_position_in" to="mavros/local_position/odom" />
<remap from="~mavros_global_position_in" to="mavros/global_position/global" />
<remap if="$(eval arg('RUN_TYPE') == 'simulation')" from="~mavros_garmin_in" to="garmin/range" />
<remap if="$(eval arg('RUN_TYPE') == 'realworld')" from="~mavros_garmin_in" to="mavros/distance_sensor/garmin" />
<remap from="~mavros_garmin_in" to="mavros/distance_sensor/garmin" />
<remap from="~mavros_imu_in" to="mavros/imu/data" />
<remap from="~mavros_magnetometer_in" to="mavros/global_position/compass_hdg" />
<remap from="~mavros_magnetic_field_in" to="mavros/imu/mag" />
Expand Down
3 changes: 2 additions & 1 deletion launch/mavros_gazebo_simulation.launch
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,15 @@

<!-- MAVROS -->
<node pkg="mavros" type="mavros_node" name="mavros" required="$(eval not respawn_mavros)" clear_params="true" output="$(arg log_output)" respawn="$(arg respawn_mavros)">

<param name="fcu_url" value="$(arg fcu_url)" />
<param name="gcs_url" value="$(arg gcs_url)" />
<param name="target_system_id" value="$(arg tgt_system)" />
<param name="target_component_id" value="$(arg tgt_component)" />
<param name="fcu_protocol" value="$(arg fcu_protocol)" />

<param name="distance_sensor/garmin/id" value="0" />
<param name="distance_sensor/garmin/frame_id" value="uav$(arg ID)/garmin" />

<param name="local_position/frame_id" value="uav$(arg ID)/pixhawk_origin" />
<param name="local_position/tf/child_frame_id" value="uav$(arg ID)/fcu" />
<param name="imu/frame_id" value="uav$(arg ID)/fcu" />
Expand Down

0 comments on commit fccf071

Please sign in to comment.