diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 4a8019d76e6..37f6e089978 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -28,29 +28,29 @@ jobs: - name: Build release FW run: ${{ env.RUN }} "CERT=board/certs/debug RELEASE=1 scons" - # test: - # name: ./test.sh - # runs-on: ${{ matrix.os }} - # strategy: - # fail-fast: false - # matrix: - # os: ['macos-latest', 'ubuntu-latest'] - # timeout-minutes: 10 - # steps: - # - uses: actions/checkout@v4 - # - run: ./test.sh + test: + name: ./test.sh + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: ['macos-latest', 'ubuntu-latest'] + timeout-minutes: 10 + steps: + - uses: actions/checkout@v4 + - run: ./test.sh - # windows: - # name: windows pip package test - # runs-on: windows-latest - # timeout-minutes: 10 - # steps: - # - uses: actions/checkout@v4 - # - uses: actions/setup-python@v5 - # with: - # python-version: "3.12" - # - uses: astral-sh/setup-uv@v5 - # - name: Install package with uv - # run: uv pip install --system . - # - name: Verify importing panda - # run: python -c "from panda import Panda" + windows: + name: windows pip package test + runs-on: windows-latest + timeout-minutes: 10 + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: "3.12" + - uses: astral-sh/setup-uv@v5 + - name: Install package with uv + run: uv pip install --system . + - name: Verify importing panda + run: python -c "from panda import Panda" diff --git a/board/boards/board_declarations.h b/board/boards/board_declarations.h index 863dd9cf33e..93ff57082c6 100644 --- a/board/boards/board_declarations.h +++ b/board/boards/board_declarations.h @@ -61,3 +61,4 @@ struct board { extern struct board board_tres; extern struct board board_cuatro; extern struct board board_red; +extern struct board board_richie; diff --git a/board/jungle/scripts/loopback_test.py b/board/jungle/scripts/loopback_test.py index 397d417d3c3..8bb571cd094 100755 --- a/board/jungle/scripts/loopback_test.py +++ b/board/jungle/scripts/loopback_test.py @@ -6,7 +6,7 @@ from termcolor import cprint from opendbc.car.structs import CarParams -from panda import Panda PandaJungle +from panda import Panda, PandaJungle NUM_PANDAS_PER_TEST = 1 FOR_RELEASE_BUILDS = os.getenv("RELEASE") is not None # Release builds do not have ALLOUTPUT mode diff --git a/board/jungle/scripts/spam_can.py b/board/jungle/scripts/spam_can.py index e0b59a632f7..8b3bfba9a7b 100755 --- a/board/jungle/scripts/spam_can.py +++ b/board/jungle/scripts/spam_can.py @@ -46,7 +46,7 @@ def get_test_string(): elif bus == 2: bus2_count += 1 count += 1 - except usb1.USBErrorTimeout as e: + except usb1.USBErrorTimeout: pass except KeyboardInterrupt: break diff --git a/pyproject.toml b/pyproject.toml index 6b9af3c79da..a6516bf9f93 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ classifiers = [ dependencies = [ "libusb1", "libusb-package", - "opendbc @ git+ssh://git@github.com/Ever-Cars/opendbc.git@polar-bear#egg=opendbc", + "opendbc @ git+https://github.com/commaai/opendbc.git@3a852b049fb423cf57563e38b72ddd7592def221#egg=opendbc", # runtime dependency on comma four #"spidev; platform_system == 'Linux'", @@ -26,7 +26,6 @@ dev = [ "pycryptodome >= 3.9.8", "cffi", "flaky", - "prettytable", "pytest", "pytest-xdist", "pytest-mock", diff --git a/python/__init__.py b/python/__init__.py index ee419c8eb10..91e686f1bb0 100644 --- a/python/__init__.py +++ b/python/__init__.py @@ -738,7 +738,7 @@ def can_clear(self, bus): """ self._handle.controlWrite(Panda.REQUEST_OUT, 0xf1, bus, 0, b'') - + def get_can_rx_slots(self): """Returns the number of empty RX slots in the internal CAN ringbuffer. diff --git a/scripts/richie/led_control.py b/scripts/richie/led_control.py index 65c51288706..3f4daace281 100755 --- a/scripts/richie/led_control.py +++ b/scripts/richie/led_control.py @@ -44,10 +44,9 @@ def toggle_led(led): while True: print(chr(27) + "[2J") # clear screen - print_leds() + print_leds() led = int(input()) if led < 1 or led > len(led_state): continue toggle_led(led) - \ No newline at end of file diff --git a/scripts/spam_can.py b/scripts/spam_can.py index e8707d0a87a..587de34109c 100755 --- a/scripts/spam_can.py +++ b/scripts/spam_can.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 import os +import time import usb1 import random import argparse @@ -46,7 +47,7 @@ def get_test_string(): elif bus == 2: bus2_count += 1 count += 1 - except usb1.USBErrorTimeout as e: + except usb1.USBErrorTimeout: pass except KeyboardInterrupt: break