diff --git a/selfdrive/car/chrysler/values.py b/selfdrive/car/chrysler/values.py index 0507fa1c3f..dd6d2a41bd 100644 --- a/selfdrive/car/chrysler/values.py +++ b/selfdrive/car/chrysler/values.py @@ -5,7 +5,7 @@ from typing import Dict, List, Optional, Union from cereal import car from panda.python import uds from selfdrive.car import dbc_dict -from selfdrive.car.docs_definitions import CarInfo, CarPart, CarParts +from selfdrive.car.docs_definitions import CarInfo, CarParts, HarnessConnector from selfdrive.car.fw_query_definitions import FwQueryConfig, Request, p16 Ecu = car.CarParams.Ecu @@ -60,7 +60,7 @@ RAM_CARS = RAM_DT | RAM_HD @dataclass class ChryslerCarInfo(CarInfo): package: str = "Adaptive Cruise Control (ACC)" - car_parts: CarParts = CarParts.default([CarPart.fca_connector]) + car_parts: CarParts = CarParts.default([HarnessConnector.fca_connector]) 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_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([CarPart.ram_connector])), + CAR.RAM_1500: ChryslerCarInfo("Ram 1500 2019-23", car_parts=CarParts.default([HarnessConnector.ram_connector])), CAR.RAM_HD: [ - ChryslerCarInfo("Ram 2500 2020-22", car_parts=CarParts.default([CarPart.ram_connector])), - ChryslerCarInfo("Ram 3500 2019-22", car_parts=CarParts.default([CarPart.ram_connector])), + ChryslerCarInfo("Ram 2500 2020-22", car_parts=CarParts.default([HarnessConnector.ram_connector])), + ChryslerCarInfo("Ram 3500 2019-22", car_parts=CarParts.default([HarnessConnector.ram_connector])), ], } diff --git a/selfdrive/car/docs_definitions.py b/selfdrive/car/docs_definitions.py index 948e84a8ca..0933b784ee 100644 --- a/selfdrive/car/docs_definitions.py +++ b/selfdrive/car/docs_definitions.py @@ -30,76 +30,74 @@ class Star(Enum): EMPTY = "empty" -class PartType(Enum): - harness_connector = "Harness Connector" - generic_part = "Generic Part" - mount = "Mount" - - -Part = namedtuple("Part", ["value","type"], defaults=("",PartType.generic_part)) - - class CarPart(Enum): - #harness connectors - nidec_connector = Part("Honda Nidec connector", type=PartType.harness_connector) - bosch_a_connector = Part("Honda Bosch A connector", type=PartType.harness_connector) - bosch_b_connector = Part("Honda Bosch B connector", type=PartType.harness_connector) - toyota_connector = Part("Toyota connector", type=PartType.harness_connector) - subaru_a_connector = Part("Subaru A connector", type=PartType.harness_connector) - subaru_b_connector = Part("Subaru B connector", type=PartType.harness_connector) - fca_connector = Part("FCA connector", type=PartType.harness_connector) - ram_connector = Part("Ram connector", type=PartType.harness_connector) - vw_connector = Part("VW connector", type=PartType.harness_connector) - j533_connector = Part("J533 connector", type=PartType.harness_connector) - hyundai_a_connector = Part("Hyundai A connector", type=PartType.harness_connector) - hyundai_b_connector = Part("Hyundai B connector", type=PartType.harness_connector) - hyundai_c_connector = Part("Hyundai C connector", type=PartType.harness_connector) - hyundai_d_connector = Part("Hyundai D connector", type=PartType.harness_connector) - hyundai_e_connector = Part("Hyundai E connector", type=PartType.harness_connector) - hyundai_f_connector = Part("Hyundai F connector", type=PartType.harness_connector) - hyundai_g_connector = Part("Hyundai G connector", type=PartType.harness_connector) - hyundai_h_connector = Part("Hyundai H connector", type=PartType.harness_connector) - hyundai_i_connector = Part("Hyundai I connector", type=PartType.harness_connector) - hyundai_j_connector = Part("Hyundai J connector", type=PartType.harness_connector) - hyundai_k_connector = Part("Hyundai K connector", type=PartType.harness_connector) - hyundai_l_connector = Part("Hyundai L connector", type=PartType.harness_connector) - hyundai_m_connector = Part("Hyundai M connector", type=PartType.harness_connector) - hyundai_n_connector = Part("Hyundai N connector", type=PartType.harness_connector) - hyundai_o_connector = Part("Hyundai O connector", type=PartType.harness_connector) - hyundai_p_connector = Part("Hyundai P connector", type=PartType.harness_connector) - hyundai_q_connector = Part("Hyundai Q connector", type=PartType.harness_connector) - custom_connector = Part("Developer connector", type=PartType.harness_connector) - obd_ii_connector = Part("OBD-II connector", type=PartType.harness_connector) - gm_connector = Part("GM connector", type=PartType.harness_connector) - nissan_a_connector = Part("Nissan A connector", type=PartType.harness_connector) - nissan_b_connector = Part("Nissan B connector", type=PartType.harness_connector) - mazda_connector = Part("Mazda connector", type=PartType.harness_connector) - ford_q3_connector = Part("Ford Q3 connector", type=PartType.harness_connector) - ford_q4_connector = Part("Ford Q4 connector", type=PartType.harness_connector) - none_connector = Part("None connector", type=PartType.harness_connector) - - #harness accessories - harness_box = Part("harness box") - comma_power_v2 = Part("comma power v2") - - #mounts - mount = Part("mount", type=PartType.mount) - angled_mount = Part("angled mount", type=PartType.mount) - - #cables - rj45_cable_7ft = Part("RJ45 cable (7 ft)") - long_obdc_cable = Part("long OBD-C cable") - usb_a_2_a_cable = Part("USB A-A cable") - usbc_otg_cable = Part("USB C OTG cable") - usbc_coupler = Part("USB-C coupler") - obd_c_cable_1point5ft = Part("OBD-C cable (1.5 ft)") - - #devices - comma_3 = Part("comma 3") - red_panda = Part("red panda") - - -DEFAULT_CAR_PARTS: List[CarPart] = [CarPart.harness_box, CarPart.comma_power_v2, CarPart.rj45_cable_7ft, CarPart.mount] + pass + + +class HarnessConnector(CarPart): + nidec_connector = "Honda Nidec connector" + bosch_a_connector = "Honda Bosch A connector" + bosch_b_connector = "Honda Bosch B connector" + toyota_connector = "Toyota connector" + subaru_a_connector = "Subaru A connector" + subaru_b_connector = "Subaru B connector" + fca_connector = "FCA connector" + ram_connector = "Ram connector" + vw_connector = "VW connector" + j533_connector = "J533 connector" + hyundai_a_connector = "Hyundai A connector" + hyundai_b_connector = "Hyundai B connector" + hyundai_c_connector = "Hyundai C connector" + hyundai_d_connector = "Hyundai D connector" + hyundai_e_connector = "Hyundai E connector" + hyundai_f_connector = "Hyundai F connector" + hyundai_g_connector = "Hyundai G connector" + hyundai_h_connector = "Hyundai H connector" + hyundai_i_connector = "Hyundai I connector" + hyundai_j_connector = "Hyundai J connector" + hyundai_k_connector = "Hyundai K connector" + hyundai_l_connector = "Hyundai L connector" + hyundai_m_connector = "Hyundai M connector" + hyundai_n_connector = "Hyundai N connector" + hyundai_o_connector = "Hyundai O connector" + hyundai_p_connector = "Hyundai P connector" + hyundai_q_connector = "Hyundai Q connector" + custom_connector = "Developer connector" + obd_ii_connector = "OBD-II connector" + gm_connector = "GM connector" + nissan_a_connector = "Nissan A connector" + nissan_b_connector = "Nissan B connector" + mazda_connector = "Mazda connector" + ford_q3_connector = "Ford Q3 connector" + ford_q4_connector = "Ford Q4 connector" + none_connector = "None connector" + + +class HarnessAccessory(CarPart): + harness_box = "harness box" + comma_power_v2 = "comma power v2" + + +class Mount(CarPart): + mount = "mount" + angled_mount = "angled mount" + + +class Cable(CarPart): + rj45_cable_7ft = "RJ45 cable (7 ft)" + long_obdc_cable = "long OBD-C cable" + usb_a_2_a_cable = "USB A-A cable" + usbc_otg_cable = "USB C OTG cable" + usbc_coupler = "USB-C coupler" + obd_c_cable_1point5ft = "OBD-C cable (1.5 ft)" + + +class Device(CarPart): + comma_3 = "comma 3" + red_panda = "red panda" + + +DEFAULT_CAR_PARTS: List[CarPart] = [HarnessAccessory.harness_box, HarnessAccessory.comma_power_v2, Cable.rj45_cable_7ft, Mount.mount] @dataclass @@ -214,7 +212,7 @@ class CarInfo: if self.car_parts.parts: model_years = self.model + (' ' + self.years if self.years else '') buy_link = f'Buy Here' - parts = '
'.join([f"- {self.car_parts.parts.count(part)} {part.value.value}" for part in sorted(set(self.car_parts.parts), key=lambda part: part.value)]) + parts = '
'.join([f"- {self.car_parts.parts.count(part)} {part.value}" for part in sorted(set(self.car_parts.parts), key=lambda part: part.name)]) hardware_col = f'
View{parts}
{buy_link}
' self.row: Dict[Enum, Union[str, Star]] = { diff --git a/selfdrive/car/ford/values.py b/selfdrive/car/ford/values.py index f66936c349..82cc23b05b 100644 --- a/selfdrive/car/ford/values.py +++ b/selfdrive/car/ford/values.py @@ -4,7 +4,7 @@ from typing import Dict, List, Set, Union from cereal import car from selfdrive.car import AngleRateLimit, dbc_dict -from selfdrive.car.docs_definitions import CarInfo, CarPart, CarParts +from selfdrive.car.docs_definitions import CarInfo, CarParts, HarnessConnector, Mount from selfdrive.car.fw_query_definitions import FwQueryConfig, Request, StdQueries Ecu = car.CarParams.Ecu @@ -63,11 +63,11 @@ DBC: Dict[str, Dict[str, str]] = defaultdict(lambda: dbc_dict("ford_lincoln_base @dataclass class FordCarInfo(CarInfo): package: str = "Co-Pilot360 Assist+" - car_parts: CarParts = CarParts.default([CarPart.ford_q3_connector]) + car_parts: CarParts = CarParts.default([HarnessConnector.ford_q3_connector]) CAR_INFO: Dict[str, Union[CarInfo, List[CarInfo]]] = { - CAR.BRONCO_SPORT_MK1: FordCarInfo("Ford Bronco Sport 2021-22", car_parts=CarParts.default([CarPart.ford_q3_connector, CarPart.angled_mount], remove=[CarPart.mount])), + 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.ESCAPE_MK4: [ FordCarInfo("Ford Escape 2020-22"), FordCarInfo("Ford Kuga 2020-22", "Adaptive Cruise Control with Lane Centering"), diff --git a/selfdrive/car/gm/values.py b/selfdrive/car/gm/values.py index 62ef53169d..d4f998f7ea 100644 --- a/selfdrive/car/gm/values.py +++ b/selfdrive/car/gm/values.py @@ -5,7 +5,7 @@ from typing import Dict, List, Union from cereal import car from selfdrive.car import dbc_dict -from selfdrive.car.docs_definitions import CarFootnote, CarInfo, CarPart, CarParts, Column +from selfdrive.car.docs_definitions import Cable, CarFootnote, CarInfo, CarParts, Column, HarnessConnector, Mount Ecu = car.CarParams.Ecu @@ -89,9 +89,9 @@ class GMCarInfo(CarInfo): def init_make(self, CP: car.CarParams): if CP.networkLocation == car.CarParams.NetworkLocation.fwdCamera: - self.car_parts = CarParts.default([CarPart.gm_connector]) + self.car_parts = CarParts.default([HarnessConnector.gm_connector]) else: - self.car_parts = CarParts([CarPart.obd_ii_connector, CarPart.long_obdc_cable, CarPart.usbc_coupler, CarPart.mount]) + self.car_parts = CarParts([HarnessConnector.obd_ii_connector, Cable.long_obdc_cable, Cable.usbc_coupler, Mount.mount]) self.footnotes.append(Footnote.OBD_II) diff --git a/selfdrive/car/honda/values.py b/selfdrive/car/honda/values.py index f963dc9be9..d169cc2692 100644 --- a/selfdrive/car/honda/values.py +++ b/selfdrive/car/honda/values.py @@ -6,7 +6,7 @@ from cereal import car from common.conversions import Conversions as CV from panda.python import uds from selfdrive.car import dbc_dict -from selfdrive.car.docs_definitions import CarFootnote, CarInfo, CarPart, CarParts, Column +from selfdrive.car.docs_definitions import CarFootnote, CarInfo, CarParts, Column, HarnessConnector from selfdrive.car.fw_query_definitions import FwQueryConfig, Request, StdQueries, p16 Ecu = car.CarParams.Ecu @@ -110,9 +110,9 @@ class HondaCarInfo(CarInfo): def init_make(self, CP: car.CarParams): if CP.carFingerprint in HONDA_BOSCH: - self.car_parts = CarParts.default([CarPart.bosch_b_connector]) if CP.carFingerprint in HONDA_BOSCH_RADARLESS else CarParts.default([CarPart.bosch_a_connector]) + self.car_parts = CarParts.default([HarnessConnector.bosch_b_connector]) if CP.carFingerprint in HONDA_BOSCH_RADARLESS else CarParts.default([HarnessConnector.bosch_a_connector]) else: - self.car_parts = CarParts.default([CarPart.nidec_connector]) + self.car_parts = CarParts.default([HarnessConnector.nidec_connector]) CAR_INFO: Dict[str, Optional[Union[HondaCarInfo, List[HondaCarInfo]]]] = { diff --git a/selfdrive/car/hyundai/values.py b/selfdrive/car/hyundai/values.py index 7bec51f8aa..71ee816517 100644 --- a/selfdrive/car/hyundai/values.py +++ b/selfdrive/car/hyundai/values.py @@ -6,7 +6,7 @@ from cereal import car from panda.python import uds from common.conversions import Conversions as CV from selfdrive.car import dbc_dict -from selfdrive.car.docs_definitions import CarFootnote, CarInfo, CarPart, CarParts, Column +from selfdrive.car.docs_definitions import CarFootnote, CarInfo, CarParts, Column, HarnessConnector from selfdrive.car.fw_query_definitions import FwQueryConfig, Request, p16 Ecu = car.CarParams.Ecu @@ -136,23 +136,23 @@ class Footnote(Enum): Column.MODEL, shop_footnote=True) -HYUNDAI_A_PARTS = CarParts.default([CarPart.hyundai_a_connector]) -HYUNDAI_B_PARTS = CarParts.default([CarPart.hyundai_b_connector]) -HYUNDAI_C_PARTS = CarParts.default([CarPart.hyundai_c_connector]) -HYUNDAI_D_PARTS = CarParts.default([CarPart.hyundai_d_connector]) -HYUNDAI_E_PARTS = CarParts.default([CarPart.hyundai_e_connector]) -HYUNDAI_F_PARTS = CarParts.default([CarPart.hyundai_f_connector]) -HYUNDAI_G_PARTS = CarParts.default([CarPart.hyundai_g_connector]) -HYUNDAI_H_PARTS = CarParts.default([CarPart.hyundai_h_connector]) -HYUNDAI_I_PARTS = CarParts.default([CarPart.hyundai_i_connector]) -HYUNDAI_J_PARTS = CarParts.default([CarPart.hyundai_j_connector]) -HYUNDAI_K_PARTS = CarParts.default([CarPart.hyundai_k_connector]) -HYUNDAI_L_PARTS = CarParts.default([CarPart.hyundai_l_connector]) -HYUNDAI_M_PARTS = CarParts.default([CarPart.hyundai_m_connector]) -HYUNDAI_N_PARTS = CarParts.default([CarPart.hyundai_n_connector]) -HYUNDAI_O_PARTS = CarParts.default([CarPart.hyundai_o_connector]) -HYUNDAI_P_PARTS = CarParts.default([CarPart.hyundai_p_connector]) -HYUNDAI_Q_PARTS = CarParts.default([CarPart.hyundai_q_connector]) +HYUNDAI_A_PARTS = CarParts.default([HarnessConnector.hyundai_a_connector]) +HYUNDAI_B_PARTS = CarParts.default([HarnessConnector.hyundai_b_connector]) +HYUNDAI_C_PARTS = CarParts.default([HarnessConnector.hyundai_c_connector]) +HYUNDAI_D_PARTS = CarParts.default([HarnessConnector.hyundai_d_connector]) +HYUNDAI_E_PARTS = CarParts.default([HarnessConnector.hyundai_e_connector]) +HYUNDAI_F_PARTS = CarParts.default([HarnessConnector.hyundai_f_connector]) +HYUNDAI_G_PARTS = CarParts.default([HarnessConnector.hyundai_g_connector]) +HYUNDAI_H_PARTS = CarParts.default([HarnessConnector.hyundai_h_connector]) +HYUNDAI_I_PARTS = CarParts.default([HarnessConnector.hyundai_i_connector]) +HYUNDAI_J_PARTS = CarParts.default([HarnessConnector.hyundai_j_connector]) +HYUNDAI_K_PARTS = CarParts.default([HarnessConnector.hyundai_k_connector]) +HYUNDAI_L_PARTS = CarParts.default([HarnessConnector.hyundai_l_connector]) +HYUNDAI_M_PARTS = CarParts.default([HarnessConnector.hyundai_m_connector]) +HYUNDAI_N_PARTS = CarParts.default([HarnessConnector.hyundai_n_connector]) +HYUNDAI_O_PARTS = CarParts.default([HarnessConnector.hyundai_o_connector]) +HYUNDAI_P_PARTS = CarParts.default([HarnessConnector.hyundai_p_connector]) +HYUNDAI_Q_PARTS = CarParts.default([HarnessConnector.hyundai_q_connector]) @dataclass diff --git a/selfdrive/car/mazda/values.py b/selfdrive/car/mazda/values.py index c758311dd0..b8b6302d9b 100644 --- a/selfdrive/car/mazda/values.py +++ b/selfdrive/car/mazda/values.py @@ -3,7 +3,7 @@ from typing import Dict, List, Union from cereal import car from selfdrive.car import dbc_dict -from selfdrive.car.docs_definitions import CarInfo, CarPart, CarParts +from selfdrive.car.docs_definitions import CarInfo, CarParts, HarnessConnector from selfdrive.car.fw_query_definitions import FwQueryConfig, Request, StdQueries Ecu = car.CarParams.Ecu @@ -37,7 +37,7 @@ class CAR: @dataclass class MazdaCarInfo(CarInfo): package: str = "All" - car_parts: CarParts = CarParts.default([CarPart.mazda_connector]) + car_parts: CarParts = CarParts.default([HarnessConnector.mazda_connector]) CAR_INFO: Dict[str, Union[MazdaCarInfo, List[MazdaCarInfo]]] = { diff --git a/selfdrive/car/nissan/values.py b/selfdrive/car/nissan/values.py index 1fee383887..a794220358 100644 --- a/selfdrive/car/nissan/values.py +++ b/selfdrive/car/nissan/values.py @@ -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 CarInfo, CarPart, CarParts +from selfdrive.car.docs_definitions import Cable, CarInfo, 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 = [CarPart.harness_box, CarPart.rj45_cable_7ft, CarPart.long_obdc_cable, CarPart.usbc_coupler, CarPart.mount] +NISSAN_PARTS = [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([CarPart.nissan_a_connector], default=NISSAN_PARTS) + car_parts: CarParts = CarParts.default([HarnessConnector.nissan_a_connector], default=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([CarPart.nissan_b_connector], default=NISSAN_PARTS)), + CAR.ALTIMA: NissanCarInfo("Nissan Altima 2019-20", car_parts=CarParts.default([HarnessConnector.nissan_b_connector], default=NISSAN_PARTS)), } FINGERPRINTS = { diff --git a/selfdrive/car/subaru/values.py b/selfdrive/car/subaru/values.py index 39ff8ca970..f1af6b50dc 100644 --- a/selfdrive/car/subaru/values.py +++ b/selfdrive/car/subaru/values.py @@ -5,7 +5,7 @@ from typing import Dict, List, Union from cereal import car from panda.python import uds from selfdrive.car import dbc_dict -from selfdrive.car.docs_definitions import CarInfo, CarPart, CarParts +from selfdrive.car.docs_definitions import CarInfo, CarParts, HarnessConnector from selfdrive.car.fw_query_definitions import FwQueryConfig, Request, StdQueries, p16 Ecu = car.CarParams.Ecu @@ -53,13 +53,13 @@ class CAR: @dataclass class SubaruCarInfo(CarInfo): package: str = "EyeSight Driver Assistance" - car_parts: CarParts = CarParts.default([CarPart.subaru_a_connector]) + car_parts: CarParts = CarParts.default([HarnessConnector.subaru_a_connector]) CAR_INFO: Dict[str, Union[SubaruCarInfo, List[SubaruCarInfo]]] = { CAR.ASCENT: SubaruCarInfo("Subaru Ascent 2019-21", "All"), - CAR.OUTBACK: SubaruCarInfo("Subaru Outback 2020-22", "All", car_parts=CarParts.default([CarPart.subaru_b_connector])), - CAR.LEGACY: SubaruCarInfo("Subaru Legacy 2020-22", "All", car_parts=CarParts.default([CarPart.subaru_b_connector])), + CAR.OUTBACK: SubaruCarInfo("Subaru Outback 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_connector])), CAR.IMPREZA: [ SubaruCarInfo("Subaru Impreza 2017-19"), SubaruCarInfo("Subaru Crosstrek 2018-19", video_link="https://youtu.be/Agww7oE1k-s?t=26"), diff --git a/selfdrive/car/toyota/values.py b/selfdrive/car/toyota/values.py index 0009e345fa..bd9769d8ac 100644 --- a/selfdrive/car/toyota/values.py +++ b/selfdrive/car/toyota/values.py @@ -6,7 +6,7 @@ from typing import Dict, List, Union from cereal import car from common.conversions import Conversions as CV from selfdrive.car import dbc_dict -from selfdrive.car.docs_definitions import CarFootnote, CarInfo, Column, CarPart, CarParts +from selfdrive.car.docs_definitions import CarFootnote, CarInfo, Column, CarParts, HarnessConnector from selfdrive.car.fw_query_definitions import FwQueryConfig, Request, StdQueries Ecu = car.CarParams.Ecu @@ -102,7 +102,7 @@ class Footnote(Enum): @dataclass class ToyotaCarInfo(CarInfo): package: str = "All" - car_parts: CarParts = CarParts.default([CarPart.toyota_connector]) + car_parts: CarParts = CarParts.default([HarnessConnector.toyota_connector]) CAR_INFO: Dict[str, Union[ToyotaCarInfo, List[ToyotaCarInfo]]] = { diff --git a/selfdrive/car/volkswagen/values.py b/selfdrive/car/volkswagen/values.py index f94b44950e..edc2031a21 100755 --- a/selfdrive/car/volkswagen/values.py +++ b/selfdrive/car/volkswagen/values.py @@ -7,7 +7,7 @@ from cereal import car from panda.python import uds from opendbc.can.can_define import CANDefine from selfdrive.car import dbc_dict -from selfdrive.car.docs_definitions import CarFootnote, CarInfo, CarPart, CarParts, Column +from selfdrive.car.docs_definitions import Cable, CarFootnote, CarInfo, CarParts, Column, HarnessAccessory, HarnessConnector, Mount from selfdrive.car.fw_query_definitions import FwQueryConfig, Request, p16 Ecu = car.CarParams.Ecu @@ -166,7 +166,7 @@ class Footnote(Enum): @dataclass class VWCarInfo(CarInfo): package: str = "Adaptive Cruise Control (ACC) & Lane Assist" - car_parts: CarParts = CarParts([CarPart.j533_connector, CarPart.harness_box, CarPart.long_obdc_cable, CarPart.usbc_coupler, CarPart.mount]) + car_parts: CarParts = CarParts([HarnessConnector.j533_connector, HarnessAccessory.harness_box, Cable.long_obdc_cable, Cable.usbc_coupler, Mount.mount]) def init_make(self, CP: car.CarParams): self.footnotes.insert(0, Footnote.VW_EXP_LONG)