Skip to content

Commit f1e6936

Browse files
committed
More move to less ipy
1 parent da81560 commit f1e6936

2 files changed

Lines changed: 5 additions & 24 deletions

File tree

src/compas_fab/backends/kinematics/solvers/offset_wrist.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,12 @@
77
from math import sin
88
from math import sqrt
99

10-
from compas import IPY
1110
from compas.geometry import Frame
1211

1312
from compas_fab.utilities import sign
1413

15-
if not IPY:
16-
from typing import TYPE_CHECKING
1714

18-
if TYPE_CHECKING: # pragma: no cover
19-
from typing import List # noqa: F401
20-
21-
22-
def forward_kinematics_offset_wrist(joint_values, params):
23-
# type: (List[float], List[float]) -> Frame
15+
def forward_kinematics_offset_wrist(joint_values : list[float], params : list[float]) -> Frame:
2416
"""Forward kinematics function for offset wrist 6-axis robots.
2517
2618
Parameters
@@ -73,8 +65,7 @@ def forward_kinematics_offset_wrist(joint_values, params):
7365
return frame
7466

7567

76-
def inverse_kinematics_offset_wrist(frame, params, q6_des=0.0):
77-
# type: (Frame, List[float], float) -> List[List[float]]
68+
def inverse_kinematics_offset_wrist(frame : Frame, params : list[float], q6_des : float = 0.0) -> list[list[float]]:
7869
"""Inverse kinematics function for offset wrist 6-axis robots.
7970
8071
Parameters

src/compas_fab/backends/kinematics/solvers/offset_wrist_kinematics.py

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
1-
from compas import IPY
1+
from compas.geometry import Frame
22

33
from .analytical_kinematics import AnalyticalKinematics
44
from .offset_wrist import forward_kinematics_offset_wrist
55
from .offset_wrist import inverse_kinematics_offset_wrist
66

7-
if not IPY:
8-
from typing import TYPE_CHECKING
9-
10-
if TYPE_CHECKING: # pragma: no cover
11-
from typing import List # noqa: F401
12-
13-
from compas.geometry import Frame # noqa: F401
14-
157
# The following parameters for UR robots are taken from the following website:
168
# https://www.universal-robots.com/articles/ur/application-installation/dh-parameters-for-calculations-of-kinematics-and-dynamics/
179

@@ -78,12 +70,10 @@ def __init__(self, params):
7870
super(OffsetWristKinematics, self).__init__()
7971
self.params = params
8072

81-
def forward(self, joint_values):
82-
# type: (List[float]) -> Frame
73+
def forward(self, joint_values : list[float]) -> Frame:
8374
return forward_kinematics_offset_wrist(joint_values, self.params)
8475

85-
def inverse(self, frame_rcf):
86-
# type: (Frame) -> List[List[float]]
76+
def inverse(self, frame_rcf : Frame) -> list[list[float]]:
8777
return inverse_kinematics_offset_wrist(frame_rcf, self.params)
8878

8979

0 commit comments

Comments
 (0)