Skip to content

Commit 3bdbb3e

Browse files
feat: teleop with or without force feedback
1 parent b896fa8 commit 3bdbb3e

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

crisp_gym/teleop/teleop_robot.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,15 @@ def prepare_for_teleop(self, home: bool = True, blocking: bool = True):
4848
if home:
4949
self.robot.home(blocking=blocking)
5050

51-
self.robot.cartesian_controller_parameters_client.load_param_config(
52-
file_path=self.config.gravity_compensation_controller
53-
)
54-
self.robot.controller_switcher_client.switch_controller("cartesian_impedance_controller")
51+
if self.config.use_force_feedback:
52+
self.robot.controller_switcher_client.switch_controller("torque_feedback_controller")
53+
else:
54+
self.robot.cartesian_controller_parameters_client.load_param_config(
55+
file_path=self.config.gravity_compensation_controller
56+
)
57+
self.robot.controller_switcher_client.switch_controller(
58+
"cartesian_impedance_controller"
59+
)
5560

5661
if self.gripper is not None and not self.config.disable_gripper_torque:
5762
self.gripper.disable_torque()

crisp_gym/teleop/teleop_robot_config.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ class TeleopRobotConfig(ABC):
4040

4141
use_gripper: bool = True
4242
disable_gripper_torque: bool = True
43+
use_force_feedback: bool = False
4344

4445
@classmethod
4546
def from_yaml(cls, yaml_path: Path, **overrides) -> "TeleopRobotConfig": # noqa: ANN003

0 commit comments

Comments
 (0)