Skip to content

Commit 65a2c4a

Browse files
committed
modified: CMakeLists.txt
modified: README.md deleted: config/force_torque_sensor_control.yaml modified: launch/display_simulation.launch modified: model/ft_sensor.gazebo.xacro modified: model/ft_sensor.urdf.xacro config/ launch/control_sensor_simulation.launch model/ft_sensor.trasmission.xacro
1 parent 2a214c2 commit 65a2c4a

6 files changed

Lines changed: 23 additions & 10 deletions

File tree

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ find_package(catkin REQUIRED COMPONENTS
88
message_generation
99
std_msgs
1010
geometry_msgs
11+
controller_interface
12+
controller_manager
13+
hardware_interface
1114
)
1215

1316
catkin_package()
@@ -20,6 +23,7 @@ include_directories(include
2023

2124
add_library(FTSensor
2225
src/FTSensor.cpp
26+
2327
)
2428

2529
add_executable(ft_sensor_hw

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ A catkin package to read measurements from any ATI FT sensor via XML
66
ToDO:
77
- [ ] Use force-torque-sensor controller from ros_control
88
- [x] Create an URDF of the sensor to visualize the forces and frames
9-
- [ ] Create plugin to be used in simulation
9+
- [x] Create plugin to be used in simulation

config/force_torque_sensor_control.yaml

Lines changed: 0 additions & 3 deletions
This file was deleted.

launch/display_simulation.launch

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,20 @@
2525
<node name="rqt_plot_view_torque" pkg="rqt_plot" type="rqt_plot" args="-e /world_my_sensor/ft_sensor_topic/wrench/torque/x:y:z" />
2626

2727

28-
<!-- Load joint controller configurations from YAML file to parameter server -->
29-
<!-- <rosparam file="$(find force_torque_sensor)/config/force_torque_sensor_control.yaml" command="load"/> -->
30-
<rosparam command="load" file="$(find force_torque_sensor)/config/force_torque_sensor_control.yaml" />
31-
28+
<group ns="my_sensor">
29+
<rosparam command="load" file="$(find force_torque_sensor)/config/force_torque_sensor_controller.yaml"/>
30+
<!-- load hardware interface-->
31+
<rosparam command="load" file="$(find force_torque_sensor)/config/hardware_interfaces.yaml"/>
32+
<rosparam file="$(find force_torque_sensor)/config/joint_names.yaml" command="load"/>
3233
<!-- load position controllers -->
3334
<!-- <node name="controller_spawner" pkg="controller_manager" type="spawner" respawn="false"
3435
output="screen" ns="/ft_sensor" args="
3536
joint_state_controller world_my_sensor_measure_joint"/>
3637
-->
38+
</group>
39+
<node name="controller_spawner" pkg="controller_manager" type="spawner" respawn="false" output="screen" ns="/my_sensor" args="force_torque_sensor_controller" />
3740

38-
<node name="force_torque_sensor_controller" pkg="controller_manager" type="spawner" output="screen" args="force_torque_sensor_controller" />
41+
3942

4043

4144

model/ft_sensor.gazebo.xacro

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22
<robot xmlns:xacro="http://ros.org/wiki/xacro">
33

44
<xacro:macro name="ft_sensor_gazebo" params="parent name type">
5-
5+
6+
<gazebo>
7+
<plugin name="gazebo_ros_control" filename="libgazebo_ros_control.so">
8+
<robotNamespace>/${name}/</robotNamespace>
9+
</plugin>
10+
</gazebo>
611

712
<gazebo reference="${name}_${type}_base">
813
<gravity>true</gravity>

model/ft_sensor.urdf.xacro

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<!-- Include all available models -->
55
<xacro:include filename="$(find force_torque_sensor)/model/models.urdf.xacro"/>
66
<xacro:include filename="$(find force_torque_sensor)/model/ft_sensor.gazebo.xacro"/>
7+
<xacro:include filename="$(find force_torque_sensor)/model/ft_sensor.trasmission.xacro"/>
78

89
<!-- Base model for all sensor to have common frame names -->
910
<xacro:macro name="ft_sensor" params="parent name type *origin">
@@ -36,6 +37,9 @@
3637

3738
<xacro:ft_sensor_gazebo name="${name}" parent="${parent}" type="${type}"/>
3839

40+
<xacro:ft_sensor_transmission name="${name}" parent="${parent}" type="${type}"/>
41+
42+
3943
</xacro:macro>
4044

4145
</robot>

0 commit comments

Comments
 (0)