the one true car.capnp (#38221)

* the one true car.capnp

* fix jotpluggler capnp import path

* bump to master

tools/jotpluggler/SConscript

@@ -95,6 +95,8 @@ event_extractors = jot_env.Command("generated_event_extractors.h", [
     "generate_event_extractors.py",
     jot_env.Glob("#cereal/*.capnp"),
     jot_env.Glob("#cereal/include/*.capnp"),
+    "#opendbc_repo/opendbc/car/car.capnp",
+    "#opendbc_repo/opendbc/car/include/c++.capnp",
   ],
   generate_event_extractors,
 )

tools/jotpluggler/generate_event_extractors.py

@@ -321,7 +321,7 @@ if __name__ == "__main__":
   repo_root = Path(sys.argv[1]).resolve()
   output = Path(sys.argv[2])
   capnp.remove_import_hook()
-  log = capnp.load(str(repo_root / "cereal" / "log.capnp"))
+  log = capnp.load(str(repo_root / "cereal" / "log.capnp"), imports=[str(repo_root / "opendbc_repo" / "opendbc" / "car")])
   generated = Generator(log.Event.schema).generate()
   output.parent.mkdir(parents=True, exist_ok=True)
   output.write_text(generated)

tools/joystick/joystickd.py

@@ -3,7 +3,8 @@
 import math
 import numpy as np
 
-from cereal import messaging, car
+from cereal import messaging
+from opendbc.car.structs import car
 from opendbc.car.vehicle_model import VehicleModel
 from openpilot.common.realtime import DT_CTRL, Ratekeeper
 from openpilot.common.params import Params

tools/lateral_maneuvers/generate_report.py

@@ -11,7 +11,7 @@ from pathlib import Path
 import matplotlib.pyplot as plt
 from openpilot.common.utils import tabulate
 
-from cereal import car
+from opendbc.car.structs import car
 from openpilot.common.filter_simple import FirstOrderFilter
 from openpilot.selfdrive.controls.lib.latcontrol_torque import LP_FILTER_CUTOFF_HZ
 from openpilot.tools.lib.logreader import LogReader

tools/lateral_maneuvers/lateral_maneuversd.py

@@ -2,7 +2,8 @@
 import numpy as np
 from dataclasses import dataclass
 
-from cereal import messaging, car
+from cereal import messaging
+from opendbc.car.structs import car
 from openpilot.common.constants import CV
 from openpilot.common.realtime import DT_MDL
 from openpilot.common.params import Params

tools/longitudinal_maneuvers/maneuversd.py

@@ -2,7 +2,8 @@
 import numpy as np
 from dataclasses import dataclass
 
-from cereal import messaging, car
+from cereal import messaging
+from opendbc.car.structs import car
 from openpilot.common.constants import CV
 from openpilot.common.realtime import DT_MDL
 from openpilot.common.params import Params

tools/scripts/car/fw_versions.py

@@ -2,7 +2,7 @@
 import time
 import argparse
 import cereal.messaging as messaging
-from cereal import car
+from opendbc.car.structs import car
 from opendbc.car.carlog import carlog
 from opendbc.car.fw_versions import get_fw_versions, match_fw_to_car
 from opendbc.car.vin import get_vin

tools/scripts/cycle_alerts.py

@@ -2,7 +2,8 @@
 import time
 import random
 
-from cereal import car, log
+from cereal import log
+from opendbc.car.structs import car
 import cereal.messaging as messaging
 from opendbc.car.honda.interface import CarInterface
 from openpilot.common.realtime import DT_CTRL

tools/scripts/set_car_params.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import sys
 
-from cereal import car
+from opendbc.car.structs import car
 from openpilot.common.params import Params
 from openpilot.tools.lib.route import Route
 from openpilot.tools.lib.logreader import LogReader

tools/scripts/uiview.py

@@ -1,7 +1,8 @@
 #!/usr/bin/env python3
 import time
 
-from cereal import car, log, messaging
+from cereal import log, messaging
+from opendbc.car.structs import car
 from openpilot.common.params import Params
 from openpilot.system.manager.process_config import managed_processes
 from openpilot.common.hardware import HARDWARE