Skip to content

Commit 7b7f3fa

Browse files
Merge branch 'main' into SW-949-add-mission-client-in-spot-wrapper
2 parents 4542ec4 + 071ecef commit 7b7f3fa

File tree

2 files changed

+1
-212
lines changed

2 files changed

+1
-212
lines changed

spot_wrapper/spot_mission_wrapper.py

-192
This file was deleted.

spot_wrapper/wrapper.py

+1-20
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
from bosdyn.client.time_sync import TimeSyncEndpoint
5656
from bosdyn.client.world_object import WorldObjectClient
5757
from bosdyn.geometry import EulerZXY
58-
from bosdyn.mission.client import MissionClient
5958
from google.protobuf.timestamp_pb2 import Timestamp
6059

6160
from .spot_arm import SpotArm
@@ -65,7 +64,6 @@
6564
from .spot_eap import SpotEAP
6665
from .spot_graph_nav import SpotGraphNav
6766
from .spot_images import SpotImages
68-
from .spot_mission_wrapper import SpotMission
6967
from .spot_world_objects import SpotWorldObjects
7068
from .wrapper_helpers import ClaimAndPowerDecorator, RobotCommandData, RobotState
7169

@@ -394,9 +392,7 @@ def __init__(
394392
self._command_data = RobotCommandData()
395393

396394
try:
397-
self._sdk = create_standard_sdk(
398-
SPOT_CLIENT_NAME, service_clients=[MissionClient], cert_resource_glob=cert_resource_glob
399-
)
395+
self._sdk = create_standard_sdk(SPOT_CLIENT_NAME, cert_resource_glob=cert_resource_glob)
400396
except Exception as e:
401397
self._logger.error("Error creating SDK object: %s", e)
402398
self._valid = False
@@ -441,7 +437,6 @@ def __init__(
441437
self._estop_client = self._robot.ensure_client(EstopClient.default_service_name)
442438
self._docking_client = self._robot.ensure_client(DockingClient.default_service_name)
443439
self._spot_check_client = self._robot.ensure_client(SpotCheckClient.default_service_name)
444-
self._mission_client = self._robot.ensure_client(MissionClient.default_service_name)
445440
self._license_client = self._robot.ensure_client(LicenseClient.default_service_name)
446441
if self._robot.has_arm():
447442
self._gripper_cam_param_client = self._robot.ensure_client(
@@ -526,15 +521,6 @@ def __init__(
526521
self._lease_client,
527522
)
528523

529-
self._spot_mission = SpotMission(
530-
self._robot,
531-
self._logger,
532-
self._state,
533-
self._mission_client,
534-
self._robot_command_client,
535-
self._lease_client,
536-
)
537-
538524
if self._robot.has_arm():
539525
self._spot_arm = SpotArm(
540526
self._robot,
@@ -740,11 +726,6 @@ def spot_check(self) -> SpotCheck:
740726
"""Return SpotCheck instance"""
741727
return self._spot_check
742728

743-
@property
744-
def spot_mission(self) -> SpotMission:
745-
"""Return SpotMission instance"""
746-
return self._spot_mission
747-
748729
@property
749730
def spot_eap_lidar(self) -> typing.Optional[SpotEAP]:
750731
"""Return SpotEAP instance"""

0 commit comments

Comments
 (0)