pymycobot 3.5.0.dev5__tar.gz → 3.5.0.dev6__tar.gz

{pymycobot-3.5.0.dev5/pymycobot.egg-info → pymycobot-3.5.0.dev6}/PKG-INFO

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

{pymycobot-3.5.0.dev5 → pymycobot-3.5.0.dev6}/pymycobot/__init__.py

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

{pymycobot-3.5.0.dev5 → pymycobot-3.5.0.dev6}/pymycobot/mercury_api.py

@@ -61,21 +61,21 @@ class MercuryCommandGenerator(CommandGenerator):
             elif genre in [ProtocolCode.POWER_OFF, ProtocolCode.RELEASE_ALL_SERVOS, ProtocolCode.FOCUS_ALL_SERVOS,
                            ProtocolCode.RELEASE_SERVO, ProtocolCode.FOCUS_SERVO, ProtocolCode.STOP]:
                 wait_time = 3
-            elif genre in [
-                ProtocolCode.SEND_ANGLE,
-                ProtocolCode.SEND_ANGLES,
-                ProtocolCode.SEND_COORD,
-                ProtocolCode.SEND_COORDS,
-                ProtocolCode.JOG_ANGLE,
-                ProtocolCode.JOG_COORD,
-                ProtocolCode.JOG_INCREMENT,
-                ProtocolCode.JOG_INCREMENT_COORD,
-                ProtocolCode.COBOTX_SET_SOLUTION_ANGLES,
-                ProtocolCode.MERCURY_SET_BASE_COORDS,
-                ProtocolCode.MERCURY_JOG_BASE_COORD,
-                ProtocolCode.MERCURY_SET_BASE_COORD]:
-                wait_time = 300
-                is_in_position = True
+            # elif genre in [
+            #     ProtocolCode.SEND_ANGLE,
+            #     ProtocolCode.SEND_ANGLES,
+            #     ProtocolCode.SEND_COORD,
+            #     ProtocolCode.SEND_COORDS,
+            #     ProtocolCode.JOG_ANGLE,
+            #     ProtocolCode.JOG_COORD,
+            #     ProtocolCode.JOG_INCREMENT,
+            #     ProtocolCode.JOG_INCREMENT_COORD,
+            #     ProtocolCode.COBOTX_SET_SOLUTION_ANGLES,
+            #     ProtocolCode.MERCURY_SET_BASE_COORDS,
+            #     ProtocolCode.MERCURY_JOG_BASE_COORD,
+            #     ProtocolCode.MERCURY_SET_BASE_COORD]:
+            #     wait_time = 300
+            #     is_in_position = True
             need_break = False
             data = None
             while True and time.time() - t < wait_time:
@@ -437,8 +437,9 @@ class MercuryCommandGenerator(CommandGenerator):
                         for d in datas:
                             command_log += hex(d)[2:] + " "
                         self.log.debug("_read : {}".format(command_log))
-                    with self.lock:
-                        self.read_command.append(res)
+                    if res != []:
+                        with self.lock:
+                            self.read_command.append(res)
                 # return datas
         
     def set_solution_angles(self, angle, speed):

{pymycobot-3.5.0.dev5 → pymycobot-3.5.0.dev6/pymycobot.egg-info}/PKG-INFO

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