mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-08-05 19:55:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

FCA: Fix upstream merge conflicts

Browse Source
This commit is contained in:
Jason Wen
2024-03-13 22:32:22 +00:00
parent 5b9a397078
commit ded3389721
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/car/chrysler/interface.py
+3
View File
@@ -61,8 +61,11 @@ class CarInterface(CarInterfaceBase):
ret.steerActuatorDelay = 0.2
ret.wheelbase = 3.88
# Older EPS FW allow steer to zero
# Older EPS FW allow steer to zero
if any(fw.ecu == 'eps' and b"68" < fw.fwVersion[:4] <= b"6831" for fw in car_fw):
ret.minSteerSpeed = 0.
if any(fw.ecu == 'eps' and fw.fwVersion in (b"68273275AF", b"68273275AG", b"68312176AE", b"68312176AG",) for fw in car_fw):
ret.minEnableSpeed = 0.
elif candidate == CAR.RAM_HD:
ret.steerActuatorDelay = 0.2
selfdrive/car/chrysler/values.py
+1 -1
View File
@@ -91,7 +91,7 @@ class CAR(Platforms):
"RAM 1500 5TH GEN",
ChryslerCarInfo("Ram 1500 2019-24", car_parts=CarParts.common([CarHarness.ram])),
dbc_dict('chrysler_ram_dt_generated', None),
specs=ChryslerCarSpecs(mass=2493., wheelbase=3.88, steerRatio=16.3, minSteerSpeed=14.5),
specs=ChryslerCarSpecs(mass=2493., wheelbase=3.88, steerRatio=16.3, minSteerSpeed=0.5, minEnableSpeed=14.5),
)
RAM_HD = ChryslerPlatformConfig(
"RAM HD 5TH GEN",