Skip to content

Commit

Permalink
init
Browse files Browse the repository at this point in the history
  • Loading branch information
@sunnyhaibin
sunnyhaibin committed Oct 15, 2023
1 parent 318da0b commit 8b528b6
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions car.capnp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ struct CarState {
gapAdjustCruiseTr @55 :Int32;
endToEndLong @56 :Bool;
customStockLong @57 :CustomStockLong;
madsEnabled @58 :Bool;

This comment has been minimized.

Sign in to view

Copy link
@devtekve

devtekve Oct 15, 2023

Collaborator 
Traceback (most recent call last):
  File "/data/openpilot/selfdrive/manager/./custom_dep.py", line 9, in <module>
    from common.basedir import BASEDIR
  File "/data/openpilot/common/basedir.py", line 4, in <module>
    from openpilot.system.hardware import PC
  File "/data/openpilot/openpilot/system/hardware/__init__.py", line 4, in <module>
    from openpilot.system.hardware.base import HardwareBase
  File "/data/openpilot/openpilot/system/hardware/base.py", line 5, in <module>
    from cereal import log
  File "/data/openpilot/cereal/__init__.py", line 8, in <module>
    log = capnp.load(os.path.join(CEREAL_PATH, "log.capnp"))
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "capnp/lib/capnp.pyx", line 4365, in capnp.lib.capnp.load
  File "capnp/lib/capnp.pyx", line 3580, in capnp.lib.capnp.SchemaParser.load
capnp.lib.capnp.KjException: data/openpilot/cereal/car.capnp:241: failed: 'madsEnabled' is already defined in this scope.

This comment has been minimized.

Sign in to view

Copy link
@devtekve

devtekve Oct 15, 2023

Collaborator

As discussed, we should move this to carControl as it was your original intent

struct CustomStockLong {
cruiseButton @0 :Int16;
Expand Down

0 comments on commit 8b528b6

Please sign in to comment.