Skip to content

Commit 08df5db

Browse files
committed
fix is_servo_enable no return error.
fix demo.
1 parent 2599eb3 commit 08df5db

File tree

3 files changed

+40
-22
lines changed

3 files changed

+40
-22
lines changed

demo/reader.py

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,14 @@
1-
import serial
2-
import serial.tools.list_ports
31
from pymycobot.mycobot import MyCobot
2+
from port_setup import setup
43

5-
port: str
64
mc: MyCobot
75
sp: int = 80
86

97

108
def setup():
119
print("")
12-
global port, mc
13-
plist = list(serial.tools.list_ports.comports())
14-
idx = 1
15-
for port in plist:
16-
print("{} : {}".format(idx, port))
17-
idx += 1
18-
19-
_in = input("\nPlease input 1 - {} to choice:".format(idx - 1))
20-
port = str(plist[int(_in) - 1]).split(" - ")[0].strip()
21-
print(port)
22-
print("")
23-
24-
DEBUG = False
25-
f = input("Wether DEBUG mode[Y/n]:")
26-
if f in ["y", "Y", "yes", "Yes"]:
27-
DEBUG = True
28-
# mc = MyCobot(port, debug=True)
29-
mc = MyCobot(port, debug=DEBUG)
10+
global mc
11+
mc = setup()
3012

3113

3214
def focus():

pymycobot/generate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ def get_joint_max_angle(self, joint_id):
381381

382382
# Servo control
383383
def is_servo_enable(self, servo_id):
384-
return self._mesg(Command.IS_SERVO_ENABLE, servo_id)
384+
return self._mesg(Command.IS_SERVO_ENABLE, servo_id, has_reply=True)
385385

386386
def is_all_servo_enable(self):
387387
return self._mesg(Command.IS_ALL_SERVO_ENABLE, has_reply=True)

tests/test_generator.py

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,40 +22,76 @@ def setup():
2222

2323

2424
def test_generator(setup):
25+
print("")
2526
pprint(mg.send_coords([-160, 160, 160, 0, 0, 0], 7, 2))
27+
print("")
2628
pprint(mg.version())
29+
print("")
2730
pprint(mg.power_on())
31+
print("")
2832
pprint(mg.power_off())
33+
print("")
2934
pprint(mg.release_all_servos())
35+
print("")
3036
pprint(mg.is_controller_connected())
37+
print("")
3138
pprint(mg.get_angles())
39+
print("")
3240
pprint(mg.send_angle(1, 0, 10))
41+
print("")
3342
pprint(mg.send_angles([0, 0, 0, 0, 0, 0], 5))
43+
print("")
3444
pprint(mg.get_coords())
45+
print("")
3546
pprint(mg.send_coord(1, 110.5, 8))
47+
print("pause")
3648
pprint(mg.pause())
49+
print("is_paused")
3750
pprint(mg.is_paused())
51+
print("resume")
3852
pprint(mg.resume())
53+
print("stop")
3954
pprint(mg.stop())
55+
print("is_in_position")
4056
pprint(mg.is_in_position([0, 0, 0, 0, 0, 0], 0))
57+
print("")
4158
pprint(mg.is_moving())
59+
print("")
4260
pprint(mg.jog_angle(1, 0, 1))
61+
print("")
4362
pprint(mg.jog_coord(2, 1, 3))
63+
print("")
4464
pprint(mg.jog_stop())
65+
print("set_encoder")
4566
pprint(mg.set_encoder(1, 1024))
67+
print("get_encoder")
4668
pprint(mg.get_encoder(2))
69+
print("get_speed")
4770
pprint(mg.get_speed())
71+
print("set_speed")
4872
pprint(mg.set_speed(100))
73+
print("get_joint_min_angle")
4974
pprint(mg.get_joint_min_angle(1))
75+
print("get_joint_max_angle")
5076
pprint(mg.get_joint_max_angle(2))
77+
print("is_servo_enable")
5178
pprint(mg.is_servo_enable(6))
79+
print("is_all_servo_enable")
5280
pprint(mg.is_all_servo_enable())
81+
print("set_servo_data")
5382
pprint(mg.set_servo_data(0, 1, 2))
83+
print("get_servo_data")
5484
pprint(mg.get_servo_data(1, 2))
85+
print("set_servo_calibration")
5586
pprint(mg.set_servo_calibration(1))
87+
print("release_servo")
5688
pprint(mg.release_servo(1))
89+
print("focus_servo")
5790
pprint(mg.focus_servo(1))
91+
print("set_color")
5892
pprint(mg.set_color(255, 255, 0))
93+
print("set_pin_mode")
5994
pprint(mg.set_pin_mode(1, 0))
95+
print("set_digital_output")
6096
pprint(mg.set_digital_output(0, 1))
6197
pprint(mg)

0 commit comments

Comments
 (0)