Skip to content

Commit 5b317f8

Browse files
authored
Merge pull request #123 from Mrkun5018/mercury_close_loop
Mercury add api set/get_fusion_parameters
2 parents 7e86aad + a9e71a5 commit 5b317f8

File tree

3 files changed

+177
-153
lines changed

3 files changed

+177
-153
lines changed

pymycobot/common.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ class ProtocolCode(object):
9696
JOG_INCREMENT_BASE_COORD = 0x37
9797
InitGripper = 0x38
9898
SetGripperProtectCurrent = 0x39
99+
GET_FUSION_PARAMETERS = 0x4e
100+
SET_FUSION_PARAMETERS = 0x4f
99101

100102
# Overall status
101103
POWER_ON = 0x10

pymycobot/error.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ 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,2]:
387+
if value not in [0, 1, 2, 3]:
388388
raise MercuryDataException("The parameter {} only supports 0 or 2, but received {}".format(parameter, value))
389389
elif parameter == "trajectory":
390390
if value not in [0,1,2,3,4]:

0 commit comments

Comments
 (0)