Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
panda_simulation
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nikhil Ambardar
panda_simulation
Commits
62a209ce
Commit
62a209ce
authored
5 years ago
by
Johannes Mey
Browse files
Options
Downloads
Patches
Plain Diff
align with ros melodic, change arm controller name in initializer
parent
a640a57d
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
config/panda_control.yaml
+1
-1
1 addition, 1 deletion
config/panda_control.yaml
launch/simulation.launch
+6
-11
6 additions, 11 deletions
launch/simulation.launch
src/robot_state_initializer.cpp
+2
-2
2 additions, 2 deletions
src/robot_state_initializer.cpp
with
9 additions
and
14 deletions
config/panda_control.yaml
+
1
−
1
View file @
62a209ce
This diff is collapsed.
Click to expand it.
launch/simulation.launch
+
6
−
11
View file @
62a209ce
<launch>
<launch>
<param name="robot_description" command="$(find xacro)/xacro $(find franka_description)/robots/panda_arm_hand.urdf.xacro" />
<!-- GAZEBO arguments -->
<!-- GAZEBO arguments -->
<arg name="paused" default="false" />
<arg name="paused" default="false" />
...
@@ -9,6 +8,11 @@
...
@@ -9,6 +8,11 @@
<arg name="debug" default="false" />
<arg name="debug" default="false" />
<arg name="load_gripper" default="true" />
<arg name="load_gripper" default="true" />
<!-- don't include franka_control, but include the controller stuff from there -->
<param name="robot_description" command="$(find xacro)/xacro --inorder '$(find franka_description)/robots/panda_arm_hand.urdf.xacro'" if="$(arg load_gripper)" />
<param name="robot_description" command="$(find xacro)/xacro --inorder '$(find franka_description)/robots/panda_arm.urdf.xacro'" unless="$(arg load_gripper)" />
<rosparam command="load" file="$(find franka_control)/config/default_controllers.yaml" />
<!--launch GAZEBO with own world configuration -->
<!--launch GAZEBO with own world configuration -->
<include file="$(find gazebo_ros)/launch/empty_world.launch">
<include file="$(find gazebo_ros)/launch/empty_world.launch">
<!-- <arg name="world_name" value="$(find robotics_assisted_tomography)/worlds/tomography.world"/> -->
<!-- <arg name="world_name" value="$(find robotics_assisted_tomography)/worlds/tomography.world"/> -->
...
@@ -19,8 +23,6 @@
...
@@ -19,8 +23,6 @@
<arg name="headless" value="$(arg headless)" />
<arg name="headless" value="$(arg headless)" />
</include>
</include>
<node name="rqt_console" pkg="rqt_console" type="rqt_console" />
<!-- <node name="rqt_logger_level" pkg="rqt_logger_level" type="rqt_logger_level" /> -->
<node name="spawn_urdf" pkg="gazebo_ros" type="spawn_model" args="-param robot_description -urdf -model panda" />
<node name="spawn_urdf" pkg="gazebo_ros" type="spawn_model" args="-param robot_description -urdf -model panda" />
...
@@ -28,7 +30,7 @@
...
@@ -28,7 +30,7 @@
<rosparam file="$(find panda_simulation)/config/panda_control.yaml" command="load" />
<rosparam file="$(find panda_simulation)/config/panda_control.yaml" command="load" />
<!-- load the controllers -->
<!-- load the controllers -->
<node name="controller_spawner" pkg="controller_manager" type="spawner" respawn="false" output="screen" args="joint_state_controller p
anda_arm
_controller" />
<node name="controller_spawner" pkg="controller_manager" type="spawner" respawn="false" output="screen" args="joint_state_controller p
osition_joint_trajectory
_controller" />
<node if="$(arg load_gripper)" name="controller_spawner_hand" pkg="controller_manager" type="spawner" respawn="false" output="screen" args="panda_hand_controller" />
<node if="$(arg load_gripper)" name="controller_spawner_hand" pkg="controller_manager" type="spawner" respawn="false" output="screen" args="panda_hand_controller" />
...
@@ -57,14 +59,7 @@
...
@@ -57,14 +59,7 @@
<!-- run custom node for automatic intialization -->
<!-- run custom node for automatic intialization -->
<node pkg="panda_simulation" type="robot_state_initializer_node" name="robot_state_initializer_node" />
<node pkg="panda_simulation" type="robot_state_initializer_node" name="robot_state_initializer_node" />
<!--<node name="move_group_interface_tutorial" pkg="panda_simulation" type="move_group_interface_tutorial" respawn="false" output="screen"/>-->
<node name="constraint_planner" pkg="panda_simulation" type="constraint_planner" respawn="false" output="screen"/>
<node name="constraint_planner" pkg="panda_simulation" type="constraint_planner" respawn="false" output="screen"/>
<!--<node name="motion_planning_api_tutorial" pkg="panda_simulation" type="motion_planning_api_tutorial" respawn="false" output="screen">
<rosparam command="load" file="$(find panda_moveit_config)/config/kinematics.yaml"/>
<param name="/planning_plugin" value="ompl_interface/OMPLPlanner"/>
<rosparam command="load" file="$(find panda_moveit_config)/config/ompl_planning.yaml"/>
</node>-->
</launch>
</launch>
This diff is collapsed.
Click to expand it.
src/robot_state_initializer.cpp
+
2
−
2
View file @
62a209ce
...
@@ -20,7 +20,7 @@ int main(int argc, char **argv) {
...
@@ -20,7 +20,7 @@ int main(int argc, char **argv) {
ros
::
Duration
(
2.0
).
sleep
();
ros
::
Duration
(
2.0
).
sleep
();
// 1. switch from default joint trajectory controller to custom position controller
// 1. switch from default joint trajectory controller to custom position controller
std
::
string
panda_arm_controller
{
"p
anda_arm
_controller"
},
panda_hand_controller
{
"panda_hand_controller"
},
std
::
string
panda_arm_controller
{
"p
osition_joint_trajectory
_controller"
},
panda_hand_controller
{
"panda_hand_controller"
},
joint_position_controller
{
"joint_position_controller"
};
joint_position_controller
{
"joint_position_controller"
};
std
::
vector
<
std
::
string
>
stop_controllers
{
panda_arm_controller
,
panda_hand_controller
};
std
::
vector
<
std
::
string
>
stop_controllers
{
panda_arm_controller
,
panda_hand_controller
};
std
::
vector
<
std
::
string
>
start_controllers
{
joint_position_controller
};
std
::
vector
<
std
::
string
>
start_controllers
{
joint_position_controller
};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment