From 8dc1bda7d572f1c3fbc858e94b6b174f1e1d26e2 Mon Sep 17 00:00:00 2001 From: Shunichi Nozawa Date: Tue, 18 Apr 2017 19:54:49 +0900 Subject: [PATCH] [hrpsys_ros_bridge_tutorials/euslisp/make-joint-min-max-table.l] Do not define :init-ending if robot-model's :define-min-max-table exists (https://github.com/euslisp/jskeus/pull/428). This will fix the bug (https://github.com/start-jsk/rtmros_tutorials/pull/508) because unnecessary :init-ending conflict is resolved. --- .../euslisp/make-joint-min-max-table.l | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hrpsys_ros_bridge_tutorials/euslisp/make-joint-min-max-table.l b/hrpsys_ros_bridge_tutorials/euslisp/make-joint-min-max-table.l index 7fbc8654..db23773c 100644 --- a/hrpsys_ros_bridge_tutorials/euslisp/make-joint-min-max-table.l +++ b/hrpsys_ros_bridge_tutorials/euslisp/make-joint-min-max-table.l @@ -161,12 +161,13 @@ (with-open-file (f path :direction :output :if-exists :append) (format f "(defmethod ~A~%" (send (class robot) :name)) - (format f " (:init-ending~%") - (format f " ()~%") - (format f " (prog1~%") - (format f " (send-super :init-ending)~%") - (format f " (send self :define-min-max-table)~%") - (format f " ))~%") + (unless (assoc :define-min-max-table (send robot-model :methods)) + (format f " (:init-ending~%") + (format f " ()~%") + (format f " (prog1~%") + (format f " (send-super :init-ending)~%") + (format f " (send self :define-min-max-table)~%") + (format f " ))~%")) (format f " (:define-min-max-table~%") (format f " ()~%") (labels