Skip to content

Commit a4800b5

Browse files
committed
fix: restore typed Franka q_home default
1 parent 01cbd4e commit a4800b5

7 files changed

Lines changed: 12 additions & 9 deletions

File tree

extensions/rcs_fr3/src/hw/Franka.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@ struct FrankaConfig : common::RobotConfig {
4343
bool async_control = false;
4444
bool tcp_offset_configured_in_desk = true;
4545
bool ignore_realtime = false;
46-
q_home = (VectorXd(7) << 0.0, -M_PI_4, 0.0, -3.0 * M_PI_4, 0.0, M_PI_2,
47-
M_PI_4)
48-
.finished();
46+
std::optional<common::VectorXd> q_home =
47+
(common::VectorXd(7) << 0.0, -M_PI_4, 0.0, -3.0 * M_PI_4, 0.0, M_PI_2,
48+
M_PI_4)
49+
.finished();
4950
size_t dof = 7;
5051
Eigen::Matrix<double, 2, Eigen::Dynamic, Eigen::ColMajor> joint_limits =
5152
(Eigen::Matrix<double, 2, Eigen::Dynamic, Eigen::ColMajor>(2, 7) <<

extensions/rcs_fr3/src/rcs_fr3/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
from rcs_fr3 import configs, desk, envs
21
from rcs_fr3._core import __version__, hw
32

3+
from . import configs, desk, envs
4+
45
__all__ = [
56
"configs",
67
"desk",

extensions/rcs_fr3/src/rcs_fr3/configs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import numpy as np
44
from rcs.envs.base import ControlMode, RelativeTo
5-
from rcs_fr3 import hw
5+
from rcs_fr3._core import hw
66
from rcs_fr3.creators import (
77
FR3HardwareEnvCreatorConfig,
88
FR3MultiHardwareEnvCreatorConfig,

extensions/rcs_fr3/src/rcs_fr3/creators.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
)
2323
from rcs.envs.scenes import RCSEnvCreator, WrapperConfig
2424
from rcs.hand.tilburg_hand import TilburgHand
25-
from rcs_fr3 import hw
25+
from rcs_fr3._core import hw
2626
from rcs_fr3.envs import FR3HW
2727

2828
import rcs

extensions/rcs_panda/src/rcs_panda/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
from rcs_panda import configs, envs
21
from rcs_panda._core import __version__, hw
32

3+
from . import configs, envs
4+
45
__all__ = [
56
"configs",
67
"hw",

extensions/rcs_panda/src/rcs_panda/configs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import numpy as np
44
from rcs._core.common import RobotType
55
from rcs.envs.base import ControlMode, RelativeTo
6-
from rcs_panda import hw
6+
from rcs_panda._core import hw
77
from rcs_panda.creators import (
88
PandaHardwareEnvCreatorConfig,
99
PandaMultiHardwareEnvCreatorConfig,

extensions/rcs_panda/src/rcs_panda/creators.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
)
2121
from rcs.envs.scenes import RCSEnvCreator, WrapperConfig
2222
from rcs.hand.tilburg_hand import TilburgHand
23-
from rcs_panda import hw
23+
from rcs_panda._core import hw
2424
from rcs_panda.envs import PandaHW
2525

2626
import rcs

0 commit comments

Comments
 (0)