|
|
|
from enum import IntFlag
|
|
|
|
from dataclasses import dataclass, field
|
|
|
|
|
|
|
|
from panda.python import uds
|
|
|
|
from openpilot.selfdrive.car import CarSpecs, DbcDict, PlatformConfig, Platforms, dbc_dict
|
selfdrive/car: ban cereal and capnp (#33208)
* ban cereal and msgq
* common too
* do toyota/values.py
* do all fingerprints
* example without builder
* this still works, but no type checking anymore
* stash
* wtf, how does this work
* okay actually not bad
* safe
* epic!
* stash data_structures.py
* some clean up
* hell yeah
* clean up old file
* add to delete
* delete
This reverts commit 90239b7797ace31ee647a2fdbd67e0c3faa98dcf.
* switch more CarParams stuff over
remove unused
* fix car tests by removing cereal! mypy forgets about dataclass if we wrap it :(
* fix this too
* fix this too
* remove more cereal and add some good hyundai tests
* bunch more typing
* override default with 20hz radar
* temp capnp converter helper
* more lateralTuning
* small union replicator is better than what i was trying, and fixes mypy dynamic typing issues
* can keep all this the same now!
* type ret: CarParams, add more missing structs, revert lateralTuning changes (smaller diff!)
* revert more
* get first enum automatically, but ofc mypy doesn't pick up the new metaclass so can't use :(
would have been `CarParams.NetworkLocation()`
* Revert "get first enum automatically, but ofc mypy doesn't pick up the new metaclass so can't use :("
This reverts commit bb28b228becba932052d2fc5a4389784027435b1.
* remove cereal from car_helpers (TODO: caching)
* remove a bunch of temp lines
* use dataclass_transform!
* remove some car.CarParams from the interfaces
* remove rest of car.CarParams from the interfaces
* same which() API
* sort
* from cereal/cache from fingerprinting!
* more typing
* dataclass to capnp helper for CarParams, cached it since it's kinda slow
* (partial) fix process replay fingerprintig for new API
* latcontrollers take capnp
* forgot this
* fix test_models
* fix unit tests
* not here
* VehicleModel and controller still takes capnp CP since they get it from Params()
* fix modeld test
* more fix
* need to namespace to structs, since CarState is both class and struct
* this was never in the base class?!
* clean that up again
* fix import error
fix import error
* cmts and more structs
* remove some more cereal from toyota + convert CarState to capnp
* bruh this was wrong
* replace more cereal
* EventName is one of the last things...
* replace a bunch more cereal.car
* missing imports
* more
* can fix this typing now
* proper toyota+others CS typing!
* mypy can detect return type of CS.update() now
* fix redeclaration of cruise_buttons type
* mypy is only complaining about events now
* temp fix
* add carControl struct
* replace CarControl
i hope there's no circular imports in hyundai's CC
* fine now
* lol this was wrong too
* fix crash
* include my failed attempts at recursively converting to dataclass (doesn't implicitly convert types/recursively :( )
but attrs does, maybe will switch in the future
* clean up
* try out attr.s for its converter (doesn't work recursively yet, but interesting!)
* Revert "try out attr.s for its converter (doesn't work recursively yet, but interesting!)"
This reverts commit ff2434f7bbd45a4d4bfb21f7d6712d1f1c3bcde9.
* test processes doesn't fail anymore (on toyota)!
* fix honda crash
* stash
* Revert "stash"
This reverts commit c1762af4e776790e4ad1322ad4ce0610157346e0.
* remove a bunch more cereal!
* LET'S GOOO
* fix these tests
* and these
* and that
* stash, something is wrong with hyundai enable
* Revert "stash, something is wrong with hyundai enable"
This reverts commit 39cf327def258e2959fe23cd7a550a858f6d8f03.
* forgot these
* remove cereal from fw_versions
* Revert "remove cereal from fw_versions"
This reverts commit 232b37cd409b55d04b1afc90d4a80c49e710eb56.
* remove rest of the cereal exceptions!
* fix that
* add typing to radard since I didn't realize RI.update() switched from cereal to structs
* and here too!
* add TODO for slots
* needed CS to be capnp, fix comparisons, and type hint car_specific so it's easier to catch type issues (capnp isn't detected by mypy :( )
* remove the struct converter
* save ~4-5% CPU at 100hz, we don't modify after so no need to deepcopy
btw pickle.loads(pickle.dumps()) is faster by ~1% CPU
* deepcopy -> copy: we can technically make a reference, but copy is almost free and less error-prone
saves ~1% CPU
* add non-copying asdict function
* should save ~3% CPU (still 4% above baseline)
* fix that, no dict support
* ~27% decrease in time for 20k iterations on 3X (3.37857 -> 2.4821s)
* give a better name
* fix
* dont support none, capitalize
* sheesh, this called type() on every field
* remove CS.events, clean up
* bump card %
* this was a bug on master!
* add a which enum
* default to pid
* revert
* update refs
* not needed, but consistent
* just Ecu
* don't need to do this in this pr
* clean up
* no cast
* consistent typing
* rm
* fix
* can do this if we're desperate for the last few %
* Revert "can do this if we're desperate for the last few %"
This reverts commit 18e11ac7883a0a56583750b1cc5a2b13011e7299.
* type this
* don't need to convert carControl
* i guess don't support set either
* fix CP type hint
* simplify that
1 year ago
|
|
|
from openpilot.selfdrive.car.structs import CarParams
|
|
|
|
from openpilot.selfdrive.car.docs_definitions import CarHarness, CarDocs, CarParts
|
|
|
|
from openpilot.selfdrive.car.fw_query_definitions import FwQueryConfig, Request, p16
|
|
|
|
|
selfdrive/car: ban cereal and capnp (#33208)
* ban cereal and msgq
* common too
* do toyota/values.py
* do all fingerprints
* example without builder
* this still works, but no type checking anymore
* stash
* wtf, how does this work
* okay actually not bad
* safe
* epic!
* stash data_structures.py
* some clean up
* hell yeah
* clean up old file
* add to delete
* delete
This reverts commit 90239b7797ace31ee647a2fdbd67e0c3faa98dcf.
* switch more CarParams stuff over
remove unused
* fix car tests by removing cereal! mypy forgets about dataclass if we wrap it :(
* fix this too
* fix this too
* remove more cereal and add some good hyundai tests
* bunch more typing
* override default with 20hz radar
* temp capnp converter helper
* more lateralTuning
* small union replicator is better than what i was trying, and fixes mypy dynamic typing issues
* can keep all this the same now!
* type ret: CarParams, add more missing structs, revert lateralTuning changes (smaller diff!)
* revert more
* get first enum automatically, but ofc mypy doesn't pick up the new metaclass so can't use :(
would have been `CarParams.NetworkLocation()`
* Revert "get first enum automatically, but ofc mypy doesn't pick up the new metaclass so can't use :("
This reverts commit bb28b228becba932052d2fc5a4389784027435b1.
* remove cereal from car_helpers (TODO: caching)
* remove a bunch of temp lines
* use dataclass_transform!
* remove some car.CarParams from the interfaces
* remove rest of car.CarParams from the interfaces
* same which() API
* sort
* from cereal/cache from fingerprinting!
* more typing
* dataclass to capnp helper for CarParams, cached it since it's kinda slow
* (partial) fix process replay fingerprintig for new API
* latcontrollers take capnp
* forgot this
* fix test_models
* fix unit tests
* not here
* VehicleModel and controller still takes capnp CP since they get it from Params()
* fix modeld test
* more fix
* need to namespace to structs, since CarState is both class and struct
* this was never in the base class?!
* clean that up again
* fix import error
fix import error
* cmts and more structs
* remove some more cereal from toyota + convert CarState to capnp
* bruh this was wrong
* replace more cereal
* EventName is one of the last things...
* replace a bunch more cereal.car
* missing imports
* more
* can fix this typing now
* proper toyota+others CS typing!
* mypy can detect return type of CS.update() now
* fix redeclaration of cruise_buttons type
* mypy is only complaining about events now
* temp fix
* add carControl struct
* replace CarControl
i hope there's no circular imports in hyundai's CC
* fine now
* lol this was wrong too
* fix crash
* include my failed attempts at recursively converting to dataclass (doesn't implicitly convert types/recursively :( )
but attrs does, maybe will switch in the future
* clean up
* try out attr.s for its converter (doesn't work recursively yet, but interesting!)
* Revert "try out attr.s for its converter (doesn't work recursively yet, but interesting!)"
This reverts commit ff2434f7bbd45a4d4bfb21f7d6712d1f1c3bcde9.
* test processes doesn't fail anymore (on toyota)!
* fix honda crash
* stash
* Revert "stash"
This reverts commit c1762af4e776790e4ad1322ad4ce0610157346e0.
* remove a bunch more cereal!
* LET'S GOOO
* fix these tests
* and these
* and that
* stash, something is wrong with hyundai enable
* Revert "stash, something is wrong with hyundai enable"
This reverts commit 39cf327def258e2959fe23cd7a550a858f6d8f03.
* forgot these
* remove cereal from fw_versions
* Revert "remove cereal from fw_versions"
This reverts commit 232b37cd409b55d04b1afc90d4a80c49e710eb56.
* remove rest of the cereal exceptions!
* fix that
* add typing to radard since I didn't realize RI.update() switched from cereal to structs
* and here too!
* add TODO for slots
* needed CS to be capnp, fix comparisons, and type hint car_specific so it's easier to catch type issues (capnp isn't detected by mypy :( )
* remove the struct converter
* save ~4-5% CPU at 100hz, we don't modify after so no need to deepcopy
btw pickle.loads(pickle.dumps()) is faster by ~1% CPU
* deepcopy -> copy: we can technically make a reference, but copy is almost free and less error-prone
saves ~1% CPU
* add non-copying asdict function
* should save ~3% CPU (still 4% above baseline)
* fix that, no dict support
* ~27% decrease in time for 20k iterations on 3X (3.37857 -> 2.4821s)
* give a better name
* fix
* dont support none, capitalize
* sheesh, this called type() on every field
* remove CS.events, clean up
* bump card %
* this was a bug on master!
* add a which enum
* default to pid
* revert
* update refs
* not needed, but consistent
* just Ecu
* don't need to do this in this pr
* clean up
* no cast
* consistent typing
* rm
* fix
* can do this if we're desperate for the last few %
* Revert "can do this if we're desperate for the last few %"
This reverts commit 18e11ac7883a0a56583750b1cc5a2b13011e7299.
* type this
* don't need to convert carControl
* i guess don't support set either
* fix CP type hint
* simplify that
1 year ago
|
|
|
Ecu = CarParams.Ecu
|
|
|
|
|
|
|
|
|
|
|
|
class ChryslerFlags(IntFlag):
|
|
|
|
# Detected flags
|
|
|
|
HIGHER_MIN_STEERING_SPEED = 1
|
|
|
|
|
|
|
|
@dataclass
|
|
|
|
class ChryslerCarDocs(CarDocs):
|
|
|
|
package: str = "Adaptive Cruise Control (ACC)"
|
|
|
|
car_parts: CarParts = field(default_factory=CarParts.common([CarHarness.fca]))
|
|
|
|
|
|
|
|
|
|
|
|
@dataclass
|
|
|
|
class ChryslerPlatformConfig(PlatformConfig):
|
|
|
|
dbc_dict: DbcDict = field(default_factory=lambda: dbc_dict('chrysler_pacifica_2017_hybrid_generated', 'chrysler_pacifica_2017_hybrid_private_fusion'))
|
|
|
|
|
|
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
|
|
class ChryslerCarSpecs(CarSpecs):
|
|
|
|
minSteerSpeed: float = 3.8 # m/s
|
|
|
|
|
|
|
|
|
|
|
|
class CAR(Platforms):
|
|
|
|
# Chrysler
|
|
|
|
CHRYSLER_PACIFICA_2018_HYBRID = ChryslerPlatformConfig(
|
|
|
|
[ChryslerCarDocs("Chrysler Pacifica Hybrid 2017-18")],
|
|
|
|
ChryslerCarSpecs(mass=2242., wheelbase=3.089, steerRatio=16.2),
|
|
|
|
)
|
|
|
|
CHRYSLER_PACIFICA_2019_HYBRID = ChryslerPlatformConfig(
|
|
|
|
[ChryslerCarDocs("Chrysler Pacifica Hybrid 2019-24")],
|
|
|
|
CHRYSLER_PACIFICA_2018_HYBRID.specs,
|
|
|
|
)
|
|
|
|
CHRYSLER_PACIFICA_2018 = ChryslerPlatformConfig(
|
|
|
|
[ChryslerCarDocs("Chrysler Pacifica 2017-18")],
|
|
|
|
CHRYSLER_PACIFICA_2018_HYBRID.specs,
|
|
|
|
)
|
|
|
|
CHRYSLER_PACIFICA_2020 = ChryslerPlatformConfig(
|
|
|
|
[
|
|
|
|
ChryslerCarDocs("Chrysler Pacifica 2019-20"),
|
|
|
|
ChryslerCarDocs("Chrysler Pacifica 2021-23", package="All"),
|
|
|
|
],
|
|
|
|
CHRYSLER_PACIFICA_2018_HYBRID.specs,
|
|
|
|
)
|
|
|
|
|
|
|
|
# Dodge
|
|
|
|
DODGE_DURANGO = ChryslerPlatformConfig(
|
|
|
|
[ChryslerCarDocs("Dodge Durango 2020-21")],
|
|
|
|
CHRYSLER_PACIFICA_2018_HYBRID.specs,
|
|
|
|
)
|
|
|
|
|
|
|
|
# Jeep
|
|
|
|
JEEP_GRAND_CHEROKEE = ChryslerPlatformConfig( # includes 2017 Trailhawk
|
|
|
|
[ChryslerCarDocs("Jeep Grand Cherokee 2016-18", video_link="https://www.youtube.com/watch?v=eLR9o2JkuRk")],
|
|
|
|
ChryslerCarSpecs(mass=1778., wheelbase=2.71, steerRatio=16.7),
|
|
|
|
)
|
|
|
|
|
|
|
|
JEEP_GRAND_CHEROKEE_2019 = ChryslerPlatformConfig( # includes 2020 Trailhawk
|
|
|
|
[ChryslerCarDocs("Jeep Grand Cherokee 2019-21", video_link="https://www.youtube.com/watch?v=jBe4lWnRSu4")],
|
|
|
|
JEEP_GRAND_CHEROKEE.specs,
|
|
|
|
)
|
|
|
|
|
|
|
|
# Ram
|
|
|
|
RAM_1500_5TH_GEN = ChryslerPlatformConfig(
|
|
|
|
[ChryslerCarDocs("Ram 1500 2019-24", car_parts=CarParts.common([CarHarness.ram]))],
|
|
|
|
ChryslerCarSpecs(mass=2493., wheelbase=3.88, steerRatio=16.3, minSteerSpeed=14.5),
|
|
|
|
dbc_dict('chrysler_ram_dt_generated', None),
|
|
|
|
)
|
|
|
|
RAM_HD_5TH_GEN = ChryslerPlatformConfig(
|
|
|
|
[
|
|
|
|
ChryslerCarDocs("Ram 2500 2020-24", car_parts=CarParts.common([CarHarness.ram])),
|
|
|
|
ChryslerCarDocs("Ram 3500 2019-22", car_parts=CarParts.common([CarHarness.ram])),
|
|
|
|
],
|
|
|
|
ChryslerCarSpecs(mass=3405., wheelbase=3.785, steerRatio=15.61, minSteerSpeed=16.),
|
|
|
|
dbc_dict('chrysler_ram_hd_generated', None),
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
class CarControllerParams:
|
|
|
|
def __init__(self, CP):
|
|
|
|
self.STEER_STEP = 2 # 50 Hz
|
|
|
|
self.STEER_ERROR_MAX = 80
|
|
|
|
if CP.carFingerprint in RAM_HD:
|
|
|
|
self.STEER_DELTA_UP = 14
|
|
|
|
self.STEER_DELTA_DOWN = 14
|
|
|
|
self.STEER_MAX = 361 # higher than this faults the EPS
|
|
|
|
elif CP.carFingerprint in RAM_DT:
|
|
|
|
self.STEER_DELTA_UP = 6
|
|
|
|
self.STEER_DELTA_DOWN = 6
|
|
|
|
self.STEER_MAX = 261 # EPS allows more, up to 350?
|
|
|
|
else:
|
|
|
|
self.STEER_DELTA_UP = 3
|
|
|
|
self.STEER_DELTA_DOWN = 3
|
|
|
|
self.STEER_MAX = 261 # higher than this faults the EPS
|
|
|
|
|
|
|
|
|
|
|
|
STEER_THRESHOLD = 120
|
|
|
|
|
|
|
|
RAM_DT = {CAR.RAM_1500_5TH_GEN, }
|
|
|
|
RAM_HD = {CAR.RAM_HD_5TH_GEN, }
|
|
|
|
RAM_CARS = RAM_DT | RAM_HD
|
|
|
|
|
|
|
|
|
|
|
|
CHRYSLER_VERSION_REQUEST = bytes([uds.SERVICE_TYPE.READ_DATA_BY_IDENTIFIER]) + \
|
|
|
|
p16(0xf132)
|
|
|
|
CHRYSLER_VERSION_RESPONSE = bytes([uds.SERVICE_TYPE.READ_DATA_BY_IDENTIFIER + 0x40]) + \
|
|
|
|
p16(0xf132)
|
|
|
|
|
|
|
|
CHRYSLER_SOFTWARE_VERSION_REQUEST = bytes([uds.SERVICE_TYPE.READ_DATA_BY_IDENTIFIER]) + \
|
|
|
|
p16(uds.DATA_IDENTIFIER_TYPE.SYSTEM_SUPPLIER_ECU_SOFTWARE_NUMBER)
|
|
|
|
CHRYSLER_SOFTWARE_VERSION_RESPONSE = bytes([uds.SERVICE_TYPE.READ_DATA_BY_IDENTIFIER + 0x40]) + \
|
|
|
|
p16(uds.DATA_IDENTIFIER_TYPE.SYSTEM_SUPPLIER_ECU_SOFTWARE_NUMBER)
|
|
|
|
|
|
|
|
CHRYSLER_RX_OFFSET = -0x280
|
|
|
|
|
|
|
|
FW_QUERY_CONFIG = FwQueryConfig(
|
|
|
|
requests=[
|
|
|
|
Request(
|
|
|
|
[CHRYSLER_VERSION_REQUEST],
|
|
|
|
[CHRYSLER_VERSION_RESPONSE],
|
|
|
|
whitelist_ecus=[Ecu.abs, Ecu.eps, Ecu.srs, Ecu.fwdRadar, Ecu.fwdCamera, Ecu.combinationMeter],
|
|
|
|
rx_offset=CHRYSLER_RX_OFFSET,
|
|
|
|
bus=0,
|
|
|
|
),
|
|
|
|
Request(
|
|
|
|
[CHRYSLER_VERSION_REQUEST],
|
|
|
|
[CHRYSLER_VERSION_RESPONSE],
|
|
|
|
whitelist_ecus=[Ecu.abs, Ecu.hybrid, Ecu.engine, Ecu.transmission],
|
|
|
|
bus=0,
|
|
|
|
),
|
|
|
|
Request(
|
|
|
|
[CHRYSLER_SOFTWARE_VERSION_REQUEST],
|
|
|
|
[CHRYSLER_SOFTWARE_VERSION_RESPONSE],
|
|
|
|
whitelist_ecus=[Ecu.engine, Ecu.transmission],
|
|
|
|
bus=0,
|
|
|
|
),
|
|
|
|
],
|
|
|
|
extra_ecus=[
|
|
|
|
(Ecu.abs, 0x7e4, None), # alt address for abs on hybrids, NOTE: not on all hybrid platforms
|
|
|
|
],
|
|
|
|
)
|
|
|
|
|
|
|
|
DBC = CAR.create_dbc_map()
|