Skip to content

Commit ac50622

Browse files
committed
Fix variable naming conflicts
1 parent 5cd6389 commit ac50622

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

pymycobot/common.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ class ProtocolCode(object):
4444
GET_ANGLE = 0x2C
4545
GET_COORD = 0x2D
4646
SEND_ANGLES_AUTO = 0x2E
47+
SET_SOLUTION_ANGLES = 0x2E
48+
GET_SOLUTION_ANGLES = 0x2F
4749

4850
# JOG MODE AND OPERATION
4951
JOG_ANGLE = 0x30
@@ -184,7 +186,7 @@ class ProtocolCode(object):
184186
SET_ANGLES = "M11"
185187
GET_CURRENT_ANGLE_INFO = "M12"
186188
SET_JOG_ANGLE = "M13"
187-
JOG_COORD = "M14"
189+
JOG_COORD_ = "M14"
188190
SET_JOG_STOP = "M15"
189191
RELEASE_SERVOS = "M17"
190192
LOCK_SERVOS = "M18"

pymycobot/ultraArm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ def set_jog_coord(self, axis=None, direction=None, speed=0):
466466
1 : negative
467467
speed : (int) 0-100 mm/s
468468
"""
469-
command = ProtocolCode.JOG_COORD
469+
command = ProtocolCode.JOG_COORD_
470470
if axis is not None:
471471
command += " j" + str(axis)
472472
if direction is not None:

0 commit comments

Comments
 (0)