sr ROS interface

Merge lp:~shadowrobot/sr-ros-interface/manip-electric-world-fixed-transform into lp:~shadowrobot/sr-ros-interface/manip-electric

  1. manip-electric-world-fixed-transform
  2. Merge into manip-electric
Proposed by Toni Oliver
Status: Merged
Approved by: Toni Oliver
Approved revision: 8
Merge reported by: Toni Oliver
Merged at revision: not available
Proposed branch: lp:~shadowrobot/sr-ros-interface/manip-electric-world-fixed-transform
Merge into: lp:~shadowrobot/sr-ros-interface/manip-electric
Diff against target: 29 lines (+5/-4)
3 files modified
sr_hand/launch/gazebo/world_fixed_static_transform.launch (+4/-0)
sr_hand/model/kinect/gazebo_kinect.urdf.xacro (+0/-2)
sr_hand/model/kinect/shadowarm_kinect.urdf.xacro (+1/-2)
To merge this branch: bzr merge lp:~shadowrobot/sr-ros-interface/manip-electric-world-fixed-transform
Reviewer Review Type Date Requested Status
Toni Oliver Pending
Review via email: mp+94259@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'sr_hand/launch/gazebo/world_fixed_static_transform.launch'
2--- sr_hand/launch/gazebo/world_fixed_static_transform.launch 1970-01-01 00:00:00 +0000
3+++ sr_hand/launch/gazebo/world_fixed_static_transform.launch 2012-02-22 19:35:20 +0000
4@@ -0,0 +1,4 @@
5+<launch>
6+ <node pkg="tf" type="static_transform_publisher" name="world_to_fixed"
7+ args="0 0 0 0 0 0 /world /fixed 100"/>
8+</launch>
9
10=== modified file 'sr_hand/model/kinect/gazebo_kinect.urdf.xacro'
11--- sr_hand/model/kinect/gazebo_kinect.urdf.xacro 2012-02-21 13:44:35 +0000
12+++ sr_hand/model/kinect/gazebo_kinect.urdf.xacro 2012-02-22 19:35:20 +0000
13@@ -1,5 +1,3 @@
14-<?xml version="1.0"?>
15-
16 <robot xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller" xmlns:interface="http://playerstage.sourceforge.net/gazebo/xmlschema/#interface" xmlns:sensor="http://playerstage.sourceforge.net/gazebo/xmlschema/#sensor" xmlns:xacro="http://ros.org/wiki/xacro" name="gazebo_kinect">
17
18 <xacro:macro name="shadowarm_sim_kinect">
19
20=== modified file 'sr_hand/model/kinect/shadowarm_kinect.urdf.xacro'
21--- sr_hand/model/kinect/shadowarm_kinect.urdf.xacro 2012-02-21 13:44:35 +0000
22+++ sr_hand/model/kinect/shadowarm_kinect.urdf.xacro 2012-02-22 19:35:20 +0000
23@@ -1,5 +1,4 @@
24-<?xml version="1.0"?>
25-<robot name="shadowarm_hardware" xmlns:xacro="http://ros.org/wiki/xacro">
26+<robot xmlns:xacro="http://ros.org/wiki/xacro">
27 <property name="M_PI" value="3.14159"/>
28
29 <include filename="$(find sr_hand)/model/kinect/gazebo_kinect.urdf.xacro"/>

Subscribers

People subscribed via source and target branches

to all changes: