Skip to content

Commit 3fc5d95

Browse files
committed
release v3.6.4
1 parent 4a6d9d9 commit 3fc5d95

File tree

3 files changed

+18
-13
lines changed

3 files changed

+18
-13
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# ChangeLog for pymycobot
22

3+
## v3.6.4 (2024-10-22)
4+
5+
- release v3.6.4
6+
- Fix set_encoder function BUG
7+
38
## v3.6.3 (2024-10-17)
49

510
- release v3.6.3

pymycobot/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
from pymycobot.mybuddyemoticon import MyBuddyEmoticon
8686
__all__.append("MyBuddyEmoticon")
8787

88-
__version__ = "3.6.3"
88+
__version__ = "3.6.4"
8989
__author__ = "Elephantrobotics"
9090
__email__ = "weiquan.xu@elephantrobotics.com"
9191
__git_url__ = "https://github.com/elephantrobotics/pymycobot"

pymycobot/error.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@ def public_check(parameter_list, kwargs, robot_limit, class_name, exception_clas
239239
elif parameter in ['servo_id_pdi', 'encode_id']:
240240
check_value_type(parameter, value_type, exception_class, int)
241241
if "MyCobot" in class_name or "MechArm" in class_name:
242-
if value < 1 or value > 6:
243-
raise exception_class("The range of id is 1 ~ 6, but the received is {}".format(value))
242+
if value < 1 or value > 7:
243+
raise exception_class("The range of id is 1 ~ 6 or 7, but the received is {}".format(value))
244244
if class_name in ["MyPalletizer", "MyPalletizer260"]:
245245
if value < 1 or value > 4:
246246
raise exception_class("The range of id is 1 ~ 4, but the received is {}".format(value))
@@ -619,8 +619,8 @@ def calibration_parameters(**kwargs):
619619
"The range of speed is 0 ~ 3400, but the received value is {}".format(data))
620620
elif parameter in ['servo_id_pdi', 'encode_id']:
621621
check_value_type(parameter, value_type, MyCobot280DataException, int)
622-
if value < 1 or value > 6:
623-
raise MyCobot280DataException("The range of id is 1 ~ 6, but the received is {}".format(value))
622+
if value < 1 or value > 7:
623+
raise MyCobot280DataException("The range of id is 1 ~ 6 or 7, but the received is {}".format(value))
624624
elif parameter == "torque":
625625
torque_min = 150
626626
torque_max = 980
@@ -737,8 +737,8 @@ def calibration_parameters(**kwargs):
737737
"The range of speed is 0 ~ 3400, but the received value is {}".format(data))
738738
elif parameter in ['servo_id_pdi', 'encode_id']:
739739
check_value_type(parameter, value_type, MyCobot320DataException, int)
740-
if value < 1 or value > 6:
741-
raise MyCobot320DataException("The range of id is 1 ~ 6, but the received is {}".format(value))
740+
if value < 1 or value > 7:
741+
raise MyCobot320DataException("The range of id is 1 ~ 6 or 7, but the received is {}".format(value))
742742
elif parameter == "torque":
743743
torque_min = 150
744744
torque_max = 980
@@ -971,8 +971,8 @@ def calibration_parameters(**kwargs):
971971
"The range of speed is 0 ~ 3400, but the received value is {}".format(data))
972972
elif parameter in ['servo_id_pdi', 'encode_id']:
973973
check_value_type(parameter, value_type, MechArmDataException, int)
974-
if value < 1 or value > 6:
975-
raise MechArmDataException("The range of id is 1 ~ 6, but the received is {}".format(value))
974+
if value < 1 or value > 7:
975+
raise MechArmDataException("The range of id is 1 ~ 6 or 7, but the received is {}".format(value))
976976
elif parameter == "torque":
977977
torque_min = 150
978978
torque_max = 980
@@ -1103,8 +1103,8 @@ def calibration_parameters(**kwargs):
11031103
"The range of speed is 0 ~ 3400, but the received value is {}".format(data))
11041104
elif parameter in ['servo_id_pdi', 'encode_id']:
11051105
check_value_type(parameter, value_type, MyArmDataException, int)
1106-
if value < 1 or value > 7:
1107-
raise MyArmDataException("The range of id is 1 ~ 7, but the received is {}".format(value))
1106+
if value < 1 or value > 8:
1107+
raise MyArmDataException("The range of id is 1 ~ 7 or 8, but the received is {}".format(value))
11081108
elif parameter == "torque":
11091109
torque_min = 150
11101110
torque_max = 980
@@ -1246,8 +1246,8 @@ def calibration_parameters(**kwargs):
12461246
"The range of speed is 0 ~ 3400, but the received value is {}".format(data))
12471247
elif parameter in ['servo_id_pdi', 'encode_id']:
12481248
check_value_type(parameter, value_type, MyPalletizer260DataException, int)
1249-
if value < 1 or value > 4:
1250-
raise MyPalletizer260DataException("The range of id is 1 ~ 4, but the received is {}".format(value))
1249+
if value < 1 or (value > 4 and value != 7):
1250+
raise MyPalletizer260DataException("The range of id is 1 ~ 4 or 7, but the received is {}".format(value))
12511251
elif parameter == "torque":
12521252
torque_min = 150
12531253
torque_max = 980

0 commit comments

Comments
 (0)