export pandad_python

commaai · Jun 11, 2024 · 29f8d81 · 29f8d81
1 parent 0b60f14
commit 29f8d81
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/opendbc b/opendbc
diff --git a/selfdrive/controls/lib/lateral_mpc_lib/SConscript b/selfdrive/controls/lib/lateral_mpc_lib/SConscript
@@ -1,4 +1,4 @@
-Import('env', 'envCython', 'arch', 'msgq_python', 'common_python', 'opendbc_python')
+Import('env', 'envCython', 'arch', 'msgq_python', 'common_python', 'opendbc_python', 'pandad_python')
 
 gen = "c_generated_code"
 
@@ -60,7 +60,11 @@ lenv.Clean(generated_files, Dir(gen))
 generated_lat = lenv.Command(generated_files,
                              source_list,
                              f"cd {Dir('.').abspath} && python3 lat_mpc.py")
+<<<<<<< HEAD
 lenv.Depends(generated_lat, [msgq_python, common_python, opendbc_python])
+=======
+lenv.Depends(generated_lat, [messaging_python, common_python, opendbc_python, pandad_python])
+>>>>>>> export pandad_python
 
 lenv["CFLAGS"].append("-DACADOS_WITH_QPOASES")
 lenv["CXXFLAGS"].append("-DACADOS_WITH_QPOASES")

diff --git a/selfdrive/controls/lib/longitudinal_mpc_lib/SConscript b/selfdrive/controls/lib/longitudinal_mpc_lib/SConscript
@@ -1,4 +1,4 @@
-Import('env', 'envCython', 'arch', 'msgq_python', 'common_python', 'opendbc_python')
+Import('env', 'envCython', 'arch', 'msgq_python', 'common_python', 'opendbc_python', 'pandad_python')
 
 gen = "c_generated_code"
 
@@ -66,7 +66,11 @@ lenv.Clean(generated_files, Dir(gen))
 generated_long = lenv.Command(generated_files,
                               source_list,
                               f"cd {Dir('.').abspath} && python3 long_mpc.py")
+<<<<<<< HEAD
 lenv.Depends(generated_long, [msgq_python, common_python, opendbc_python])
+=======
+lenv.Depends(generated_long, [messaging_python, common_python, opendbc_python, pandad_python])
+>>>>>>> export pandad_python
 
 lenv["CFLAGS"].append("-DACADOS_WITH_QPOASES")
 lenv["CXXFLAGS"].append("-DACADOS_WITH_QPOASES")

diff --git a/selfdrive/debug/check_can_parser_performance.py b/selfdrive/debug/check_can_parser_performance.py
@@ -9,7 +9,6 @@
 from openpilot.selfdrive.pandad import can_capnp_to_list
 from openpilot.tools.plotjuggler.juggle import DEMO_ROUTE
 
-
 N_RUNS = 10
 
 

diff --git a/selfdrive/pandad/SConscript b/selfdrive/pandad/SConscript
@@ -6,6 +6,7 @@ panda = env.Library('panda', ['panda.cc', 'panda_comms.cc', 'spi.cc'])
 env.Program('pandad', ['main.cc', 'pandad.cc'], LIBS=[panda] + libs)
 env.Library('libcan_list_to_can_capnp', ['can_list_to_can_capnp.cc'])
 
-envCython.Program('pandad_api_impl.so', 'pandad_api_impl.pyx', LIBS=["can_list_to_can_capnp", 'capnp', 'kj'] + envCython["LIBS"])
+pandad_python = envCython.Program('pandad_api_impl.so', 'pandad_api_impl.pyx', LIBS=["can_list_to_can_capnp", 'capnp', 'kj'] + envCython["LIBS"])
+Export('pandad_python')
 if GetOption('extras'):
   env.Program('tests/test_pandad_usbprotocol', ['tests/test_pandad_usbprotocol.cc'], LIBS=[panda] + libs)