remove retry loop from can_send_many

commaai · Oct 4, 2024 · 7de4096 · 7de4096
1 parent abdc418
commit 7de4096
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/python/__init__.py b/python/__init__.py
@@ -831,18 +831,13 @@ def can_reset_communications(self):
  @ensure_can_packet_version
  def can_send_many(self, arr, timeout=CAN_SEND_TIMEOUT_MS):
  snds = pack_can_buffer(arr)
- while True:
- try:
- for tx in snds:
- while True:
- bs = self._handle.bulkWrite(3, tx, timeout=timeout)
- tx = tx[bs:]
- if len(tx) == 0:
- break
- logger.error("CAN: PARTIAL SEND MANY, RETRYING")
- break
- except (usb1.USBErrorIO, usb1.USBErrorOverflow):
- logger.error("CAN: BAD SEND MANY, RETRYING")
+ for tx in snds:
+ while True:
+ bs = self._handle.bulkWrite(3, tx, timeout=timeout)
+ tx = tx[bs:]
+ if len(tx) == 0:
+ break
+ logger.error("CAN: PARTIAL SEND MANY, RETRYING")
 
  def can_send(self, addr, dat, bus, timeout=CAN_SEND_TIMEOUT_MS):
  self.can_send_many([[addr, dat, bus]], timeout=timeout)