Skip to content

Commit

Permalink
Add multiple pandas selector (#2015)
Browse files Browse the repository at this point in the history
* multiple Panda cli helper

* Don't flash all pandas by default. Use --all arg to flash all.
  • Loading branch information
dzid26 authored Sep 24, 2024
1 parent 2037a2e commit 38cab7d
Show file tree
Hide file tree
Showing 6 changed files with 78 additions and 15 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ pipeline {
phone_steps("panda-tres", [
["build", "scons -j4"],
["flash", "cd tests/ && ./reflash_internal_panda.py"],
["flash jungle", "cd board/jungle && ./flash.py"],
["flash jungle", "cd board/jungle && ./flash.py --all"],
["test", "cd tests/hitl && HW_TYPES=9 pytest -n0 --durations=0 2*.py [5-9]*.py"],
])
}
Expand All @@ -118,7 +118,7 @@ pipeline {
phone_steps("panda-dos", [
["build", "scons -j4"],
["flash", "cd tests/ && ./reflash_internal_panda.py"],
["flash jungle", "cd board/jungle && ./flash.py"],
["flash jungle", "cd board/jungle && ./flash.py --all"],
["test", "cd tests/hitl && HW_TYPES=6 pytest -n0 --durations=0 [2-9]*.py -k 'not test_send_recv'"],
])
}
Expand Down
15 changes: 12 additions & 3 deletions board/flash.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
#!/usr/bin/env python3
import os
import subprocess
import argparse

from panda import Panda

board_path = os.path.dirname(os.path.realpath(__file__))

if __name__ == "__main__":
parser = argparse.ArgumentParser()
parser.add_argument("--all", action="store_true", help="Recover all Panda devices")
args = parser.parse_args()

subprocess.check_call(f"scons -C {board_path}/.. -j$(nproc) {board_path}", shell=True)

serials = Panda.list()
print(f"found {len(serials)} panda(s) - {serials}")
if args.all:
serials = Panda.list()
print(f"found {len(serials)} panda(s) - {serials}")
else:
serials = [None]

for s in serials:
print("flashing", s)
with Panda(serial=s) as p:
print("flashing", p.get_usb_serial())
p.flash()
exit(1 if len(serials) == 0 else 0)
16 changes: 12 additions & 4 deletions board/jungle/flash.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
#!/usr/bin/env python3
import os
import subprocess
import argparse

from panda import PandaJungle

board_path = os.path.dirname(os.path.realpath(__file__))

if __name__ == "__main__":
parser = argparse.ArgumentParser()
parser.add_argument("--all", action="store_true", help="Recover all panda jungle devices")
args = parser.parse_args()

subprocess.check_call(f"scons -C {board_path}/.. -u -j$(nproc) {board_path}", shell=True)

serials = PandaJungle.list()
print(f"found {len(serials)} panda jungle(s) - {serials}")
if args.all:
serials = PandaJungle.list()
print(f"found {len(serials)} panda jungles(s) - {serials}")
else:
serials = [None]

for s in serials:
print("flashing", s)
with PandaJungle(serial=s) as p:
print("flashing", p.get_usb_serial())
p.flash()

exit(1 if len(serials) == 0 else 0)
10 changes: 8 additions & 2 deletions board/jungle/recover.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,23 @@
import os
import time
import subprocess
import argparse

from panda import PandaJungle, PandaJungleDFU

board_path = os.path.dirname(os.path.realpath(__file__))

if __name__ == "__main__":
parser = argparse.ArgumentParser()
parser.add_argument("--all", action="store_true", help="Recover all panda jungle devices")
args = parser.parse_args()

subprocess.check_call(f"scons -C {board_path}/.. -u -j$(nproc) {board_path}", shell=True)

for s in PandaJungle.list():
print("putting", s, "in DFU mode")
serials = PandaJungle.list() if args.all else [None]
for s in serials:
with PandaJungle(serial=s) as p:
print(f"putting {p.get_usb_serial()} in DFU mode")
p.reset(enter_bootstub=True)
p.reset(enter_bootloader=True)

Expand Down
10 changes: 8 additions & 2 deletions board/recover.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,23 @@
import os
import time
import subprocess
import argparse

from panda import Panda, PandaDFU

board_path = os.path.dirname(os.path.realpath(__file__))

if __name__ == "__main__":
parser = argparse.ArgumentParser()
parser.add_argument("--all", action="store_true", help="Recover all Panda devices")
args = parser.parse_args()

subprocess.check_call(f"scons -C {board_path}/.. -j$(nproc) {board_path}", shell=True)

for s in Panda.list():
print("putting", s, "in DFU mode")
serials = Panda.list() if args.all else [None]
for s in serials:
with Panda(serial=s) as p:
print(f"putting {p.get_usb_serial()} in DFU mode")
p.reset(enter_bootstub=True)
p.reset(enter_bootloader=True)

Expand Down
38 changes: 36 additions & 2 deletions python/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,18 +224,46 @@ class Panda:
FLAG_FORD_LONG_CONTROL = 1
FLAG_FORD_CANFD = 2

def __init__(self, serial: str | None = None, claim: bool = True, disable_checks: bool = True, can_speed_kbps: int = 500):
self._connect_serial = serial
def __init__(self, serial: str | None = None, claim: bool = True, disable_checks: bool = True, can_speed_kbps: int = 500, cli: bool = True):
self._disable_checks = disable_checks

self._handle: BaseHandle
self._handle_open = False
self.can_rx_overflow_buffer = b''
self._can_speed_kbps = can_speed_kbps

if cli and serial is None:
self._connect_serial = self._cli_select_panda()
else:
self._connect_serial = serial

# connect and set mcu type
self.connect(claim)

def _cli_select_panda(self):
dfu_pandas = PandaDFU.list()
if len(dfu_pandas) > 0:
print("INFO: some attached pandas are in DFU mode.")

pandas = self.list()
if len(pandas) == 0:
print("INFO: panda not available")
return None
if len(pandas) == 1:
print(f"INFO: connecting to panda {pandas[0]}")
time.sleep(1)
return pandas[0]
while True:
print("Multiple pandas available:")
pandas.sort()
for idx, serial in enumerate(pandas):
print(f"{[idx]}: {serial}")
try:
choice = int(input("Choose serial [0]:") or "0")
return pandas[choice]
except (ValueError, IndexError):
print("Enter a valid index.")

def __enter__(self):
return self

Expand Down Expand Up @@ -391,6 +419,12 @@ def usb_connect(cls, serial, claim=True, no_error=False):

return context, usb_handle, usb_serial, bootstub, bcd

def is_connected_spi(self):
return isinstance(self._handle, PandaSpiHandle)

def is_connected_usb(self):
return isinstance(self._handle, PandaUsbHandle)

@classmethod
def list(cls):
ret = cls.usb_list()
Expand Down

0 comments on commit 38cab7d

Please sign in to comment.