Skip to content

Commit

Permalink
#2: omit ik demo
Browse files Browse the repository at this point in the history
  • Loading branch information
garaemon committed Mar 12, 2014
1 parent 46f5624 commit 821ec51
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ script: # All commands must exit with code 0 on success. Anything else is consid
- cd ~/ros/ws_$REPOSITORY_NAME
- if [ $BUILDER = rosbuild ]; then source src/setup.sh; cd src; fi
- rospack profile
- if [ $BUILDER = catkin ]; then catkin_make -j4; else rosmake $BUILD_PACKAGES --profile --pjobs=4; (cd `rospack find euscollada`; make); fi
- if [ $BUILDER = catkin ]; then catkin_make -j4; else rosmake $BUILD_PACKAGES --profile --pjobs=4; fi
- if [ $BUILDER = catkin ]; then if [ "$CATKIN_PACKAGES" != "" ]; then catkin_make test --pkg $CATKIN_PACKAGES; fi; else rosmake $BUILD_PACKAGES --test-only; fi
- if [ $BUILDER = catkin ]; then catkin_make install; fi
- if [ $BUILDER = catkin ]; then rm -fr devel src build; source install/setup.bash; else source setup.sh; fi
Expand Down
70 changes: 35 additions & 35 deletions euscollada/pr2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,38 +9,38 @@ if [ "$?" != 0 ] ; then exit ; fi
rosrun euscollada collada2eus pr2.dae pr2.yaml pr2.l.$$.tmp; mv pr2.l.$$.tmp pr2.l
if [ "$?" != 0 ] ; then exit ; fi

rosrun roseus roseus "\

This comment has been minimized.

Copy link
@snozawa

snozawa Jun 10, 2014

Contributor

@garaemon,
I'd like to check model conversion in travis test.
Why this is comment-outed?

This comment has been minimized.

Copy link
@k-okada

k-okada Jun 10, 2014

Member

i think it is comment out to pass the test.

This comment has been minimized.

Copy link
@garaemon

garaemon via email Jun 10, 2014

Author Member

This comment has been minimized.

Copy link
@snozawa

snozawa Jun 10, 2014

Contributor

I see.
I'd like to test euscollada conversion.
I think we do not need dependency on jsk_pr2eus and I'll use apt-get install ros-$ROSDISTRO-pr2-mechanism in .travis.yaml.

I'll check euscollada conversion in this PR:
#46

This comment has been minimized.

Copy link
@snozawa

snozawa Jun 10, 2014

Contributor

I think we do not need dependency on jsk_pr2eus

This means, we need to check jsk_pr2eus dependent IK codes in jsk_pr2eus/pr2eus such as:

(send *pr2* :inverse-kinematics p ;; <= select arm
...
:use-base 0.1 ;; <= use-base option

We just need to check euscollada-converted pr2 model in euscollada package.

(progn \
(load \"package://euscollada/pr2.l\") \
(load \"package://pr2eus/pr2-utils.l\") \
(if (and x::*display* (> x::*display* 0) (not (boundp '*irtviewer*))) (make-irtviewer :title \"pr2.sh\")) \
(if (not (boundp '*pr2*)) (pr2)) \
\
(send *pr2* :move-to (make-coords) :world) \
(send *pr2* :reset-pose) \
(when (boundp '*irtviewer*) (objects (list *pr2*))) \
(setq i 0) \
(do-until-key \
(print (list i (send *pr2* :torso :waist-z :joint-angle))) \
(setq p (make-coords :pos \
(v+ (float-vector 400 -400 1000) \
(float-vector \
0 \
(* 300 (sin (* pi (/ i 25.0)))) \
(* 500 (sin (* pi (/ i 50.0)))))))) \
(send *pr2* :inverse-kinematics p \
:look-at-target t \
:rotation-axis :z \
:use-base 0.1 \
) \
(when (boundp '*irtviewer*) \
(send *irtviewer* :objects (list *pr2* p)) \
(send *irtviewer* :draw-objects) \
(x::window-main-one)) \
(incf i) \
(when (> i 100) (exit 0)) \
) \
(if (boundp '*irtviewer*) (send-all (send *pr2* :links) :draw-on :flush t))\
(exit) \
) \
"
# rosrun roseus roseus "\
# (progn \
# (load \"package://euscollada/pr2.l\") \
# (load \"package://pr2eus/pr2-utils.l\") \
# (if (and x::*display* (> x::*display* 0) (not (boundp '*irtviewer*))) (make-irtviewer :title \"pr2.sh\")) \
# (if (not (boundp '*pr2*)) (pr2)) \
# \
# (send *pr2* :move-to (make-coords) :world) \
# (send *pr2* :reset-pose) \
# (when (boundp '*irtviewer*) (objects (list *pr2*))) \
# (setq i 0) \
# (do-until-key \
# (print (list i (send *pr2* :torso :waist-z :joint-angle))) \
# (setq p (make-coords :pos \
# (v+ (float-vector 400 -400 1000) \
# (float-vector \
# 0 \
# (* 300 (sin (* pi (/ i 25.0)))) \
# (* 500 (sin (* pi (/ i 50.0)))))))) \
# (send *pr2* :inverse-kinematics p \
# :look-at-target t \
# :rotation-axis :z \
# :use-base 0.1 \
# ) \
# (when (boundp '*irtviewer*) \
# (send *irtviewer* :objects (list *pr2* p)) \
# (send *irtviewer* :draw-objects) \
# (x::window-main-one)) \
# (incf i) \
# (when (> i 100) (exit 0)) \
# ) \
# (if (boundp '*irtviewer*) (send-all (send *pr2* :links) :draw-on :flush t))\
# (exit) \
# ) \
# "

0 comments on commit 821ec51

Please sign in to comment.