Shadow Robot's Config

Merge lp:~shadowrobot/sr-config/B_cyberglove_config into lp:sr-config

  1. B_cyberglove_config
  2. Merge into trunk
Proposed by Toni Oliver
Status: Merged
Approved by: Toni Oliver
Approved revision: 22
Merged at revision: 26
Proposed branch: lp:~shadowrobot/sr-config/B_cyberglove_config
Merge into: lp:sr-config
Diff against target: 275 lines (+226/-0)
9 files modified
sr_cyberglove_config/CMakeLists.txt (+30/-0)
sr_cyberglove_config/Makefile (+1/-0)
sr_cyberglove_config/calibrations/cyberglove.cal (+91/-0)
sr_cyberglove_config/calibrations/shadowhandtocybergrasp.cal (+31/-0)
sr_cyberglove_config/mainpage.dox (+14/-0)
sr_cyberglove_config/manifest.xml (+14/-0)
sr_cyberglove_config/mappings/GloveToHandMappings (+22/-0)
sr_cyberglove_config/mappings/GloveToHandMappings_generic (+22/-0)
sr_cyberglove_config/serial/serial_port.yaml (+1/-0)
To merge this branch: bzr merge lp:~shadowrobot/sr-config/B_cyberglove_config
Reviewer Review Type Date Requested Status
markpitchless Pending
Review via email: mp+130864@code.launchpad.net

Commit message

Added configuration files for the cyberglove and the sr_remapping package.

Description of the change

Added configuration files for the cyberglove and the sr_remapping package.

To post a comment you must log in.
Revision history for this message
markpitchless (markpitchless) wrote :

http://reviewboard/r/105/

lp:~shadowrobot/sr-config/B_cyberglove_config updated
22. By Toni Oliver

