release v3.3.1

elephantrobotics · Dec 4, 2023 · 45af788 · 45af788
1 parent 5088495
commit 45af788
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # ChangeLog for pymycobot
 
+## v3.3.1 (2023-12-4)
+
+- release v3.3.1
+- fix bug
+
 ## v3.3.0 (2023-11-9)
 
 - release v3.3.0

diff --git a/pymycobot/__init__.py b/pymycobot/__init__.py
@@ -52,7 +52,7 @@
     from pymycobot.mybuddyemoticon import MyBuddyEmoticon
     __all__.append("MyBuddyEmoticon")
 
-__version__ = "3.3.0b0"
+__version__ = "3.3.1"
 __author__ = "Elephantrobotics"
 __email__ = "[email protected]"
 __git_url__ = "https://github.com/elephantrobotics/pymycobot"

diff --git a/pymycobot/mecharmsocket.py b/pymycobot/mecharmsocket.py
@@ -110,7 +110,12 @@ def _mesg(self, genre, *args, **kwargs):
                 ProtocolCode.GET_FRESH_MODE,
                 ProtocolCode.GET_GRIPPER_MODE,
                 ProtocolCode.GET_ERROR_INFO,
-                ProtocolCode.GET_GPIO_IN
+                ProtocolCode.GET_GPIO_IN,
+                ProtocolCode.SetHTSGripperTorque,
+                ProtocolCode.GetHTSGripperTorque,
+                ProtocolCode.GetGripperProtectCurrent,
+                ProtocolCode.InitGripper,
+                ProtocolCode.SET_FOUR_PIECES_ZERO
             ]:
                 return self._process_single(res)
             elif genre in [ProtocolCode.GET_ANGLES]:

diff --git a/pymycobot/myarm.py b/pymycobot/myarm.py
@@ -109,8 +109,13 @@ def _mesg(self, genre, *args, **kwargs):
                 ProtocolCode.GET_REFERENCE_FRAME,
                 ProtocolCode.GET_FRESH_MODE,
                 ProtocolCode.GET_GRIPPER_MODE,
+                ProtocolCode.GET_ERROR_INFO,
                 ProtocolCode.SET_SSID_PWD,
-                ProtocolCode.GetHTSGripperTorque
+                ProtocolCode.SetHTSGripperTorque,
+                ProtocolCode.GetHTSGripperTorque,
+                ProtocolCode.GetGripperProtectCurrent,
+                ProtocolCode.InitGripper,
+                ProtocolCode.SET_FOUR_PIECES_ZERO
             ]:
                 return self._process_single(res)
             elif genre in [ProtocolCode.GET_ANGLES]:

diff --git a/pymycobot/myarmsocket.py b/pymycobot/myarmsocket.py
@@ -110,7 +110,13 @@ def _mesg(self, genre, *args, **kwargs):
                 ProtocolCode.GET_FRESH_MODE,
                 ProtocolCode.GET_GRIPPER_MODE,
                 ProtocolCode.GET_ERROR_INFO,
-                ProtocolCode.GET_GPIO_IN
+                ProtocolCode.GET_GPIO_IN,
+                ProtocolCode.SET_SSID_PWD,
+                ProtocolCode.SetHTSGripperTorque,
+                ProtocolCode.GetHTSGripperTorque,
+                ProtocolCode.GetGripperProtectCurrent,
+                ProtocolCode.InitGripper,
+                ProtocolCode.SET_FOUR_PIECES_ZERO
             ]:
                 return self._process_single(res)
             elif genre in [ProtocolCode.GET_ANGLES]:

diff --git a/pymycobot/mybuddy.py b/pymycobot/mybuddy.py
@@ -158,9 +158,12 @@ def _mesg(self, genre, *args, **kwargs):
                 ProtocolCode.GET_END_TYPE,
                 ProtocolCode.GET_MOVEMENT_TYPE,
                 ProtocolCode.GET_REFERENCE_FRAME,
-                ProtocolCode.GET_JOINT_MIN_ANGLE,
-                ProtocolCode.GET_JOINT_MAX_ANGLE,
                 ProtocolCode.GET_FRESH_MODE,
+                ProtocolCode.SetHTSGripperTorque,
+                ProtocolCode.GetHTSGripperTorque,
+                ProtocolCode.GetGripperProtectCurrent,
+                ProtocolCode.InitGripper,
+                ProtocolCode.SET_FOUR_PIECES_ZERO
                 # ProtocolCode.GET_SERVO_CURRENTS
             ]:
                 return self._process_single(res)
@@ -192,6 +195,8 @@ def _mesg(self, genre, *args, **kwargs):
                     return r
                 else:
                     return res
+            elif genre in [ProtocolCode.GET_JOINT_MAX_ANGLE, ProtocolCode.GET_JOINT_MIN_ANGLE]:
+                return self._int2coord(res[0])
             elif genre in [ProtocolCode.GET_SERVO_VOLTAGES, ProtocolCode.COLLISION]:
                 return [self._int2coord(angle) for angle in res]
             else:

diff --git a/pymycobot/mybuddysocket.py b/pymycobot/mybuddysocket.py
@@ -118,7 +118,12 @@ def _mesg(self, genre, *args, **kwargs):
                 ProtocolCode.GET_MOVEMENT_TYPE,
                 ProtocolCode.GET_REFERENCE_FRAME,
                 ProtocolCode.GET_JOINT_MIN_ANGLE,
-                ProtocolCode.GET_JOINT_MAX_ANGLE
+                ProtocolCode.GET_JOINT_MAX_ANGLE,
+                ProtocolCode.SetHTSGripperTorque,
+                ProtocolCode.GetHTSGripperTorque,
+                ProtocolCode.GetGripperProtectCurrent,
+                ProtocolCode.InitGripper,
+                ProtocolCode.SET_FOUR_PIECES_ZERO
             ]:
                 return self._process_single(res)
             elif genre in [ProtocolCode.GET_ANGLES]:

diff --git a/pymycobot/mycobot.py b/pymycobot/mycobot.py
@@ -125,7 +125,11 @@ def _res(self, real_command, has_reply, genre):
                 ProtocolCode.GET_ERROR_INFO,
                 ProtocolCode.GET_COMMUNICATE_MODE,
                 ProtocolCode.SET_COMMUNICATE_MODE,
-                ProtocolCode.GetHTSGripperTorque
+                ProtocolCode.SetHTSGripperTorque,
+                ProtocolCode.GetHTSGripperTorque,
+                ProtocolCode.GetGripperProtectCurrent,
+                ProtocolCode.InitGripper,
+                ProtocolCode.SET_FOUR_PIECES_ZERO
             ]:
                 return self._process_single(res)
             elif genre in [ProtocolCode.GET_ANGLES]:

diff --git a/pymycobot/mycobotsocket.py b/pymycobot/mycobotsocket.py
@@ -113,7 +113,12 @@ def _mesg(self, genre, *args, **kwargs):
                 ProtocolCode.GET_ERROR_INFO,
                 ProtocolCode.GET_GPIO_IN,
                 ProtocolCode.GET_COMMUNICATE_MODE,
-                ProtocolCode.SET_COMMUNICATE_MODE
+                ProtocolCode.SET_COMMUNICATE_MODE,
+                ProtocolCode.SetHTSGripperTorque,
+                ProtocolCode.GetHTSGripperTorque,
+                ProtocolCode.GetGripperProtectCurrent,
+                ProtocolCode.InitGripper,
+                ProtocolCode.SET_FOUR_PIECES_ZERO
             ]:
                 return self._process_single(res)
             elif genre in [ProtocolCode.GET_ANGLES]:

diff --git a/pymycobot/mypalletizer.py b/pymycobot/mypalletizer.py
@@ -145,7 +145,12 @@ def _mesg(self, genre, *args, **kwargs):
                 ProtocolCode.GET_BASIC_INPUT,
                 ProtocolCode.GET_TOF_DISTANCE,
                 ProtocolCode.GET_COMMUNICATE_MODE,
-                ProtocolCode.SET_COMMUNICATE_MODE
+                ProtocolCode.SET_COMMUNICATE_MODE,
+                ProtocolCode.SetHTSGripperTorque,
+                ProtocolCode.GetHTSGripperTorque,
+                ProtocolCode.GetGripperProtectCurrent,
+                ProtocolCode.InitGripper,
+                ProtocolCode.SET_FOUR_PIECES_ZERO
             ]:
                 return self._process_single(res)
             elif genre in [ProtocolCode.GET_ANGLES]:

diff --git a/pymycobot/mypalletizersocket.py b/pymycobot/mypalletizersocket.py
@@ -106,7 +106,12 @@ def _mesg(self, genre, *args, **kwargs):
                 ProtocolCode.GET_TOF_DISTANCE,
                 ProtocolCode.GET_GPIO_IN,
                 ProtocolCode.GET_COMMUNICATE_MODE,
-                ProtocolCode.SET_COMMUNICATE_MODE
+                ProtocolCode.SET_COMMUNICATE_MODE,
+                ProtocolCode.SetHTSGripperTorque,
+                ProtocolCode.GetHTSGripperTorque,
+                ProtocolCode.GetGripperProtectCurrent,
+                ProtocolCode.InitGripper,
+                ProtocolCode.SET_FOUR_PIECES_ZERO
             ]:
                 return self._process_single(res)
             elif genre in [ProtocolCode.GET_ANGLES]: