remove _connector suffix

pull/28212/head
Shane Smiskol 2 years ago
parent c036af9718
commit 803e8a92d9
  1. 8
      selfdrive/car/chrysler/values.py
  2. 70
      selfdrive/car/docs_definitions.py
  3. 4
      selfdrive/car/ford/values.py
  4. 4
      selfdrive/car/gm/values.py
  5. 4
      selfdrive/car/honda/values.py
  6. 38
      selfdrive/car/hyundai/values.py
  7. 2
      selfdrive/car/mazda/values.py
  8. 4
      selfdrive/car/nissan/values.py
  9. 6
      selfdrive/car/subaru/values.py
  10. 2
      selfdrive/car/toyota/values.py
  11. 2
      selfdrive/car/volkswagen/values.py

@ -60,7 +60,7 @@ RAM_CARS = RAM_DT | RAM_HD
@dataclass @dataclass
class ChryslerCarInfo(CarInfo): class ChryslerCarInfo(CarInfo):
package: str = "Adaptive Cruise Control (ACC)" package: str = "Adaptive Cruise Control (ACC)"
car_parts: CarParts = CarParts.default([HarnessConnector.fca_connector]) car_parts: CarParts = CarParts.default([HarnessConnector.fca])
CAR_INFO: Dict[str, Optional[Union[ChryslerCarInfo, List[ChryslerCarInfo]]]] = { CAR_INFO: Dict[str, Optional[Union[ChryslerCarInfo, List[ChryslerCarInfo]]]] = {
@ -74,10 +74,10 @@ CAR_INFO: Dict[str, Optional[Union[ChryslerCarInfo, List[ChryslerCarInfo]]]] = {
], ],
CAR.JEEP_CHEROKEE: ChryslerCarInfo("Jeep Grand Cherokee 2016-18", video_link="https://www.youtube.com/watch?v=eLR9o2JkuRk"), CAR.JEEP_CHEROKEE: ChryslerCarInfo("Jeep Grand Cherokee 2016-18", video_link="https://www.youtube.com/watch?v=eLR9o2JkuRk"),
CAR.JEEP_CHEROKEE_2019: ChryslerCarInfo("Jeep Grand Cherokee 2019-21", video_link="https://www.youtube.com/watch?v=jBe4lWnRSu4"), CAR.JEEP_CHEROKEE_2019: ChryslerCarInfo("Jeep Grand Cherokee 2019-21", video_link="https://www.youtube.com/watch?v=jBe4lWnRSu4"),
CAR.RAM_1500: ChryslerCarInfo("Ram 1500 2019-23", car_parts=CarParts.default([HarnessConnector.ram_connector])), CAR.RAM_1500: ChryslerCarInfo("Ram 1500 2019-23", car_parts=CarParts.default([HarnessConnector.ram])),
CAR.RAM_HD: [ CAR.RAM_HD: [
ChryslerCarInfo("Ram 2500 2020-22", car_parts=CarParts.default([HarnessConnector.ram_connector])), ChryslerCarInfo("Ram 2500 2020-22", car_parts=CarParts.default([HarnessConnector.ram])),
ChryslerCarInfo("Ram 3500 2019-22", car_parts=CarParts.default([HarnessConnector.ram_connector])), ChryslerCarInfo("Ram 3500 2019-22", car_parts=CarParts.default([HarnessConnector.ram])),
], ],
} }

