[hrpsys_ros_bridge_tutorials/euslisp/make-joint-min-max-table.l] Do n…

…ot define :init-ending if robot-model's :define-min-max-table exists (euslisp/jskeus#428). This will fix the bug (start-jsk#508) because unnecessary :init-ending conflict is resolved.
snozawa · Apr 18, 2017 · 8dc1bda · 8dc1bda
1 parent cfd0b27
commit 8dc1bda
Showing 1 changed file with 7 additions and 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
@@ -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