sadmen
/
openpilot_comma
mirror of https://github.com/commaai/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix Prius v

Browse Source
pull/23762/head
Shane Smiskol 3 years ago
parent 1c16d2e1c2
commit bbd25b00b7
4 changed files with 9 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      docs/CARS_generated.md
  2. 9
      docs/cars.py
  3. 2
      selfdrive/car/__init__.py
  4. 2
      selfdrive/car/toyota/values.py

2
docs/CARS_generated.md
Unescape View File

@ -158,7 +158,7 @@
|Toyota|Avalon Hybrid 2021|TSS-P|<img src="assets/icon-star-half.png" width="22" /><sup>1</sup>|<img src="assets/icon-star-empty.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />| |Toyota|Avalon Hybrid 2021|TSS-P|<img src="assets/icon-star-half.png" width="22" /><sup>1</sup>|<img src="assets/icon-star-empty.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|
|Toyota|Corolla 2019|All|<img src="assets/icon-star-half.png" width="22" /><sup>1</sup>|<img src="assets/icon-star-empty.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />| |Toyota|Corolla 2019|All|<img src="assets/icon-star-half.png" width="22" /><sup>1</sup>|<img src="assets/icon-star-empty.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|
|Toyota|Prius 2020|TSS-P|<img src="assets/icon-star-half.png" width="22" /><sup>1</sup>|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-half.png" width="22" /><sup>7</sup>|<img src="assets/icon-star-full.png" width="22" />| |Toyota|Prius 2020|TSS-P|<img src="assets/icon-star-half.png" width="22" /><sup>1</sup>|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-half.png" width="22" /><sup>7</sup>|<img src="assets/icon-star-full.png" width="22" />|
|Toyota|Prius v 2017|TSS-P|<img src="assets/icon-star-half.png" width="22" /><sup>1</sup>|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-half.png" width="22" /><sup>7</sup>|<img src="assets/icon-star-full.png" width="22" />| |Toyota|Prius v 2017|TSS-P|<img src="assets/icon-star-half.png" width="22" /><sup>1</sup>|<img src="assets/icon-star-empty.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-half.png" width="22" /><sup>7</sup>|<img src="assets/icon-star-full.png" width="22" />|
|Toyota|RAV4 2018|TSS-P|<img src="assets/icon-star-half.png" width="22" /><sup>1</sup>|<img src="assets/icon-star-empty.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />| |Toyota|RAV4 2018|TSS-P|<img src="assets/icon-star-half.png" width="22" /><sup>1</sup>|<img src="assets/icon-star-empty.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|
|Volkswagen|California 2021<sup>6</sup>|Driver Assistance|<img src="assets/icon-star-empty.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-empty.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />| |Volkswagen|California 2021<sup>6</sup>|Driver Assistance|<img src="assets/icon-star-empty.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-empty.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|
|Volkswagen|Caravelle 2020<sup>6</sup>|Driver Assistance|<img src="assets/icon-star-empty.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-empty.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />| |Volkswagen|Caravelle 2020<sup>6</sup>|Driver Assistance|<img src="assets/icon-star-empty.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-empty.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|<img src="assets/icon-star-full.png" width="22" />|

9
docs/cars.py
Unescape View File

@ -125,11 +125,14 @@ class Car:
min_steer_speed = CP.minSteerSpeed min_steer_speed = CP.minSteerSpeed
if car_info.min_steer_speed is not None: if car_info.min_steer_speed is not None:
min_steer_speed = car_info.min_steer_speed min_steer_speed = car_info.min_steer_speed
assert CP.minSteerSpeed == 0, "Minimum steer speed set in both CarInfo and CarParams for {}".format( assert CP.minSteerSpeed == 0, "Minimum steer speed set in both CarInfo and CarParams for {}".format(CP.carFingerprint)
CP.carFingerprint)
min_enable_speed = CP.minEnableSpeed
if car_info.min_enable_speed is not None:
min_enable_speed = car_info.min_enable_speed
# TODO: make sure well supported check is complete # TODO: make sure well supported check is complete
stars = [CP.openpilotLongitudinalControl, CP.minEnableSpeed <= 1e-3, min_steer_speed <= 1e-3, stars = [CP.openpilotLongitudinalControl, min_enable_speed <= 1e-3, min_steer_speed <= 1e-3,
CP.carName in MAKES_GOOD_STEERING_TORQUE, CP.carFingerprint not in non_tested_cars] CP.carName in MAKES_GOOD_STEERING_TORQUE, CP.carFingerprint not in non_tested_cars]
# Check for star demotions from exceptions # Check for star demotions from exceptions

2
selfdrive/car/__init__.py
Unescape View File

@ -7,7 +7,7 @@ from common.numpy_fast import clip
# kg of standard extra cargo to count for drive, gas, etc... # kg of standard extra cargo to count for drive, gas, etc...
STD_CARGO_KG = 136. STD_CARGO_KG = 136.
CarInfo = namedtuple('CarInfo', ['name', 'years', 'package', 'min_steer_speed'], defaults=[None]) CarInfo = namedtuple('CarInfo', ['name', 'years', 'package', 'min_steer_speed', 'min_enable_speed'], defaults=[None, None])
def gen_empty_fingerprint(): def gen_empty_fingerprint():

2
selfdrive/car/toyota/values.py
Unescape View File

@ -93,7 +93,7 @@ CAR_INFO = {
CAR.HIGHLANDERH: CarInfo("Toyota Highlander Hybrid", {2017, 2018, 2019}, "All"), CAR.HIGHLANDERH: CarInfo("Toyota Highlander Hybrid", {2017, 2018, 2019}, "All"),
CAR.HIGHLANDERH_TSS2: CarInfo("Toyota Highlander Hybrid", {2020, 2021, 2022}, "All"), CAR.HIGHLANDERH_TSS2: CarInfo("Toyota Highlander Hybrid", {2020, 2021, 2022}, "All"),
CAR.PRIUS: CarInfo("Toyota Prius", {2016, 2017, 2018, 2019, 2020}, 'TSS-P'), # TODO: Prius Prime is lost here (supports All packages) CAR.PRIUS: CarInfo("Toyota Prius", {2016, 2017, 2018, 2019, 2020}, 'TSS-P'), # TODO: Prius Prime is lost here (supports All packages)
CAR.PRIUS_V: CarInfo("Toyota Prius v", {2017}, 'TSS-P'), CAR.PRIUS_V: CarInfo("Toyota Prius v", {2017}, 'TSS-P', min_enable_speed=MIN_ACC_SPEED),
CAR.PRIUS_TSS2: CarInfo("Toyota Prius Prime TSS2", {2021, 2022}, "All"), CAR.PRIUS_TSS2: CarInfo("Toyota Prius Prime TSS2", {2021, 2022}, "All"),
CAR.RAV4: CarInfo("Toyota RAV4", {2016, 2017, 2018}, 'TSS-P'), CAR.RAV4: CarInfo("Toyota RAV4", {2016, 2017, 2018}, 'TSS-P'),
CAR.RAV4H: CarInfo("Toyota RAV4 Hybrid", {2016, 2017, 2018}, 'TSS-P'), CAR.RAV4H: CarInfo("Toyota RAV4 Hybrid", {2016, 2017, 2018}, 'TSS-P'),

Write Preview
Loading…
Cancel
Save