Skip to content
Open
Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions extensions/rcs_fr3/src/hw/Franka.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ common::Pose Franka::get_cartesian_position() {
x = common::Pose(this->curr_state.O_T_EE);
this->interpolator_mutex.unlock();
}
if (!this->cfg.tcp_offset_configured_in_desk){
return x * cfg.tcp_offset;
}
return x;
}

Expand Down
1 change: 1 addition & 0 deletions extensions/rcs_fr3/src/hw/Franka.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ struct FrankaConfig : common::RobotConfig {
std::optional<common::Pose> nominal_end_effector_frame = std::nullopt;
std::optional<common::Pose> world_to_robot = std::nullopt;
bool async_control = false;
bool tcp_offset_configured_in_desk = true;
};

struct FR3Config : FrankaConfig {};
Expand Down
1 change: 1 addition & 0 deletions extensions/rcs_fr3/src/pybind/rcs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ PYBIND11_MODULE(_core, m) {
.def_readwrite("nominal_end_effector_frame",
&rcs::hw::FrankaConfig::nominal_end_effector_frame)
.def_readwrite("world_to_robot", &rcs::hw::FrankaConfig::world_to_robot)
.def_readwrite("tcp_offset_configured_in_desk", &rcs::hw::FrankaConfig::tcp_offset_configured_in_desk)
.def_readwrite("async_control", &rcs::hw::FrankaConfig::async_control);

py::class_<rcs::hw::FR3Config, rcs::hw::FrankaConfig>(hw, "FR3Config")
Expand Down
1 change: 1 addition & 0 deletions extensions/rcs_fr3/src/rcs_fr3/_core/hw/__init__.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ class FrankaConfig(rcs._core.common.RobotConfig):
load_parameters: FrankaLoad | None
nominal_end_effector_frame: rcs._core.common.Pose | None
speed_factor: float
tcp_offset_configured_in_desk: bool
world_to_robot: rcs._core.common.Pose | None
def __init__(self) -> None: ...

Expand Down
Loading