Skip to content

Commit

Permalink
[jsk_fetch_startup] rename arg name rotate_in_place to rotate-in-place
Browse files Browse the repository at this point in the history
  • Loading branch information
sktometometo authored and knorth55 committed Jul 21, 2022
1 parent 39b15fa commit 836d898
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions jsk_fetch_robot/jsk_fetch_startup/euslisp/navigation-utils.l
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
(simple-dock))


(defun undock (&key (rotate_in_place nil))
(defun undock (&key (rotate-in-place nil))
(unless *undock-action*
(setq *undock-action*
(instance ros::simple-action-client :init
Expand All @@ -125,7 +125,7 @@
(return-from undock nil))
(send *undock-action* :send-goal
(instance fetch_auto_dock_msgs::UndockActionGoal :init
:goal (instance fetch_auto_dock_msgs::UndockGoal :rotate_in_place rotate_in_place)))
:goal (instance fetch_auto_dock_msgs::UndockGoal :rotate_in_place rotate-in-place)))
(unless (send *undock-action* :wait-for-result :timeout 60)
(ros::ros-error "No result returned from /undock action server")
(return-from undock nil))
Expand Down Expand Up @@ -168,7 +168,7 @@ Args:
(return-from go-to-spot-undock t))
(if (equal battery-charging-state :charging)
(progn
(setq undock-success (auto-undock :n-trial 3 :rotate_in_place undock-rotate)))
(setq undock-success (auto-undock :n-trial 3 :rotate-in-place undock-rotate)))
(return-from go-to-spot-undock t))
(if (not undock-success)
(progn
Expand Down Expand Up @@ -198,14 +198,14 @@ Args:
success))


(defun auto-undock (&key (n-trial 1) (rotate_in_place nil))
(defun auto-undock (&key (n-trial 1) (rotate-in-place nil))
(let ((success nil))
(unless (boundp '*ri*)
(require :fetch-interface "package://fetcheus/fetch-interface.l")
(fetch-init))
(dotimes (i n-trial)
(ros::ros-info "trying to do undock.")
(setq success (undock :rotate_in_place rotate_in_place))
(setq success (undock :rotate-in-place rotate-in-place))
(when success (return-from auto-undock success)))
(if (not success)
(let ((enable-request (instance power_msgs::BreakerCommandRequest :init :enable t))
Expand Down

0 comments on commit 836d898

Please sign in to comment.