@ -35,41 +35,41 @@ class CarPart(Enum):
class HarnessConnector(CarPart): class HarnessConnector(CarPart):
nidec_connector = "Honda Nidec connector" nidec = "Honda Nidec connector"
bosch_a_connector = "Honda Bosch A connector" bosch_a = "Honda Bosch A connector"
bosch_b_connector = "Honda Bosch B connector" bosch_b = "Honda Bosch B connector"
toyota_connector = "Toyota connector" toyota = "Toyota connector"
subaru_a_connector = "Subaru A connector" subaru_a = "Subaru A connector"
subaru_b_connector = "Subaru B connector" subaru_b = "Subaru B connector"
fca_connector = "FCA connector" fca = "FCA connector"
ram_connector = "Ram connector" ram = "Ram connector"
vw_connector = "VW connector" vw = "VW connector"
j533_connector = "J533 connector" j533 = "J533 connector"
hyundai_a_connector = "Hyundai A connector" hyundai_a = "Hyundai A connector"
hyundai_b_connector = "Hyundai B connector" hyundai_b = "Hyundai B connector"
hyundai_c_connector = "Hyundai C connector" hyundai_c = "Hyundai C connector"
hyundai_d_connector = "Hyundai D connector" hyundai_d = "Hyundai D connector"
hyundai_e_connector = "Hyundai E connector" hyundai_e = "Hyundai E connector"
hyundai_f_connector = "Hyundai F connector" hyundai_f = "Hyundai F connector"
hyundai_g_connector = "Hyundai G connector" hyundai_g = "Hyundai G connector"
hyundai_h_connector = "Hyundai H connector" hyundai_h = "Hyundai H connector"
hyundai_i_connector = "Hyundai I connector" hyundai_i = "Hyundai I connector"
hyundai_j_connector = "Hyundai J connector" hyundai_j = "Hyundai J connector"
hyundai_k_connector = "Hyundai K connector" hyundai_k = "Hyundai K connector"
hyundai_l_connector = "Hyundai L connector" hyundai_l = "Hyundai L connector"
hyundai_m_connector = "Hyundai M connector" hyundai_m = "Hyundai M connector"
hyundai_n_connector = "Hyundai N connector" hyundai_n = "Hyundai N connector"
hyundai_o_connector = "Hyundai O connector" hyundai_o = "Hyundai O connector"
hyundai_p_connector = "Hyundai P connector" hyundai_p = "Hyundai P connector"
hyundai_q_connector = "Hyundai Q connector" hyundai_q = "Hyundai Q connector"
custom_connector = "Developer connector" custom = "Developer connector"
obd_ii_connector = "OBD-II connector" obd_ii = "OBD-II connector"
gm_connector = "GM connector" gm = "GM connector"
nissan_a_connector = "Nissan A connector" nissan_a = "Nissan A connector"
nissan_b_connector = "Nissan B connector" nissan_b = "Nissan B connector"
mazda_connector = "Mazda connector" mazda = "Mazda connector"
ford_q3_connector = "Ford Q3 connector" ford_q3 = "Ford Q3 connector"
ford_q4_connector = "Ford Q4 connector" ford_q4 = "Ford Q4 connector"
class HarnessAccessory(CarPart): class HarnessAccessory(CarPart):

@ -65,11 +65,11 @@ DBC: Dict[str, Dict[str, str]] = defaultdict(lambda: dbc_dict("ford_lincoln_base
@dataclass @dataclass
class FordCarInfo(CarInfo): class FordCarInfo(CarInfo):
package: str = "Co-Pilot360 Assist+" package: str = "Co-Pilot360 Assist+"
car_parts: CarParts = CarParts.default([HarnessConnector.ford_q3_connector]) car_parts: CarParts = CarParts.default([HarnessConnector.ford_q3])
CAR_INFO: Dict[str, Union[CarInfo, List[CarInfo]]] = { CAR_INFO: Dict[str, Union[CarInfo, List[CarInfo]]] = {
CAR.BRONCO_SPORT_MK1: FordCarInfo("Ford Bronco Sport 2021-22", car_parts=CarParts.default([HarnessConnector.ford_q3_connector, Mount.angled_mount], remove=[Mount.mount])), CAR.BRONCO_SPORT_MK1: FordCarInfo("Ford Bronco Sport 2021-22", car_parts=CarParts.default([HarnessConnector.ford_q3, Mount.angled_mount], remove=[Mount.mount])),
CAR.ESCAPE_MK4: [ CAR.ESCAPE_MK4: [
FordCarInfo("Ford Escape 2020-22"), FordCarInfo("Ford Escape 2020-22"),
FordCarInfo("Ford Kuga 2020-22", "Adaptive Cruise Control with Lane Centering"), FordCarInfo("Ford Kuga 2020-22", "Adaptive Cruise Control with Lane Centering"),

@ -89,9 +89,9 @@ class GMCarInfo(CarInfo):
def init_make(self, CP: car.CarParams): def init_make(self, CP: car.CarParams):
if CP.networkLocation == car.CarParams.NetworkLocation.fwdCamera: if CP.networkLocation == car.CarParams.NetworkLocation.fwdCamera:
self.car_parts = CarParts.default([HarnessConnector.gm_connector]) self.car_parts = CarParts.default([HarnessConnector.gm])
else: else:
self.car_parts = CarParts([HarnessConnector.obd_ii_connector, Cable.long_obdc_cable, Cable.usbc_coupler, Mount.mount]) self.car_parts = CarParts([HarnessConnector.obd_ii, Cable.long_obdc_cable, Cable.usbc_coupler, Mount.mount])
self.footnotes.append(Footnote.OBD_II) self.footnotes.append(Footnote.OBD_II)

@ -110,9 +110,9 @@ class HondaCarInfo(CarInfo):
def init_make(self, CP: car.CarParams): def init_make(self, CP: car.CarParams):
if CP.carFingerprint in HONDA_BOSCH: if CP.carFingerprint in HONDA_BOSCH:
self.car_parts = CarParts.default([HarnessConnector.bosch_b_connector]) if CP.carFingerprint in HONDA_BOSCH_RADARLESS else CarParts.default([HarnessConnector.bosch_a_connector]) self.car_parts = CarParts.default([HarnessConnector.bosch_b]) if CP.carFingerprint in HONDA_BOSCH_RADARLESS else CarParts.default([HarnessConnector.bosch_a])
else: else:
self.car_parts = CarParts.default([HarnessConnector.nidec_connector]) self.car_parts = CarParts.default([HarnessConnector.nidec])
CAR_INFO: Dict[str, Optional[Union[HondaCarInfo, List[HondaCarInfo]]]] = { CAR_INFO: Dict[str, Optional[Union[HondaCarInfo, List[HondaCarInfo]]]] = {

@ -136,23 +136,23 @@ class Footnote(Enum):
Column.MODEL, shop_footnote=True) Column.MODEL, shop_footnote=True)
HYUNDAI_A_PARTS = CarParts.default([HarnessConnector.hyundai_a_connector]) HYUNDAI_A_PARTS = CarParts.default([HarnessConnector.hyundai_a])
HYUNDAI_B_PARTS = CarParts.default([HarnessConnector.hyundai_b_connector]) HYUNDAI_B_PARTS = CarParts.default([HarnessConnector.hyundai_b])
HYUNDAI_C_PARTS = CarParts.default([HarnessConnector.hyundai_c_connector]) HYUNDAI_C_PARTS = CarParts.default([HarnessConnector.hyundai_c])
HYUNDAI_D_PARTS = CarParts.default([HarnessConnector.hyundai_d_connector]) HYUNDAI_D_PARTS = CarParts.default([HarnessConnector.hyundai_d])
HYUNDAI_E_PARTS = CarParts.default([HarnessConnector.hyundai_e_connector]) HYUNDAI_E_PARTS = CarParts.default([HarnessConnector.hyundai_e])
HYUNDAI_F_PARTS = CarParts.default([HarnessConnector.hyundai_f_connector]) HYUNDAI_F_PARTS = CarParts.default([HarnessConnector.hyundai_f])
HYUNDAI_G_PARTS = CarParts.default([HarnessConnector.hyundai_g_connector]) HYUNDAI_G_PARTS = CarParts.default([HarnessConnector.hyundai_g])
HYUNDAI_H_PARTS = CarParts.default([HarnessConnector.hyundai_h_connector]) HYUNDAI_H_PARTS = CarParts.default([HarnessConnector.hyundai_h])
HYUNDAI_I_PARTS = CarParts.default([HarnessConnector.hyundai_i_connector]) HYUNDAI_I_PARTS = CarParts.default([HarnessConnector.hyundai_i])
HYUNDAI_J_PARTS = CarParts.default([HarnessConnector.hyundai_j_connector]) HYUNDAI_J_PARTS = CarParts.default([HarnessConnector.hyundai_j])
HYUNDAI_K_PARTS = CarParts.default([HarnessConnector.hyundai_k_connector]) HYUNDAI_K_PARTS = CarParts.default([HarnessConnector.hyundai_k])
HYUNDAI_L_PARTS = CarParts.default([HarnessConnector.hyundai_l_connector]) HYUNDAI_L_PARTS = CarParts.default([HarnessConnector.hyundai_l])
HYUNDAI_M_PARTS = CarParts.default([HarnessConnector.hyundai_m_connector]) HYUNDAI_M_PARTS = CarParts.default([HarnessConnector.hyundai_m])
HYUNDAI_N_PARTS = CarParts.default([HarnessConnector.hyundai_n_connector]) HYUNDAI_N_PARTS = CarParts.default([HarnessConnector.hyundai_n])
HYUNDAI_O_PARTS = CarParts.default([HarnessConnector.hyundai_o_connector]) HYUNDAI_O_PARTS = CarParts.default([HarnessConnector.hyundai_o])
HYUNDAI_P_PARTS = CarParts.default([HarnessConnector.hyundai_p_connector]) HYUNDAI_P_PARTS = CarParts.default([HarnessConnector.hyundai_p])
HYUNDAI_Q_PARTS = CarParts.default([HarnessConnector.hyundai_q_connector]) HYUNDAI_Q_PARTS = CarParts.default([HarnessConnector.hyundai_q])
@dataclass @dataclass
@ -176,6 +176,8 @@ CAR_INFO: Dict[str, Optional[Union[HyundaiCarInfo, List[HyundaiCarInfo]]]] = {
HyundaiCarInfo("Hyundai Genesis 2015-16", min_enable_speed=19 * CV.MPH_TO_MS, car_parts=HYUNDAI_J_PARTS), # TODO: check 2015 packages HyundaiCarInfo("Hyundai Genesis 2015-16", min_enable_speed=19 * CV.MPH_TO_MS, car_parts=HYUNDAI_J_PARTS), # TODO: check 2015 packages
HyundaiCarInfo("Genesis G80 2017", "All", min_enable_speed=19 * CV.MPH_TO_MS, car_parts=HYUNDAI_J_PARTS), HyundaiCarInfo("Genesis G80 2017", "All", min_enable_speed=19 * CV.MPH_TO_MS, car_parts=HYUNDAI_J_PARTS),
], ],
CAR.IONIQ: HyundaiCarInfo("Hyundai Ioniq Hybrid 2017-19", harness_kit=HarnessKit(Harness.hyundai_c)),
CAR.IONIQ: HyundaiCarInfo("Hyundai Ioniq Hybrid 2017-19", car_parts=CarParts.default([HarnessConnector.hyundai_c])),
CAR.IONIQ: HyundaiCarInfo("Hyundai Ioniq Hybrid 2017-19", car_parts=HYUNDAI_C_PARTS), CAR.IONIQ: HyundaiCarInfo("Hyundai Ioniq Hybrid 2017-19", car_parts=HYUNDAI_C_PARTS),
CAR.IONIQ_HEV_2022: HyundaiCarInfo("Hyundai Ioniq Hybrid 2020-22", car_parts=HYUNDAI_H_PARTS), # TODO: confirm 2020-21 harness CAR.IONIQ_HEV_2022: HyundaiCarInfo("Hyundai Ioniq Hybrid 2020-22", car_parts=HYUNDAI_H_PARTS), # TODO: confirm 2020-21 harness
CAR.IONIQ_EV_LTD: HyundaiCarInfo("Hyundai Ioniq Electric 2019", car_parts=HYUNDAI_C_PARTS), CAR.IONIQ_EV_LTD: HyundaiCarInfo("Hyundai Ioniq Electric 2019", car_parts=HYUNDAI_C_PARTS),
@ -190,7 +192,7 @@ CAR_INFO: Dict[str, Optional[Union[HyundaiCarInfo, List[HyundaiCarInfo]]]] = {
CAR.SANTA_FE_2022: HyundaiCarInfo("Hyundai Santa Fe 2021-22", "All", video_link="https://youtu.be/VnHzSTygTS4", car_parts=HYUNDAI_L_PARTS), CAR.SANTA_FE_2022: HyundaiCarInfo("Hyundai Santa Fe 2021-22", "All", video_link="https://youtu.be/VnHzSTygTS4", car_parts=HYUNDAI_L_PARTS),
CAR.SANTA_FE_HEV_2022: HyundaiCarInfo("Hyundai Santa Fe Hybrid 2022", "All", car_parts=HYUNDAI_L_PARTS), CAR.SANTA_FE_HEV_2022: HyundaiCarInfo("Hyundai Santa Fe Hybrid 2022", "All", car_parts=HYUNDAI_L_PARTS),
CAR.SANTA_FE_PHEV_2022: HyundaiCarInfo("Hyundai Santa Fe Plug-in Hybrid 2022", "All", car_parts=HYUNDAI_L_PARTS), CAR.SANTA_FE_PHEV_2022: HyundaiCarInfo("Hyundai Santa Fe Plug-in Hybrid 2022", "All", car_parts=HYUNDAI_L_PARTS),
CAR.SONATA: HyundaiCarInfo("Hyundai Sonata 2020-23", "All", video_link="https://www.youtube.com/watch?v=ix63r9kE3Fw", car_parts=HYUNDAI_A_PARTS), CAR.SONATA: HyundaiCarInfo("Hyundai Sonata 2020-23", "All", video_link="https://www.youtube.com/watch?v=ix63r9kE3Fw", car_parts=CarParts.default([HarnessConnector.hyundai_a])),
CAR.SONATA_LF: HyundaiCarInfo("Hyundai Sonata 2018-19", car_parts=HYUNDAI_E_PARTS), CAR.SONATA_LF: HyundaiCarInfo("Hyundai Sonata 2018-19", car_parts=HYUNDAI_E_PARTS),
CAR.TUCSON: [ CAR.TUCSON: [
HyundaiCarInfo("Hyundai Tucson 2021", min_enable_speed=19 * CV.MPH_TO_MS, car_parts=HYUNDAI_L_PARTS), HyundaiCarInfo("Hyundai Tucson 2021", min_enable_speed=19 * CV.MPH_TO_MS, car_parts=HYUNDAI_L_PARTS),

@ -37,7 +37,7 @@ class CAR:
@dataclass @dataclass
class MazdaCarInfo(CarInfo): class MazdaCarInfo(CarInfo):
package: str = "All" package: str = "All"
car_parts: CarParts = CarParts.default([HarnessConnector.mazda_connector]) car_parts: CarParts = CarParts.default([HarnessConnector.mazda])
CAR_INFO: Dict[str, Union[MazdaCarInfo, List[MazdaCarInfo]]] = { CAR_INFO: Dict[str, Union[MazdaCarInfo, List[MazdaCarInfo]]] = {

@ -36,7 +36,7 @@ NISSAN_PARTS = [HarnessAccessory.harness_box, Cable.rj45_cable_7ft, Cable.long_o
@dataclass @dataclass
class NissanCarInfo(CarInfo): class NissanCarInfo(CarInfo):
package: str = "ProPILOT Assist" package: str = "ProPILOT Assist"
car_parts: CarParts = CarParts.default([HarnessConnector.nissan_a_connector], default=NISSAN_PARTS) car_parts: CarParts = CarParts.default([HarnessConnector.nissan_a], default=NISSAN_PARTS)
CAR_INFO: Dict[str, Optional[Union[NissanCarInfo, List[NissanCarInfo]]]] = { 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: NissanCarInfo("Nissan Leaf 2018-23", video_link="https://youtu.be/vaMbtAh_0cY"),
CAR.LEAF_IC: None, # same platforms CAR.LEAF_IC: None, # same platforms
CAR.ROGUE: NissanCarInfo("Nissan Rogue 2018-20"), CAR.ROGUE: NissanCarInfo("Nissan Rogue 2018-20"),
CAR.ALTIMA: NissanCarInfo("Nissan Altima 2019-20", car_parts=CarParts.default([HarnessConnector.nissan_b_connector], default=NISSAN_PARTS)), CAR.ALTIMA: NissanCarInfo("Nissan Altima 2019-20", car_parts=CarParts.default([HarnessConnector.nissan_b], default=NISSAN_PARTS)),
} }
FINGERPRINTS = { FINGERPRINTS = {

@ -53,13 +53,13 @@ class CAR:
@dataclass @dataclass
class SubaruCarInfo(CarInfo): class SubaruCarInfo(CarInfo):
package: str = "EyeSight Driver Assistance" package: str = "EyeSight Driver Assistance"
car_parts: CarParts = CarParts.default([HarnessConnector.subaru_a_connector]) car_parts: CarParts = CarParts.default([HarnessConnector.subaru_a])
CAR_INFO: Dict[str, Union[SubaruCarInfo, List[SubaruCarInfo]]] = { CAR_INFO: Dict[str, Union[SubaruCarInfo, List[SubaruCarInfo]]] = {
CAR.ASCENT: SubaruCarInfo("Subaru Ascent 2019-21", "All"), CAR.ASCENT: SubaruCarInfo("Subaru Ascent 2019-21", "All"),
CAR.OUTBACK: SubaruCarInfo("Subaru Outback 2020-22", "All", car_parts=CarParts.default([HarnessConnector.subaru_b_connector])), CAR.OUTBACK: SubaruCarInfo("Subaru Outback 2020-22", "All", car_parts=CarParts.default([HarnessConnector.subaru_b])),
CAR.LEGACY: SubaruCarInfo("Subaru Legacy 2020-22", "All", car_parts=CarParts.default([HarnessConnector.subaru_b_connector])), CAR.LEGACY: SubaruCarInfo("Subaru Legacy 2020-22", "All", car_parts=CarParts.default([HarnessConnector.subaru_b])),
CAR.IMPREZA: [ CAR.IMPREZA: [
SubaruCarInfo("Subaru Impreza 2017-19"), SubaruCarInfo("Subaru Impreza 2017-19"),
SubaruCarInfo("Subaru Crosstrek 2018-19", video_link="https://youtu.be/Agww7oE1k-s?t=26"), SubaruCarInfo("Subaru Crosstrek 2018-19", video_link="https://youtu.be/Agww7oE1k-s?t=26"),

@ -102,7 +102,7 @@ class Footnote(Enum):
@dataclass @dataclass
class ToyotaCarInfo(CarInfo): class ToyotaCarInfo(CarInfo):
package: str = "All" package: str = "All"
car_parts: CarParts = CarParts.default([HarnessConnector.toyota_connector]) car_parts: CarParts = CarParts.default([HarnessConnector.toyota])
CAR_INFO: Dict[str, Union[ToyotaCarInfo, List[ToyotaCarInfo]]] = { CAR_INFO: Dict[str, Union[ToyotaCarInfo, List[ToyotaCarInfo]]] = {

@ -166,7 +166,7 @@ class Footnote(Enum):
@dataclass @dataclass
class VWCarInfo(CarInfo): class VWCarInfo(CarInfo):
package: str = "Adaptive Cruise Control (ACC) & Lane Assist" package: str = "Adaptive Cruise Control (ACC) & Lane Assist"
car_parts: CarParts = CarParts([HarnessConnector.j533_connector, HarnessAccessory.harness_box, Cable.long_obdc_cable, Cable.usbc_coupler, Mount.mount]) car_parts: CarParts = CarParts([HarnessConnector.j533, HarnessAccessory.harness_box, Cable.long_obdc_cable, Cable.usbc_coupler, Mount.mount])
def init_make(self, CP: car.CarParams): def init_make(self, CP: car.CarParams):
self.footnotes.insert(0, Footnote.VW_EXP_LONG) self.footnotes.insert(0, Footnote.VW_EXP_LONG)

Loading…
Cancel
Save