Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "panda"]
path = panda
url = ../../commaai/panda.git
[submodule "opendbc"]
path = opendbc_repo
url = ../../commaai/opendbc.git
Expand Down
12 changes: 10 additions & 2 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import platform
import shlex
import importlib
import numpy as np
import panda

import SCons.Errors
from SCons.Defaults import _stripixes
Expand Down Expand Up @@ -79,6 +80,10 @@ def _libflags(target, source, env, for_signature):
return _stripixes(env['LIBLINKPREFIX'], libs, env['LIBLINKSUFFIX'],
env['LIBPREFIXES'], env['LIBSUFFIXES'], env, env['LIBLITERALPREFIX'])

# dynamic path for panda
PANDA_DIR = os.path.dirname(panda.__file__)
SITE_PACKAGES_DIR = os.path.dirname(PANDA_DIR)

env = Environment(
ENV={
"PATH": os.environ['PATH'],
Expand Down Expand Up @@ -113,6 +118,8 @@ env = Environment(
"#third_party/acados/include/hpipm/include",
"#third_party/catch2/include",
[x.INCLUDE_DIR for x in pkgs],
PANDA_DIR,
SITE_PACKAGES_DIR,
],
LIBPATH=[
"#common",
Expand Down Expand Up @@ -227,8 +234,9 @@ messaging = [socketmaster, msgq, 'capnp', 'kj',]
Export('messaging')


# Build other submodules
SConscript(['panda/SConscript'])
# replaced hardcoded call to remove dependency on panda submodule
panda_sconscript = os.path.join(PANDA_DIR, 'SConscript')
SConscript(panda_sconscript, variant_dir='build/panda', duplicate=0)

# Build rednose library
SConscript(['rednose/SConscript'])
Expand Down
1 change: 0 additions & 1 deletion panda
Submodule panda deleted from b19b66
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ dependencies = [
"aiortc",

# panda
"pandacan @ git+https://github.com/adwit-agg/panda.git@fix-pip-package",
"libusb1",
"spidev; platform_system == 'Linux'",

Expand Down
52 changes: 52 additions & 0 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading