remove default arg

pull/28212/head
Shane Smiskol 2 years ago
parent 11c12ff514
commit 139650a3b6
  1. 4
      selfdrive/car/docs_definitions.py
  2. 8
      selfdrive/car/nissan/values.py

@ -104,8 +104,8 @@ class CarParts:
parts: List[CarPart] = field(default_factory=list)
@classmethod
def default(cls, add: List[CarPart] = None, default: List[CarPart] = None, remove: List[CarPart] = None):
p = [part for part in (add or []) + (default or DEFAULT_CAR_PARTS) if part not in (remove or [])]
def default(cls, add: List[CarPart] = None, remove: List[CarPart] = None):
p = [part for part in (add or []) + DEFAULT_CAR_PARTS if part not in (remove or [])]
return cls(p)

@ -4,7 +4,7 @@ from typing import Dict, List, Optional, Union
from cereal import car
from panda.python import uds
from selfdrive.car import AngleRateLimit, dbc_dict
from selfdrive.car.docs_definitions import Cable, CarInfo, CarParts, HarnessAccessory, HarnessConnector, Mount
from selfdrive.car.docs_definitions import Cable, CarInfo, CarPart, CarParts, HarnessAccessory, HarnessConnector, Mount
from selfdrive.car.fw_query_definitions import FwQueryConfig, Request, StdQueries
Ecu = car.CarParams.Ecu
@ -30,13 +30,13 @@ class CAR:
ALTIMA = "NISSAN ALTIMA 2020"
NISSAN_PARTS = [HarnessAccessory.harness_box, Cable.rj45_cable_7ft, Cable.long_obdc_cable, Cable.usbc_coupler, Mount.mount]
NISSAN_PARTS: List[CarPart] = [HarnessAccessory.harness_box, Cable.rj45_cable_7ft, Cable.long_obdc_cable, Cable.usbc_coupler, Mount.mount]
@dataclass
class NissanCarInfo(CarInfo):
package: str = "ProPILOT Assist"
car_parts: CarParts = CarParts.default([HarnessConnector.nissan_a], default=NISSAN_PARTS)
car_parts: CarParts = CarParts([HarnessConnector.nissan_a] + NISSAN_PARTS)
CAR_INFO: Dict[str, Optional[Union[NissanCarInfo, List[NissanCarInfo]]]] = {
@ -44,7 +44,7 @@ CAR_INFO: Dict[str, Optional[Union[NissanCarInfo, List[NissanCarInfo]]]] = {
CAR.LEAF: NissanCarInfo("Nissan Leaf 2018-23", video_link="https://youtu.be/vaMbtAh_0cY"),
CAR.LEAF_IC: None, # same platforms
CAR.ROGUE: NissanCarInfo("Nissan Rogue 2018-20"),
CAR.ALTIMA: NissanCarInfo("Nissan Altima 2019-20", car_parts=CarParts.default([HarnessConnector.nissan_b], default=NISSAN_PARTS)),
CAR.ALTIMA: NissanCarInfo("Nissan Altima 2019-20", car_parts=CarParts([HarnessConnector.nissan_b] + NISSAN_PARTS)),
}
FINGERPRINTS = {

Loading…
Cancel
Save