pymycobot 3.5.0.dev13__tar.gz → 3.5.0.dev15__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.dev13/pymycobot.egg-info → pymycobot-3.5.0.dev15}/PKG-INFO +1 -1
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/__init__.py +1 -1
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/error.py +4 -4
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mercury_api.py +3 -3
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15/pymycobot.egg-info}/PKG-INFO +1 -1
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/LICENSE +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/MANIFEST.in +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/README.md +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/Interface.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/bluet.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/close_loop.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/common.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/conveyor_api.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/dualcobotx.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/elephantrobot.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/generate.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/genre.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/log.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mecharm.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mecharm270.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mecharmsocket.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mercury.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mercury_arms_socket.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mercury_ros_api.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mercurychassis.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mercurychassis_api.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mercurysocket.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/myagv.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/myarm.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/myarm_api.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/myarmc.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/myarmm.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/myarmm_control.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/myarmsocket.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mybuddy.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mybuddybluetooth.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mybuddyemoticon.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mybuddysocket.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mycobot.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mycobot280.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mycobot280socket.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mycobot280x5pi.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mycobot320.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mycobot320socket.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mycobotpro630.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mycobotsocket.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mypalletizer.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mypalletizer260.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/mypalletizersocket.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/pro400.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/pro400client.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/pro630.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/pro630client.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/progripper.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/protocol_packet_handler.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/public.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/robot_info.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/sms.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/tool_coords.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/ultraArm.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot/utils.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot.egg-info/SOURCES.txt +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot.egg-info/dependency_links.txt +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot.egg-info/requires.txt +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/pymycobot.egg-info/top_level.txt +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/requirements.txt +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/setup.cfg +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/setup.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/tests/__init__.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/tests/conftest.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/tests/rasp_myArm_test_gui.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/tests/rasp_mycobot_test_gui.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/tests/rasp_mypall_test_gui.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/tests/special_angles.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/tests/test_api.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/tests/test_generator.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/tests/test_socket.py +0 -0
- {pymycobot-3.5.0.dev13 → pymycobot-3.5.0.dev15}/tests/test_utils.py +0 -0
|
@@ -87,7 +87,7 @@ if sys.platform == "linux":
|
|
|
87
87
|
from pymycobot.mybuddyemoticon import MyBuddyEmoticon
|
|
88
88
|
__all__.append("MyBuddyEmoticon")
|
|
89
89
|
|
|
90
|
-
__version__ = "3.5.
|
|
90
|
+
__version__ = "3.5.0dev15"
|
|
91
91
|
__author__ = "Elephantrobotics"
|
|
92
92
|
__email__ = "weiquan.xu@elephantrobotics.com"
|
|
93
93
|
__git_url__ = "https://github.com/elephantrobotics/pymycobot"
|
|
@@ -105,13 +105,13 @@ def check_coords(value, robot_limit, class_name, exception_class, serial_port=No
|
|
|
105
105
|
elif serial_port == "/dev/right_arm":
|
|
106
106
|
min_coord = robot_limit[class_name]["right_coords_min"]
|
|
107
107
|
max_coord = robot_limit[class_name]["right_coords_max"]
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
108
|
+
else:
|
|
109
|
+
min_coord = robot_limit[class_name]["coords_min"]
|
|
110
|
+
max_coord = robot_limit[class_name]["coords_max"]
|
|
111
111
|
for idx, coord in enumerate(value):
|
|
112
112
|
if not min_coord[idx] <= coord <= max_coord[idx]:
|
|
113
113
|
raise exception_class(
|
|
114
|
-
"Has invalid coord value, error on index {0}. received {3} .but
|
|
114
|
+
"Has invalid coord value, error on index {0}. received {3} .but coord should be {1} ~ {2}.".format(
|
|
115
115
|
idx, min_coord, max_coord, coord
|
|
116
116
|
)
|
|
117
117
|
)
|
|
@@ -1611,9 +1611,9 @@ class MercuryCommandGenerator(DataProcessor):
|
|
|
1611
1611
|
0 - False\n
|
|
1612
1612
|
-1 - Error
|
|
1613
1613
|
"""
|
|
1614
|
-
if mode == 1:
|
|
1614
|
+
if mode == 1 or mode == 2:
|
|
1615
1615
|
self.calibration_parameters(
|
|
1616
|
-
class_name=self.__class__.__name__, coords=data)
|
|
1616
|
+
class_name=self.__class__.__name__, coords=data, serial_port=self._serial_port.port)
|
|
1617
1617
|
data_list = []
|
|
1618
1618
|
for idx in range(3):
|
|
1619
1619
|
data_list.append(self._coord2int(data[idx]))
|
|
@@ -1624,7 +1624,7 @@ class MercuryCommandGenerator(DataProcessor):
|
|
|
1624
1624
|
class_name=self.__class__.__name__, angles=data)
|
|
1625
1625
|
data_list = [self._angle2int(i) for i in data]
|
|
1626
1626
|
else:
|
|
1627
|
-
raise Exception("mode is not right, please input 0 or 1")
|
|
1627
|
+
raise Exception("mode is not right, please input 0 or 1 or 2")
|
|
1628
1628
|
|
|
1629
1629
|
return self._mesg(ProtocolCode.IS_IN_POSITION, data_list, mode)
|
|
1630
1630
|
|
|
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
|
|
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
|