Fixed mainpage.dox and manifest

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'sr_cyberglove_config'
2=== added file 'sr_cyberglove_config/CMakeLists.txt'
3--- sr_cyberglove_config/CMakeLists.txt 1970-01-01 00:00:00 +0000
4+++ sr_cyberglove_config/CMakeLists.txt 2012-11-05 15:16:21 +0000
5@@ -0,0 +1,30 @@
6+cmake_minimum_required(VERSION 2.4.6)
7+include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
8+
9+# Set the build type. Options are:
10+# Coverage : w/ debug symbols, w/o optimization, w/ code-coverage
11+# Debug : w/ debug symbols, w/o optimization
12+# Release : w/o debug symbols, w/ optimization
13+# RelWithDebInfo : w/ debug symbols, w/ optimization
14+# MinSizeRel : w/o debug symbols, w/ optimization, stripped binaries
15+#set(ROS_BUILD_TYPE RelWithDebInfo)
16+
17+rosbuild_init()
18+
19+#set the default path for built executables to the "bin" directory
20+set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
21+#set the default path for built libraries to the "lib" directory
22+set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
23+
24+#uncomment if you have defined messages
25+#rosbuild_genmsg()
26+#uncomment if you have defined services
27+#rosbuild_gensrv()
28+
29+#common commands for building c++ executables and libraries
30+#rosbuild_add_library(${PROJECT_NAME} src/example.cpp)
31+#target_link_libraries(${PROJECT_NAME} another_library)
32+#rosbuild_add_boost_directories()
33+#rosbuild_link_boost(${PROJECT_NAME} thread)
34+#rosbuild_add_executable(example examples/example.cpp)
35+#target_link_libraries(example ${PROJECT_NAME})
36
37=== added file 'sr_cyberglove_config/Makefile'
38--- sr_cyberglove_config/Makefile 1970-01-01 00:00:00 +0000
39+++ sr_cyberglove_config/Makefile 2012-11-05 15:16:21 +0000
40@@ -0,0 +1,1 @@
41+include $(shell rospack find mk)/cmake.mk
42\ No newline at end of file
43
44=== added directory 'sr_cyberglove_config/calibrations'
45=== added file 'sr_cyberglove_config/calibrations/cyberglove.cal'
46--- sr_cyberglove_config/calibrations/cyberglove.cal 1970-01-01 00:00:00 +0000
47+++ sr_cyberglove_config/calibrations/cyberglove.cal 2012-11-05 15:16:21 +0000
48@@ -0,0 +1,91 @@
49+<?xml version="1.0" ?>
50+<Cyberglove_calibration>
51+<Joint name="G_PinkieRingAb">
52+<calib raw_value="0.208661422133" calibrated_value="50"/>
53+<calib raw_value="0.515748023987" calibrated_value="0"/>
54+</Joint>
55+<Joint name="G_IndexDIJ">
56+<calib raw_value="0.185039371252" calibrated_value="0"/>
57+<calib raw_value="0.468503922224" calibrated_value="90"/>
58+</Joint>
59+<Joint name="G_RingDIJ">
60+<calib raw_value="0.177165359259" calibrated_value="0"/>
61+<calib raw_value="0.389763772488" calibrated_value="90"/>
62+</Joint>
63+<Joint name="G_ThumbMPJ">
64+<calib raw_value="0.311023622751" calibrated_value="-30"/>
65+<calib raw_value="0.736220479012" calibrated_value="30"/>
66+</Joint>
67+<Joint name="G_RingMiddleAb">
68+<calib raw_value="0.283464580774" calibrated_value="50"/>
69+<calib raw_value="0.610236227512" calibrated_value="0"/>
70+</Joint>
71+<Joint name="G_PalmArch">
72+<calib raw_value="0.356614176631" calibrated_value="0"/>
73+<calib raw_value="0.64960628748" calibrated_value="40"/>
74+</Joint>
75+<Joint name="G_PinkiePIJ">
76+<calib raw_value="0.153543308377" calibrated_value="0"/>
77+<calib raw_value="0.602362215519" calibrated_value="90"/>
78+</Joint>
79+<Joint name="G_RingMPJ">
80+<calib raw_value="0.322834640741" calibrated_value="0"/>
81+<calib raw_value="0.570866167545" calibrated_value="90"/>
82+</Joint>
83+<Joint name="G_MiddlePIJ">
84+<calib raw_value="0.267716526985" calibrated_value="0"/>
85+<calib raw_value="0.590551197529" calibrated_value="90"/>
86+</Joint>
87+<Joint name="G_MiddleDIJ">
88+<calib raw_value="0.0" calibrated_value="0"/>
89+<calib raw_value="0.322834640741" calibrated_value="90"/>
90+</Joint>
91+<Joint name="G_ThumbAb">
92+<calib raw_value="0.350393712521" calibrated_value="50"/>
93+<calib raw_value="0.791338562965" calibrated_value="0"/>
94+</Joint>
95+<Joint name="G_IndexMPJ">
96+<calib raw_value="0.429133862257" calibrated_value="0"/>
97+<calib raw_value="0.653543293476" calibrated_value="90"/>
98+</Joint>
99+<Joint name="G_PinkieDIJ">
100+<calib raw_value="0.318897634745" calibrated_value="0"/>
101+<calib raw_value="0.578740179539" calibrated_value="90"/>
102+</Joint>
103+<Joint name="G_IndexPIJ">
104+<calib raw_value="0.181102365255" calibrated_value="0"/>
105+<calib raw_value="0.653543293476" calibrated_value="90"/>
106+</Joint>
107+<Joint name="G_ThumbRotate">
108+<calib raw_value="0.334645658731" calibrated_value="-60"/>
109+<calib raw_value="0.696850419044" calibrated_value="60"/>
110+</Joint>
111+<Joint name="G_ThumbIJ">
112+<calib raw_value="0.460629910231" calibrated_value="0"/>
113+<calib raw_value="0.909448802471" calibrated_value="90"/>
114+</Joint>
115+<Joint name="G_MiddleIndexAb">
116+<calib raw_value="0.389763772488" calibrated_value="50"/>
117+<calib raw_value="0.468503922224" calibrated_value="0"/>
118+</Joint>
119+<Joint name="G_RingPIJ">
120+<calib raw_value="0.240157485008" calibrated_value="0"/>
121+<calib raw_value="0.618110239506" calibrated_value="90"/>
122+</Joint>
123+<Joint name="G_PinkieMPJ">
124+<calib raw_value="0.354330718517" calibrated_value="0"/>
125+<calib raw_value="0.590551197529" calibrated_value="90"/>
126+</Joint>
127+<Joint name="G_WristPitch">
128+<calib raw_value="0.153543308377" calibrated_value="-30"/>
129+<calib raw_value="0.622047245502" calibrated_value="40"/>
130+</Joint>
131+<Joint name="G_WristYaw">
132+<calib raw_value="0.236220479012" calibrated_value="10"/>
133+<calib raw_value="0.925196826458" calibrated_value="-30"/>
134+</Joint>
135+<Joint name="G_MiddleMPJ">
136+<calib raw_value="0.417322844267" calibrated_value="0"/>
137+<calib raw_value="0.629921257496" calibrated_value="90"/>
138+</Joint>
139+</Cyberglove_calibration>
140
141=== added file 'sr_cyberglove_config/calibrations/shadowhandtocybergrasp.cal'
142--- sr_cyberglove_config/calibrations/shadowhandtocybergrasp.cal 1970-01-01 00:00:00 +0000
143+++ sr_cyberglove_config/calibrations/shadowhandtocybergrasp.cal 2012-11-05 15:16:21 +0000
144@@ -0,0 +1,31 @@
145+#TH FF MF RF LF (cybergrasp)
146+#FF (hand)
147+0.0 0.0 0.0 0.0 0.0
148+0.0 1.0 0.0 0.0 0.0
149+0.0 0.0 0.0 0.0 0.0
150+0.0 0.0 0.0 0.0 0.0
151+#MF
152+0.0 0.0 0.0 0.0 0.0
153+0.0 0.0 1.0 0.0 0.0
154+0.0 0.0 0.0 0.0 0.0
155+0.0 0.0 0.0 0.0 0.0
156+#RF
157+0.0 0.0 0.0 0.0 0.0
158+0.0 0.0 0.0 1.0 0.0
159+0.0 0.0 0.0 0.0 0.0
160+0.0 0.0 0.0 0.0 0.0
161+#LF
162+0.0 0.0 0.0 0.0 0.0
163+0.0 0.0 0.0 0.0 1.0
164+0.0 0.0 0.0 0.0 0.0
165+0.0 0.0 0.0 0.0 0.0
166+0.0 0.0 0.0 0.0 0.0
167+#TH
168+1.0 0.0 0.0 0.0 0.0
169+0.0 0.0 0.0 0.0 0.0
170+0.0 0.0 0.0 0.0 0.0
171+0.0 0.0 0.0 0.0 0.0
172+0.0 0.0 0.0 0.0 0.0
173+#WR
174+0.0 0.0 0.0 0.0 0.0
175+0.0 0.0 0.0 0.0 0.0
176
177=== added file 'sr_cyberglove_config/mainpage.dox'
178--- sr_cyberglove_config/mainpage.dox 1970-01-01 00:00:00 +0000
179+++ sr_cyberglove_config/mainpage.dox 2012-11-05 15:16:21 +0000
180@@ -0,0 +1,14 @@
181+/**
182+\mainpage
183+\htmlinclude manifest.html
184+
185+\b sr_cyberglove_config contains configuration files for the cyberglove (calibration, mapping) for the Shadow Robot hand
186+
187+<!--
188+Provide an overview of your package.
189+-->
190+
191+-->
192+
193+
194+*/
195
196=== added file 'sr_cyberglove_config/manifest.xml'
197--- sr_cyberglove_config/manifest.xml 1970-01-01 00:00:00 +0000
198+++ sr_cyberglove_config/manifest.xml 2012-11-05 15:16:21 +0000
199@@ -0,0 +1,14 @@
200+<package>
201+ <description brief="sr_cyberglove_config">
202+
203+ sr_cyberglove_config contains configuration files for the cyberglove (calibration, mapping) for the Shadow Robot hand
204+
205+ </description>
206+ <author>Toni Oliver</author>
207+ <license>BSD</license>
208+ <review status="unreviewed" notes=""/>
209+ <url>http://ros.org/wiki/sr_cyberglove_config</url>
210+
211+</package>
212+
213+
214
215=== added directory 'sr_cyberglove_config/mappings'
216=== added file 'sr_cyberglove_config/mappings/GloveToHandMappings'
217--- sr_cyberglove_config/mappings/GloveToHandMappings 1970-01-01 00:00:00 +0000
218+++ sr_cyberglove_config/mappings/GloveToHandMappings 2012-11-05 15:16:21 +0000
219@@ -0,0 +1,22 @@
220+ 0.0 0.0799750653832 0.0 0.08032429482 0.987307811206 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
221+ 0.0 0.857048310213 0.0 0.10199325194 0.1037773864 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
222+ 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
223+ 0.0 -0.04044552966 0.9 0.0815504206996 -0.0551230905699 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
224+ 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
225+ 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
226+ 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
227+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
228+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
229+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
230+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 -1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
231+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
232+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
233+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
234+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 -1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
235+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0
236+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0
237+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0
238+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 -1.0 0.0 0.0 0.0
239+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0
240+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0
241+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0
242
243=== added file 'sr_cyberglove_config/mappings/GloveToHandMappings_generic'
244--- sr_cyberglove_config/mappings/GloveToHandMappings_generic 1970-01-01 00:00:00 +0000
245+++ sr_cyberglove_config/mappings/GloveToHandMappings_generic 2012-11-05 15:16:21 +0000
246@@ -0,0 +1,22 @@
247+ 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
248+ 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
249+ 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
250+ 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
251+ 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
252+ 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
253+ 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
254+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
255+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
256+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
257+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 -1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
258+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
259+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
260+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
261+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 -1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
262+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0
263+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0
264+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0
265+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 -1.0 0.0 0.0 0.0
266+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0
267+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 0.0
268+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0
269
270=== added directory 'sr_cyberglove_config/serial'
271=== added file 'sr_cyberglove_config/serial/serial_port.yaml'
272--- sr_cyberglove_config/serial/serial_port.yaml 1970-01-01 00:00:00 +0000
273+++ sr_cyberglove_config/serial/serial_port.yaml 2012-11-05 15:16:21 +0000
274@@ -0,0 +1,1 @@
275+path_to_glove: "/dev/ttyUSB0"

Subscribers

People subscribed via source and target branches

to all changes: