Skip to content

Commit 8f58e0c

Browse files
committed
release v2.9.6
1 parent 33992ba commit 8f58e0c

File tree

4 files changed

+21
-32
lines changed

4 files changed

+21
-32
lines changed

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# ChangeLog for pymycobot
22

3-
## v2.9.5(2022-9-13)
3+
## v2.9.6 (2022-9-13)
4+
5+
- release v2.9.6
6+
- Fix MyBuddySocket get_radians()、send_radians() BUG
7+
8+
## v2.9.5 (2022-9-13)
49

510
- release v2.9.5
611
- Add MyBuddy serial open(),is_open() function

pymycobot/Interface.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# coding=utf-8
2-
from re import I
32
from pymycobot.common import ProtocolCode
43
from pymycobot.generate import MyCobotCommandGenerator
54

pymycobot/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"Mira"
3131
]
3232

33-
__version__ = "2.9.5"
33+
__version__ = "2.9.6"
3434
__author__ = "Elephantrobotics"
3535
__email__ = "[email protected]"
3636
__git_url__ = "https://github.com/elephantrobotics/pymycobot"

pymycobot/mybuddysocket.py

Lines changed: 14 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -138,45 +138,30 @@ def _mesg(self, genre, *args, **kwargs):
138138
return res
139139
return None
140140

141-
def get_radians(self):
142-
"""Get all angle return a list
141+
def get_radians(self, id):
142+
"""Get the radians of all joints
143143
144+
Args:
145+
id: 1/2 (L/R)
146+
144147
Return:
145-
data_list (list[radian...]):
148+
list: A list of float radians [radian1, ...]
146149
"""
147-
angles = self._mesg(ProtocolCode.GET_ANGLES, has_reply=True)
150+
angles = self._mesg(ProtocolCode.GET_ANGLES, id, has_reply=True)
148151
return [round(angle * (math.pi / 180), 3) for angle in angles]
149152

150-
def send_radians(self, radians, speed):
151-
"""Send all angles
153+
def send_radians(self, id, radians, speed):
154+
"""Send the radians of all joints to robot arm
152155
153156
Args:
154-
radians (list): example [0, 0, 0, 0, 0, 0]
155-
speed (int): 0 ~ 100
157+
id: 1/2 (L/R).
158+
radians: a list of radian values( List[float]), length 6
159+
speed: (int )0 ~ 100
156160
"""
157-
calibration_parameters(len6=radians, speed=speed)
161+
# calibration_parameters(len6=radians, speed=speed)
158162
degrees = [self._angle2int(radian * (180 / math.pi))
159163
for radian in radians]
160-
return self._mesg(ProtocolCode.SEND_ANGLES, degrees, speed)
161-
162-
def sync_send_angles(self, degrees, speed, timeout=7):
163-
t = time.time()
164-
self.send_angles(degrees, speed)
165-
while time.time() - t < timeout:
166-
f = self.is_in_position(degrees, 0)
167-
if f:
168-
break
169-
time.sleep(0.1)
170-
return self
171-
172-
def sync_send_coords(self, coords, speed, mode, timeout=7):
173-
t = time.time()
174-
self.send_coords(coords, speed, mode)
175-
while time.time() - t < timeout:
176-
if self.is_in_position(coords, 1):
177-
break
178-
time.sleep(0.1)
179-
return self
164+
return self._mesg(ProtocolCode.SEND_ANGLES, id, degrees, speed)
180165

181166
def set_gpio_mode(self, mode):
182167
"""Set pin coding method

0 commit comments

Comments
 (0)