Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expose lease release without EStop #315

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion spot_driver/spot_driver/spot_ros2.py
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,12 @@ def __init__(self, parameter_list: Optional[typing.List[Parameter]] = None, **kw
lambda request, response: self.service_wrapper("release", self.handle_release, request, response),
callback_group=self.group,
)
self.create_service(
Trigger,
"lease/release",
lambda request, response: self.service_wrapper("lease/release", self.handle_lease_release, request, response),
callback_group=self.group,
)
self.create_service(
Trigger,
"stop",
Expand Down Expand Up @@ -1111,14 +1117,23 @@ def handle_claim(self, request: Trigger.Request, response: Trigger.Response) ->
return response

def handle_release(self, request: Trigger.Request, response: Trigger.Response) -> Trigger.Response:
"""ROS service handler for the release service"""
"""ROS service handler for the release service (lease and EStop)"""
if self.spot_wrapper is None:
response.success = False
response.message = "Spot wrapper is undefined"
return response
response.success, response.message = self.spot_wrapper.release()
return response

def handle_lease_release(self, request: Trigger.Request, response: Trigger.Response) -> Trigger.Response:
"""ROS service handler to release the lease (and not the EStop.)"""
if self.spot_wrapper is None:
response.success = False
response.message = "Spot wrapper is undefined"
return response
response.success, response.message = self.spot_wrapper.releaseLease()
return response

def handle_stop(self, request: Trigger.Request, response: Trigger.Response) -> Trigger.Response:
"""ROS service handler for the stop service"""
if self.spot_wrapper is None:
Expand Down
Loading