Skip to content

Commit

Permalink
Reduce /<robot_name>/pose topic bandwidth (#402)
Browse files Browse the repository at this point in the history
* check topic heartbeat and log /X*/pose topics

* use pose_v and subt to pose_static

* cleanup

* Rename parameters

* move heartbeat check into its own thread

Co-authored-by: Nate Koenig <nate@openrobotics.org>
  • Loading branch information
iche033 and Nate Koenig authored May 14, 2020
1 parent 9132c0c commit e615b31
Show file tree
Hide file tree
Showing 39 changed files with 327 additions and 19 deletions.
6 changes: 6 additions & 0 deletions ign_migration_scripts/launch/preview.ign
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,9 @@
<publish_collision_pose>false</publish_collision_pose>
<publish_visual_pose>false</publish_visual_pose>
<publish_nested_model_pose>#{$enableGroundTruth}</publish_nested_model_pose>
<use_pose_vector_msg>true</use_pose_vector_msg>
<static_publisher>true</static_publisher>
<static_update_frequency>1</static_update_frequency>
</plugin>
<!-- Battery plugin -->
</include>
Expand Down Expand Up @@ -256,6 +259,9 @@
<publish_collision_pose>false</publish_collision_pose>
<publish_visual_pose>false</publish_visual_pose>
<publish_nested_model_pose>#{$enableGroundTruth}</publish_nested_model_pose>
<use_pose_vector_msg>true</use_pose_vector_msg>
<static_publisher>true</static_publisher>
<static_update_frequency>1</static_update_frequency>
</plugin>
<plugin filename="libignition-gazebo-multicopter-motor-model-system.so"
name="ignition::gazebo::systems::MulticopterMotorModel">
Expand Down
3 changes: 3 additions & 0 deletions ign_migration_scripts/scripts/spawn_preview_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ def spawn_preview_model(args):
etree.SubElement(plugin, 'publish_collision_pose').text = 'false'
etree.SubElement(plugin, 'publish_visual_pose').text = 'false'
etree.SubElement(plugin, 'publish_nested_model_pose').text = 'true'
etree.SubElement(plugin, 'use_pose_vector_msg').text = 'true'
etree.SubElement(plugin, 'static_publisher').text = 'true'
etree.SubElement(plugin, 'static_update_frequency').text = '1'

sdf_esc = etree.tostring(sdf, encoding="unicode",
with_tail=False).replace('"', r'\"').replace('\n', '')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ def spawner(_name, _modelURI, _worldName, _x, _y, _z, _roll, _pitch, _yaw)
<publish_collision_pose>false</publish_collision_pose>
<publish_visual_pose>false</publish_visual_pose>
<publish_nested_model_pose>#{$enableGroundTruth}</publish_nested_model_pose>
<use_pose_vector_msg>true</use_pose_vector_msg>
<static_publisher>true</static_publisher>
<static_update_frequency>1</static_update_frequency>
</plugin>
<!-- Battery plugin -->
<plugin filename="libignition-gazebo-linearbatteryplugin-system.so"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,16 @@
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose"
args="/model/$(arg name)/pose@geometry_msgs/TransformStamped[ignition.msgs.Pose">
args="/model/$(arg name)/pose@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose" to="pose"/>
</node>
<node
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose_static"
args="/model/$(arg name)/pose_static@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose_static" to="pose_static"/>
</node>

<node
pkg="subt_ros"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ def spawner(_name, _modelURI, _worldName, _x, _y, _z, _roll, _pitch, _yaw)
<publish_collision_pose>false</publish_collision_pose>
<publish_visual_pose>false</publish_visual_pose>
<publish_nested_model_pose>#{$enableGroundTruth}</publish_nested_model_pose>
<use_pose_vector_msg>true</use_pose_vector_msg>
<static_publisher>true</static_publisher>
<static_update_frequency>1</static_update_frequency>
</plugin>
<!-- Battery plugin -->
<plugin filename="libignition-gazebo-linearbatteryplugin-system.so"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,16 @@
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose"
args="/model/$(arg name)/pose@geometry_msgs/TransformStamped[ignition.msgs.Pose">
args="/model/$(arg name)/pose@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose" to="pose"/>
</node>

<node
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose_static"
args="/model/$(arg name)/pose_static@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose_static" to="pose_static"/>
</node>
<node
pkg="subt_ros"
type="pose_tf_broadcaster"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ def spawner(_name, _modelURI, _worldName, _x, _y, _z, _roll, _pitch, _yaw)
" <publish_collision_pose>false</publish_collision_pose>\n"\
" <publish_visual_pose>false</publish_visual_pose>\n"\
" <publish_nested_model_pose>#{$enableGroundTruth}</publish_nested_model_pose>\n"\
" <use_pose_vector_msg>true</use_pose_vector_msg>\n"\
" <static_publisher>true</static_publisher>\n"\
" <static_update_frequency>1</static_update_frequency>\n"\
" </plugin>\n"\
" <!-- Battery plugin -->\n"\
" <plugin filename=\"libignition-gazebo-linearbatteryplugin-system.so\"\n"\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,16 @@
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose"
args="/model/$(arg name)/pose@geometry_msgs/TransformStamped[ignition.msgs.Pose">
args="/model/$(arg name)/pose@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose" to="pose"/>
</node>
<node
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose_static"
args="/model/$(arg name)/pose_static@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose_static" to="pose_static"/>
</node>
<node
pkg="ros_ign_bridge"
type="parameter_bridge"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ def spawner(_name, _modelURI, _worldName, _x, _y, _z, _roll, _pitch, _yaw)
<publish_collision_pose>false</publish_collision_pose>
<publish_visual_pose>false</publish_visual_pose>
<publish_nested_model_pose>#{$enableGroundTruth}</publish_nested_model_pose>
<use_pose_vector_msg>true</use_pose_vector_msg>
<static_publisher>true</static_publisher>
<static_update_frequency>1</static_update_frequency>
</plugin>
<!-- Battery plugin -->
<plugin filename="libignition-gazebo-linearbatteryplugin-system.so"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,16 @@
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose"
args="/model/$(arg name)/pose@geometry_msgs/TransformStamped[ignition.msgs.Pose">
args="/model/$(arg name)/pose@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose" to="pose"/>
</node>
<node
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose_static"
args="/model/$(arg name)/pose_static@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose_static" to="pose_static"/>
</node>
<node
pkg="ros_ign_bridge"
type="parameter_bridge"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ def spawner(_name, _modelURI, _worldName, _x, _y, _z, _roll, _pitch, _yaw)
<publish_collision_pose>false</publish_collision_pose>
<publish_visual_pose>false</publish_visual_pose>
<publish_nested_model_pose>#{$enableGroundTruth}</publish_nested_model_pose>
<use_pose_vector_msg>true</use_pose_vector_msg>
<static_publisher>true</static_publisher>
<static_update_frequency>1</static_update_frequency>
</plugin>
<plugin filename="libignition-gazebo-multicopter-motor-model-system.so"
name="ignition::gazebo::systems::MulticopterMotorModel">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,16 @@
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose"
args="/model/$(arg name)/pose@geometry_msgs/TransformStamped[ignition.msgs.Pose">
args="/model/$(arg name)/pose@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose" to="pose"/>
</node>
<node
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose_static"
args="/model/$(arg name)/pose_static@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose_static" to="pose_static"/>
</node>
<node
pkg="ros_ign_bridge"
type="parameter_bridge"
Expand Down
3 changes: 3 additions & 0 deletions submitted_models/ssci_x2_sensor_config_1/launch/spawner.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ def spawner(_name, _modelURI, _worldName, _x, _y, _z, _roll, _pitch, _yaw)
<publish_collision_pose>false</publish_collision_pose>
<publish_visual_pose>false</publish_visual_pose>
<publish_nested_model_pose>#{$enableGroundTruth}</publish_nested_model_pose>
<use_pose_vector_msg>true</use_pose_vector_msg>
<static_publisher>true</static_publisher>
<static_update_frequency>1</static_update_frequency>
</plugin>
<!-- Battery plugin -->
<plugin filename=\"libignition-gazebo-linearbatteryplugin-system.so\"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,16 @@
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose"
args="/model/$(arg name)/pose@geometry_msgs/TransformStamped[ignition.msgs.Pose">
args="/model/$(arg name)/pose@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose" to="pose"/>
</node>
<node
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose_static"
args="/model/$(arg name)/pose_static@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose_static" to="pose_static"/>
</node>
<node
pkg="ros_ign_bridge"
type="parameter_bridge"
Expand Down
3 changes: 3 additions & 0 deletions submitted_models/ssci_x4_sensor_config_1/launch/spawner.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ def spawner(_name, _modelURI, _worldName, _x, _y, _z, _roll, _pitch, _yaw)
<publish_collision_pose>false</publish_collision_pose>
<publish_visual_pose>false</publish_visual_pose>
<publish_nested_model_pose>#{$enableGroundTruth}</publish_nested_model_pose>
<use_pose_vector_msg>true</use_pose_vector_msg>
<static_publisher>true</static_publisher>
<static_update_frequency>1</static_update_frequency>
</plugin>
<plugin filename="libignition-gazebo-multicopter-motor-model-system.so"
name="ignition::gazebo::systems::MulticopterMotorModel">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,16 @@
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose"
args="/model/$(arg name)/pose@geometry_msgs/TransformStamped[ignition.msgs.Pose">
args="/model/$(arg name)/pose@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose" to="pose"/>
</node>
<node
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose_static"
args="/model/$(arg name)/pose_static@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose_static" to="pose_static"/>
</node>
<node
pkg="ros_ign_bridge"
type="parameter_bridge"
Expand Down
3 changes: 3 additions & 0 deletions submitted_models/ssci_x4_sensor_config_2/launch/spawner.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ def spawner(_name, _modelURI, _worldName, _x, _y, _z, _roll, _pitch, _yaw)
<publish_collision_pose>false</publish_collision_pose>
<publish_visual_pose>false</publish_visual_pose>
<publish_nested_model_pose>#{$enableGroundTruth}</publish_nested_model_pose>
<use_pose_vector_msg>true</use_pose_vector_msg>
<static_publisher>true</static_publisher>
<static_update_frequency>1</static_update_frequency>
</plugin>
<plugin filename="libignition-gazebo-multicopter-motor-model-system.so"
name="ignition::gazebo::systems::MulticopterMotorModel">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,16 @@
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose"
args="/model/$(arg name)/pose@geometry_msgs/TransformStamped[ignition.msgs.Pose">
args="/model/$(arg name)/pose@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose" to="pose"/>
</node>
<node
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose_static"
args="/model/$(arg name)/pose_static@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose_static" to="pose_static"/>
</node>
<node
pkg="ros_ign_bridge"
type="parameter_bridge"
Expand Down
3 changes: 3 additions & 0 deletions submitted_models/x1_sensor_config_6/launch/spawner.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ def spawner(_name, _modelURI, _worldName, _x, _y, _z, _roll, _pitch, _yaw)
<publish_collision_pose>false</publish_collision_pose>
<publish_visual_pose>false</publish_visual_pose>
<publish_nested_model_pose>#{$enableGroundTruth}</publish_nested_model_pose>
<use_pose_vector_msg>true</use_pose_vector_msg>
<static_publisher>true</static_publisher>
<static_update_frequency>1</static_update_frequency>
</plugin>
<!-- Battery plugin -->
<plugin filename="libignition-gazebo-linearbatteryplugin-system.so"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,16 @@
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose"
args="/model/$(arg name)/pose@geometry_msgs/TransformStamped[ignition.msgs.Pose">
args="/model/$(arg name)/pose@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose" to="pose"/>
</node>
<node
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose_static"
args="/model/$(arg name)/pose_static@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose_static" to="pose_static"/>
</node>
<node
pkg="ros_ign_bridge"
type="parameter_bridge"
Expand Down
3 changes: 3 additions & 0 deletions submitted_models/x2_sensor_config_7/launch/spawner.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ def spawner(_name, _modelURI, _worldName, _x, _y, _z, _roll, _pitch, _yaw)
<publish_collision_pose>false</publish_collision_pose>
<publish_visual_pose>false</publish_visual_pose>
<publish_nested_model_pose>#{$enableGroundTruth}</publish_nested_model_pose>
<use_pose_vector_msg>true</use_pose_vector_msg>
<static_publisher>true</static_publisher>
<static_update_frequency>1</static_update_frequency>
</plugin>
<!-- Battery plugin -->
<plugin filename="libignition-gazebo-linearbatteryplugin-system.so"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,16 @@
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose"
args="/model/$(arg name)/pose@geometry_msgs/TransformStamped[ignition.msgs.Pose">
args="/model/$(arg name)/pose@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose" to="pose"/>
</node>
<node
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose_static"
args="/model/$(arg name)/pose_static@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose_static" to="pose_static"/>
</node>
<node
pkg="ros_ign_bridge"
type="parameter_bridge"
Expand Down
3 changes: 3 additions & 0 deletions submitted_models/x3_sensor_config_5/launch/spawner.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ def spawner(_name, _modelURI, _worldName, _x, _y, _z, _roll, _pitch, _yaw)
<publish_collision_pose>false</publish_collision_pose>
<publish_visual_pose>false</publish_visual_pose>
<publish_nested_model_pose>#{$enableGroundTruth}</publish_nested_model_pose>
<use_pose_vector_msg>true</use_pose_vector_msg>
<static_publisher>true</static_publisher>
<static_update_frequency>1</static_update_frequency>
</plugin>
<plugin filename="libignition-gazebo-multicopter-motor-model-system.so"
name="ignition::gazebo::systems::MulticopterMotorModel">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,16 @@
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose"
args="/model/$(arg name)/pose@geometry_msgs/TransformStamped[ignition.msgs.Pose">
args="/model/$(arg name)/pose@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose" to="pose"/>
</node>
<node
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose_static"
args="/model/$(arg name)/pose_static@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose_static" to="pose_static"/>
</node>
<node
pkg="ros_ign_bridge"
type="parameter_bridge"
Expand Down
3 changes: 3 additions & 0 deletions submitted_models/x4_sensor_config_6/launch/spawner.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ def spawner(_name, _modelURI, _worldName, _x, _y, _z, _roll, _pitch, _yaw)
<publish_collision_pose>false</publish_collision_pose>
<publish_visual_pose>false</publish_visual_pose>
<publish_nested_model_pose>#{$enableGroundTruth}</publish_nested_model_pose>
<use_pose_vector_msg>true</use_pose_vector_msg>
<static_publisher>true</static_publisher>
<static_update_frequency>1</static_update_frequency>
</plugin>
<plugin filename="libignition-gazebo-multicopter-motor-model-system.so"
name="ignition::gazebo::systems::MulticopterMotorModel">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,16 @@
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose"
args="/model/$(arg name)/pose@geometry_msgs/TransformStamped[ignition.msgs.Pose">
args="/model/$(arg name)/pose@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose" to="pose"/>
</node>
<node
pkg="ros_ign_bridge"
type="parameter_bridge"
name="ros_ign_bridge_pose_static"
args="/model/$(arg name)/pose_static@tf2_msgs/TFMessage[ignition.msgs.Pose_V">
<remap from="/model/$(arg name)/pose_static" to="pose_static"/>
</node>
<node
pkg="ros_ign_bridge"
type="parameter_bridge"
Expand Down
Loading

0 comments on commit e615b31

Please sign in to comment.