Skip to content

Commit c156618

Browse files
committed
[CMakeLists.txt, pepper.yaml] generate pepper model from pepper_description
1 parent ad9ec9b commit c156618

File tree

2 files changed

+53
-1
lines changed

2 files changed

+53
-1
lines changed
Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,31 @@
11
cmake_minimum_required(VERSION 2.8.3)
22
project(peppereus)
33

4-
find_package(catkin REQUIRED)
4+
find_package(catkin REQUIRED naoqi_driver naoqi_sensors nao_pose pr2eus diagnostic_aggregator naoqi_msgs roseus pepper_description euscollada)
55

66
catkin_package()
77

8+
###
9+
### pepper.l generation
10+
###
11+
if(EXISTS ${pepper_description_PREFIX}/share/pepper_description/urdf/pepper1.0_generated_urdf/pepper.urdf)
12+
set(pepper_urdf ${pepper_description_PREFIX}/share/pepper_description/urdf/pepper1.0_generated_urdf/pepper.urdf)
13+
elseif(EXISTS ${pepper_description_SOURCE_PREFIX}/urdf/pepper1.0_generated_urdf/pepper.urdf)
14+
set(pepper_urdf ${pepper_description_SOURCE_PREFIX}/urdf/pepper1.0_generated_urdf/pepper.urdf)
15+
else()
16+
message(FATAL_ERROR "Could not found pepper.urdf in ${pepper_description_PREFIX}/share/pepper_description/urdf/pepper1.0_generated_urdf/pepper.urdf and ${pepper_description_SOURCE_PREFIX}/urdf/pepper1.0_generated_urdf/pepper.urdf")
17+
endif()
18+
message(STATUS "Found pepper.urdf at ${pepper_urdf}")
19+
20+
add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/pepper.l
21+
COMMAND rosrun euscollada collada2eus pepper.dae pepper.yaml pepper.l
22+
COMMAND sed -i 's@julietteY20MP@pepper@g' pepper.l
23+
COMMAND sed -i 's@juliettey20mp@pepper@g' pepper.l
24+
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
25+
DEPENDS pepper.dae)
26+
add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/pepper.dae
27+
COMMAND rosrun collada_urdf urdf_to_collada ${pepper_urdf} pepper.dae || echo "ok?" # urdf_to_collada fail to exit program, but generated dae is ok.
28+
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
29+
DEPENDS ${pepper_urdf})
30+
31+
add_custom_target(generate_pepper_lisp ALL DEPENDS ${PROJECT_SOURCE_DIR}/pepper.l)
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
##
2+
## - collada_joint_name : euslisp_joint_name (start with :)
3+
##
4+
rleg:
5+
- KneePitch : knee-p
6+
- HipRoll : hip-r
7+
- HipPitch : hip-p
8+
larm:
9+
- LShoulderPitch : larm-shoulder-p
10+
- LShoulderRoll : larm-shoulder-r
11+
- LElbowYaw : larm-elbow-y
12+
- LElbowRoll : larm-elbow-p
13+
- LWristYaw : larm-wrist-y
14+
rarm:
15+
- RShoulderPitch : rarm-shoulder-p
16+
- RShoulderRoll : rarm-shoulder-r
17+
- RElbowYaw : rarm-elbow-y
18+
- RElbowRoll : rarm-elbow-p
19+
- RWristYaw : rarm-wrist-y
20+
head:
21+
- HeadYaw : head-neck-y
22+
- HeadPitch : head-neck-p
23+
24+
angle-vector:
25+
reset-pose: [2, -2, -5, 85, 10, -70, -20, -40, 85, -10, 70, 20, 40, 0, -0]
26+
27+
## TODO: end-coords tokuni base
28+
## FIXME: base_linkが浮いてる

0 commit comments

Comments
 (0)