Sync: commaai/panda:master into sunnypilot/panda:master

Merge pull request commaai#23 from sunnypilot/small-sync
opgm · May 9, 2024 · a6eb8dd · a6eb8dd
2 parents 19302c5 + 3dae205
commit a6eb8dd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -9,12 +9,12 @@ repos:
     - id: check-executables-have-shebangs
     - id: check-shebang-scripts-are-executable
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.9.0
+  rev: v1.10.0
   hooks:
     - id: mypy
       additional_dependencies: ['git+https://github.com/numpy/numpy-stubs', 'types-requests', 'types-atomicwrites',
                                 'types-pycurl']
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.4.1
+  rev: v0.4.2
   hooks:
     - id: ruff
diff --git a/board/drivers/bootkick.h b/board/drivers/bootkick.h
@@ -29,7 +29,7 @@ void bootkick_tick(bool ignition, bool recent_heartbeat) {
     * once BOOT_RESET is triggered, it stays until countdown is finished
   */
   if (!bootkick_reset_triggered && (boot_state == BOOT_BOOTKICK) && (boot_state_prev == BOOT_STANDBY)) {
-    waiting_to_boot_countdown = 45U;
+    waiting_to_boot_countdown = 20U;
   }
   if (waiting_to_boot_countdown > 0U) {
     bool serial_activity = uart_ring_som_debug.w_ptr_tx != bootkick_last_serial_ptr;

diff --git a/python/__init__.py b/python/__init__.py
@@ -373,6 +373,7 @@ def usb_connect(cls, serial, claim=True):
             this_serial = device.getSerialNumber()
           except Exception:
             logging.exception("failed to get serial number of panda")
+            continue
 
           if serial is None or this_serial == serial:
             logging.debug("opening device %s %s", this_serial, hex(device.getProductID()))

diff --git a/tests/som/test_bootkick.py b/tests/som/test_bootkick.py
@@ -145,7 +145,7 @@ def test_recovery_from_qdl(p, pj):
     pj.set_header_pin(i, 0)
 
   # normally, this GPIO is set immediately since it's first enabled in the ABL
-  for i in range(40):
+  for i in range(17):
     assert not p.read_som_gpio()
     time.sleep(1)