pymycobot 3.5.0.dev2__tar.gz → 3.5.0.dev3__tar.gz

{pymycobot-3.5.0.dev2/pymycobot.egg-info → pymycobot-3.5.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymycobot
-Version: 3.5.0.dev2
+Version: 3.5.0.dev3
 Summary: Python API for serial communication of MyCobot.
 Home-page: https://github.com/elephantrobotics/pymycobot
 Author: Elephantrobotics

{pymycobot-3.5.0.dev2 → pymycobot-3.5.0.dev3}/pymycobot/__init__.py

@@ -61,7 +61,7 @@ if sys.platform == "linux":
     from pymycobot.mybuddyemoticon import MyBuddyEmoticon
     __all__.append("MyBuddyEmoticon")
 
-__version__ = "3.5.0dev2" 
+__version__ = "3.5.0dev3" 
 __author__ = "Elephantrobotics"
 __email__ = "weiquan.xu@elephantrobotics.com"
 __git_url__ = "https://github.com/elephantrobotics/pymycobot"

{pymycobot-3.5.0.dev2 → pymycobot-3.5.0.dev3}/pymycobot/error.py

@@ -201,17 +201,17 @@ def calibration_parameters(**kwargs):
     robot_limit = {
     "Mercury":{
         "id":[1,2,3,4,5,6,11,12,13],
-        "angles_min":[-178, -74, -180, -178, -20, -180, -60, -140, -120],
-        "angles_max":[178, 130, 178, 10, 178, 273, 180, 0, 190, 120],
+        "angles_min":[-165, -55, -180, -165, -20, -180, -60, -140, -120],
+        "angles_max":[165, 95, 5, 165, 273, 180, 0, 190, 120],
         "coords_min":[-441.37, -441.37, -206.52, -180, -180, -180],
         "coords_max":[441.37, 441.37, 628.02, 180, 180, 180]
     },
     "MercurySocket":{
         "id":[1,2,3,4,5,6,11,12,13],
-        "angles_min":[-178, -74, -180, -178, -20, -180, -60, -140, -120],
-        "angles_max":[178, 130, 178, 10, 178, 273, 180, 0, 190, 120],
-        "coords_min":[-466, -466, -240, -180, -180, -180],
-        "coords_max":[466, 466, 531, 180, 180, 180]
+        "angles_min":[-165, -55, -180, -165, -20, -180, -60, -140, -120],
+        "angles_max":[165, 95, 5, 165, 273, 180, 0, 190, 120],
+        "coords_min":[-441.37, -441.37, -206.52, -180, -180, -180],
+        "coords_max":[441.37, 441.37, 628.02, 180, 180, 180]
     },
     "MyCobot":{
         "id":[1,2,3,4,5,6, 7],

{pymycobot-3.5.0.dev2 → pymycobot-3.5.0.dev3}/pymycobot/mercury_api.py

@@ -870,7 +870,7 @@ class MercuryCommandGenerator(CommandGenerator):
         """
         return self._mesg(ProtocolCode.MERCURY_GET_POS_OVER_SHOOT, has_reply=True)
     
-    def stop(self, deceleration=False):
+    def stop(self, deceleration=0):
         """Robot stops moving
 
         Args:
@@ -879,12 +879,12 @@ class MercuryCommandGenerator(CommandGenerator):
         Returns:
             int: 1 - Stop completion
         """
-        if deceleration:
-            return self._mesg(ProtocolCode.STOP, has_reply=True)
-        else:
+        if deceleration == 1:
             return self._mesg(ProtocolCode.STOP, 1, has_reply=True)
+        else:
+            return self._mesg(ProtocolCode.STOP, has_reply=True)    
         
-    def pause(self, deceleration=False):
+    def pause(self, deceleration=0):
         """Robot pauses movement
 
         Args:
@@ -893,10 +893,11 @@ class MercuryCommandGenerator(CommandGenerator):
         Returns:
             int: 1 - pause completion
         """
-        if deceleration:
-            return self._mesg(ProtocolCode.PAUSE, has_reply=True)
-        else:
+        if deceleration == 1:
             return self._mesg(ProtocolCode.PAUSE, 1, has_reply=True)
+        else:
+            return self._mesg(ProtocolCode.PAUSE, has_reply=True)
+        
         
     def get_modified_version(self):
         return self._mesg(ProtocolCode.ROBOT_VERSION, has_reply=True)

{pymycobot-3.5.0.dev2 → pymycobot-3.5.0.dev3/pymycobot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymycobot
-Version: 3.5.0.dev2
+Version: 3.5.0.dev3
 Summary: Python API for serial communication of MyCobot.
 Home-page: https://github.com/elephantrobotics/pymycobot
 Author: Elephantrobotics