pymycobot 3.5.0.dev1__tar.gz → 3.5.0.dev2__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {pymycobot-3.5.0.dev1/pymycobot.egg-info → pymycobot-3.5.0.dev2}/PKG-INFO +1 -1
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/__init__.py +1 -1
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/error.py +2 -2
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/mercury_api.py +28 -4
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2/pymycobot.egg-info}/PKG-INFO +1 -1
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot.egg-info/SOURCES.txt +0 -1
- pymycobot-3.5.0.dev1/pymycobot/robot_limit.json +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/LICENSE +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/MANIFEST.in +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/README.md +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/Interface.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/bluet.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/common.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/elephantrobot.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/generate.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/genre.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/log.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/mecharm.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/mecharmsocket.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/mercury.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/mercurychassis.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/mercurysocket.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/myagv.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/myarm.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/myarm_api.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/myarmc.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/myarmm.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/myarmsocket.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/mybuddy.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/mybuddybluetooth.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/mybuddyemoticon.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/mybuddysocket.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/mycobot.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/mycobotpro630.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/mycobotsocket.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/mypalletizer.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/mypalletizersocket.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/progripper.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/public.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/ultraArm.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot/utils.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot.egg-info/dependency_links.txt +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot.egg-info/requires.txt +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/pymycobot.egg-info/top_level.txt +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/requirements.txt +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/setup.cfg +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/setup.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/tests/test_api.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/tests/test_generator.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/tests/test_socket.py +0 -0
- {pymycobot-3.5.0.dev1 → pymycobot-3.5.0.dev2}/tests/test_utils.py +0 -0
|
@@ -61,7 +61,7 @@ if sys.platform == "linux":
|
|
|
61
61
|
from pymycobot.mybuddyemoticon import MyBuddyEmoticon
|
|
62
62
|
__all__.append("MyBuddyEmoticon")
|
|
63
63
|
|
|
64
|
-
__version__ = "3.5.
|
|
64
|
+
__version__ = "3.5.0dev2"
|
|
65
65
|
__author__ = "Elephantrobotics"
|
|
66
66
|
__email__ = "weiquan.xu@elephantrobotics.com"
|
|
67
67
|
__git_url__ = "https://github.com/elephantrobotics/pymycobot"
|
|
@@ -203,8 +203,8 @@ def calibration_parameters(**kwargs):
|
|
|
203
203
|
"id":[1,2,3,4,5,6,11,12,13],
|
|
204
204
|
"angles_min":[-178, -74, -180, -178, -20, -180, -60, -140, -120],
|
|
205
205
|
"angles_max":[178, 130, 178, 10, 178, 273, 180, 0, 190, 120],
|
|
206
|
-
"coords_min":[-
|
|
207
|
-
"coords_max":[
|
|
206
|
+
"coords_min":[-441.37, -441.37, -206.52, -180, -180, -180],
|
|
207
|
+
"coords_max":[441.37, 441.37, 628.02, 180, 180, 180]
|
|
208
208
|
},
|
|
209
209
|
"MercurySocket":{
|
|
210
210
|
"id":[1,2,3,4,5,6,11,12,13],
|
|
@@ -39,17 +39,41 @@ class MercuryCommandGenerator(CommandGenerator):
|
|
|
39
39
|
with self.lock:
|
|
40
40
|
self.write_command.append(genre)
|
|
41
41
|
self._write(self._flatten(real_command))
|
|
42
|
-
if genre in [
|
|
42
|
+
if genre in [
|
|
43
|
+
ProtocolCode.SEND_ANGLE,
|
|
44
|
+
ProtocolCode.SEND_ANGLES,
|
|
45
|
+
ProtocolCode.SEND_COORD,
|
|
46
|
+
ProtocolCode.SEND_COORDS,
|
|
47
|
+
ProtocolCode.JOG_ANGLE,
|
|
48
|
+
ProtocolCode.JOG_COORD,
|
|
49
|
+
ProtocolCode.JOG_INCREMENT,
|
|
50
|
+
ProtocolCode.JOG_INCREMENT_COORD,
|
|
51
|
+
ProtocolCode.COBOTX_SET_SOLUTION_ANGLES,
|
|
52
|
+
ProtocolCode.MERCURY_SET_BASE_COORDS,
|
|
53
|
+
ProtocolCode.MERCURY_JOG_BASE_COORD,
|
|
54
|
+
ProtocolCode.MERCURY_SET_BASE_COORD]:
|
|
43
55
|
has_reply = True
|
|
44
56
|
if has_reply:
|
|
45
57
|
t = time.time()
|
|
46
|
-
wait_time = 0.1
|
|
58
|
+
wait_time = 0.1
|
|
47
59
|
if genre == ProtocolCode.POWER_ON:
|
|
48
60
|
wait_time = 8
|
|
49
61
|
elif genre in [ProtocolCode.POWER_OFF, ProtocolCode.RELEASE_ALL_SERVOS, ProtocolCode.FOCUS_ALL_SERVOS,
|
|
50
|
-
|
|
62
|
+
ProtocolCode.RELEASE_SERVO, ProtocolCode.FOCUS_SERVO, ProtocolCode.STOP]:
|
|
51
63
|
wait_time = 3
|
|
52
|
-
elif genre in [
|
|
64
|
+
elif genre in [
|
|
65
|
+
ProtocolCode.SEND_ANGLE,
|
|
66
|
+
ProtocolCode.SEND_ANGLES,
|
|
67
|
+
ProtocolCode.SEND_COORD,
|
|
68
|
+
ProtocolCode.SEND_COORDS,
|
|
69
|
+
ProtocolCode.JOG_ANGLE,
|
|
70
|
+
ProtocolCode.JOG_COORD,
|
|
71
|
+
ProtocolCode.JOG_INCREMENT,
|
|
72
|
+
ProtocolCode.JOG_INCREMENT_COORD,
|
|
73
|
+
ProtocolCode.COBOTX_SET_SOLUTION_ANGLES,
|
|
74
|
+
ProtocolCode.MERCURY_SET_BASE_COORDS,
|
|
75
|
+
ProtocolCode.MERCURY_JOG_BASE_COORD,
|
|
76
|
+
ProtocolCode.MERCURY_SET_BASE_COORD]:
|
|
53
77
|
wait_time = 300
|
|
54
78
|
is_in_position = True
|
|
55
79
|
need_break = False
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|