Skip to content

Commit

Permalink
Disambiguated Robot and Gripper classes
Browse files Browse the repository at this point in the history
  • Loading branch information
TimSchneider42 committed Jun 27, 2023
1 parent 28007e9 commit 97d4711
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion franky/gripper.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from threading import Thread

from _franky import Gripper as _Gripper
from _franky import _Gripper


class Gripper(_Gripper):
Expand Down
2 changes: 1 addition & 1 deletion franky/robot.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from _franky import Robot as _Robot
from _franky import _Robot

from .robot_web_session import RobotWebSession

Expand Down
4 changes: 2 additions & 2 deletions python/python.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ PYBIND11_MODULE(_franky, m) {
mkReactionClass<franka::CartesianVelocities>(m, "CartesianVelocity");
mkReactionClass<franka::CartesianPose>(m, "CartesianPose");

py::class_<Gripper>(m, "Gripper")
py::class_<Gripper>(m, "_Gripper")
.def(py::init<const std::string &, double, double>(), "fci_hostname"_a, "speed"_a = 0.02, "force"_a = 20.0)
.def_readwrite("gripper_force", &Gripper::gripper_force)
.def_readwrite("gripper_speed", &Gripper::gripper_speed)
Expand Down Expand Up @@ -386,7 +386,7 @@ PYBIND11_MODULE(_franky, m) {
.def_static("jacobian", &Kinematics::jacobian, "q"_a)
.def_static("inverse", &Kinematics::inverse, "target"_a, "q0"_a, "null_space"_a = std::nullopt);

py::class_<Robot>(m, "Robot")
py::class_<Robot>(m, "_Robot")
.def(py::init<>([](
const std::string &fci_hostname,
double velocity_rel,
Expand Down

0 comments on commit 97d4711

Please sign in to comment.