Skip to content
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Harden shared port refcount close and SC center error handling
Agent-Logs-Url: https://github.com/makerforgetech/modular-biped/sessions/ce792005-8d16-4964-9853-5beedd8c2a79

Co-authored-by: danic85 <6583012+danic85@users.noreply.github.com>
  • Loading branch information
Copilot and danic85 authored Apr 20, 2026
commit 586c158534bc562590b527eac83781fd34db4655
23 changes: 16 additions & 7 deletions src/modules/actuators/bus_servo/bus_servo.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,11 @@ def detach(self):
def exit(self):
self.detach()
if self._port_key in self._shared_port_refcounts:
self._shared_port_refcounts[self._port_key] -= 1
if self._shared_port_refcounts[self._port_key] <= 0:
with self._port_lock:
with self._port_lock:
self._shared_port_refcounts[self._port_key] -= 1
if self._shared_port_refcounts[self._port_key] > 0:
return
else:
self.portHandler.closePort()
del self._shared_port_refcounts[self._port_key]
del self._shared_port_locks[self._port_key]
Expand Down Expand Up @@ -487,7 +489,14 @@ def calibrate_to_center(self):
elif self.model.startswith('SC'):
self.pos = (self.range[0] + self.range[1]) // 2 # Update current position to center
with self._port_lock:
self.packetHandler.write1ByteTxRx(self.portHandler, self.index, ADDR_SCS_GOAL_ACC, self.acceleration)
self.packetHandler.write2ByteTxRx(self.portHandler, self.index, ADDR_SCS_GOAL_SPEED, self.speed)
self.packetHandler.write2ByteTxRx(self.portHandler, self.index, ADDR_SCS_GOAL_POSITION, self.pos)
self.log(f"Moved servo {self.identifier} to position {self.pos}")
acc_result, acc_error = self.packetHandler.write1ByteTxRx(self.portHandler, self.index, ADDR_SCS_GOAL_ACC, self.acceleration)
speed_result, speed_error = self.packetHandler.write2ByteTxRx(self.portHandler, self.index, ADDR_SCS_GOAL_SPEED, self.speed)
pos_result, pos_error = self.packetHandler.write2ByteTxRx(self.portHandler, self.index, ADDR_SCS_GOAL_POSITION, self.pos)
if any([
self.handle_errors(acc_result, acc_error),
self.handle_errors(speed_result, speed_error),
self.handle_errors(pos_result, pos_error),
]):
self.log(f"Failed to move servo {self.identifier} to center position {self.pos}", level='error')
else:
self.log(f"Moved servo {self.identifier} to position {self.pos}")