Skip to content

Commit 32510e3

Browse files
committed
修正最小controllertorque
1 parent 0775b85 commit 32510e3

File tree

3 files changed

+36
-20
lines changed

3 files changed

+36
-20
lines changed

ex_ocare_control/launch/ocare_hw_node.xml

+30-18
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,38 @@
11
<launch>
2-
3-
<!-- urdf xml robot description loaded on the Parameter Server-->
4-
<param name="robot_description" command="$(find xacro)/xacro $(find labrob_description)/urdf/ocare_realworld.urdf.xacro" />
5-
6-
<!-- Load joint controller configurations from YAML file to parameter server -->
7-
<rosparam file="$(find ex_ocare_control)/config/controller_config.yaml" command="load"/>
82

9-
<!-- main robot hardware interface handler node -->
10-
<node name="ocare_hw_node" pkg="ex_ocare_control" type="ex_ocare_control_node" required="false" output="screen" />
3+
<!-- urdf xml robot description loaded on the Parameter Server-->
4+
<param name="robot_description" command="$(find xacro)/xacro $(find labrob_description)/urdf/ocare_realworld.urdf.xacro" />
5+
6+
<!-- Load joint controller configurations from YAML file to parameter server -->
7+
<rosparam file="$(find ex_ocare_control)/config/controller_config.yaml" command="load"/>
8+
9+
<!-- main robot hardware interface handler node -->
10+
<node name="ocare_hw_node" pkg="ex_ocare_control" type="ex_ocare_control_node" required="false" output="screen" />
11+
12+
<node name="hokuyo" pkg="hokuyo_node" type="hokuyo_node" required="true" output="screen" >
13+
<param name="frame_id" type="str" value="laser"/>
14+
<param name="port" type="string" value="/dev/hokuyo"/>
15+
<param name="angle_min" type="double" value="-1.5707963"/>
16+
<param name="angle_max" type="double" value="1.5607963"/>
17+
<param name="intensity" type="bool" value="false"/>
18+
</node>
19+
20+
<node name="mpu6050" pkg="mpu6050_serial_to_imu" type="mpu6050_serial_to_imu_node" output="screen" >
21+
<param name="port" type="string" value="/dev/arduino"/>
22+
</node>
1123

1224

13-
<!-- load the controllers -->
14-
<node name="controller_spawner" pkg="controller_manager" type="spawner" respawn="false"
15-
output="screen" ns="/ocare"
16-
args="pose_fuzzy_controller joint_state_controller"/>
25+
<!-- load the controllers -->
26+
<node name="controller_spawner" pkg="controller_manager" type="spawner" respawn="false"
27+
output="screen" ns="/ocare"
28+
args="pose_fuzzy_controller joint_state_controller"/>
1729

18-
<!--node name="joint_state_publisher" pkg="joint_state_publisher" type="joint_state_publisher" /-->
19-
<node name="robot_state_publisher" pkg="robot_state_publisher" type="state_publisher" >
20-
<!-- urdf xml robot description loaded on the Parameter Server-->
21-
<param name="robot_description" command="$(find xacro)/xacro $(find labrob_description)/urdf/ocare_realworld.urdf.xacro" />
22-
<remap from="/joint_states" to="/ocare/joint_states" />
23-
</node>
30+
<!--node name="joint_state_publisher" pkg="joint_state_publisher" type="joint_state_publisher" /-->
31+
<node name="robot_state_publisher" pkg="robot_state_publisher" type="state_publisher" >
32+
<!-- urdf xml robot description loaded on the Parameter Server-->
33+
<param name="robot_description" command="$(find xacro)/xacro $(find labrob_description)/urdf/ocare_realworld.urdf.xacro" />
34+
<remap from="/joint_states" to="/ocare/joint_states" />
35+
</node>
2436

2537

2638

labrob_gazebo/CMakeLists.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ project(labrob_gazebo)
55
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
66
## is used, also find other catkin packages
77
find_package(catkin REQUIRED COMPONENTS
8-
8+
#gazebo_msgs
9+
#gazebo_plugins
10+
#gazebo_ros
11+
#gazebo_ros_control
12+
labrob_description
913
)
1014

1115
## System dependencies are found with CMake's conventions

ocare_controller/include/fuzzycontroller.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include<math.h>
1515

16-
#define WHEEL_TORQUE_LIMIT 4.0
16+
#define WHEEL_TORQUE_LIMIT 200.0
1717

1818
namespace ocare_controllers
1919
{

0 commit comments

Comments
 (0)