Skip to content

Commit 6cfa158

Browse files
authored
Merge pull request #125 from Mrkun5018/mercury_close_loop
Added set_movement_type CP mode
2 parents 5b317f8 + 9d42863 commit 6cfa158

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

pymycobot/error.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,8 @@ def calibration_parameters(**kwargs):
384384
if value not in [0,1,2]:
385385
raise MercuryDataException("The parameter {} only supports 0 or 1 or 2, but received {}".format(parameter, value))
386386
elif parameter == "move_type":
387-
if value not in [0, 1, 2, 3]:
388-
raise MercuryDataException("The parameter {} only supports 0 or 2, but received {}".format(parameter, value))
387+
if value not in [0, 1, 2, 3, 4]:
388+
raise MercuryDataException("The parameter {} only supports 0 or 4, but received {}".format(parameter, value))
389389
elif parameter == "trajectory":
390390
if value not in [0,1,2,3,4]:
391391
raise MercuryDataException("The parameter {} only supports [0,1,2,3,4], but received {}".format(parameter, value))

pymycobot/mercury_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2030,7 +2030,7 @@ def set_movement_type(self, move_type):
20302030
"""Set movement type
20312031
20322032
Args:
2033-
move_type: 0 - moveJ, 1 - moveL, 2 - moveF, 3 - moveS
2033+
move_type: 0 - moveJ, 1 - moveL, 2 - moveF, 3 - moveS, 4 - CP
20342034
"""
20352035
self.calibration_parameters(class_name=self.__class__.__name__, move_type=move_type)
20362036
return self._mesg(ProtocolCode.SET_MOVEMENT_TYPE, move_type)

0 commit comments

Comments
 (0)