convert year sets to strings

pull/23762/head
Shane Smiskol 3 years ago
parent e3f3c44585
commit 196536f70b
  1. 13
      selfdrive/car/chrysler/values.py
  2. 2
      selfdrive/car/ford/values.py
  3. 14
      selfdrive/car/gm/values.py
  4. 48
      selfdrive/car/honda/values.py
  5. 12
      selfdrive/car/mazda/values.py
  6. 10
      selfdrive/car/nissan/values.py
  7. 15
      selfdrive/car/subaru/values.py
  8. 4
      selfdrive/car/tesla/values.py
  9. 68
      selfdrive/car/volkswagen/values.py

@ -20,13 +20,12 @@ class CAR:
CAR_INFO = {
CAR.PACIFICA_2017_HYBRID: CarInfo("Chrysler Pacifica Hybrid", {2017}, "Adaptive Cruise"),
CAR.PACIFICA_2018_HYBRID: CarInfo("Chrysler Pacifica Hybrid", {2018}, "Adaptive Cruise"),
CAR.PACIFICA_2019_HYBRID: CarInfo("Chrysler Pacifica Hybrid", {2019}, "Adaptive Cruise"),
CAR.PACIFICA_2018: CarInfo("Chrysler Pacifica", {2017, 2018}, "Adaptive Cruise"),
CAR.PACIFICA_2020: CarInfo("Chrysler Pacifica", {2020}, "Adaptive Cruise"),
CAR.JEEP_CHEROKEE: CarInfo("Jeep Grand Cherokee V6", {2016, 2017, 2018}, "Adaptive Cruise"),
CAR.JEEP_CHEROKEE_2019: CarInfo("Jeep Grand Cherokee", {2019, 2020}, "Adaptive Cruise"),
CAR.PACIFICA_2017_HYBRID: CarInfo("Chrysler Pacifica Hybrid 2017-18", "Adaptive Cruise"),
CAR.PACIFICA_2019_HYBRID: CarInfo("Chrysler Pacifica Hybrid 2019-21", "Adaptive Cruise"),
CAR.PACIFICA_2018: CarInfo("Chrysler Pacifica 2017-18", "Adaptive Cruise"),
CAR.PACIFICA_2020: CarInfo("Chrysler Pacifica 2020", "Adaptive Cruise"),
CAR.JEEP_CHEROKEE: CarInfo("Grand Cherokee 2016-18", "Adaptive Cruise"),
CAR.JEEP_CHEROKEE_2019: CarInfo("Grand Cherokee 2019-20", "Adaptive Cruise"),
}
# Unique CAN messages:

@ -10,7 +10,7 @@ class CAR:
CAR_INFO = {
CAR.FUSION: CarInfo("Ford Fusion", {2018}, "All")
CAR.FUSION: CarInfo("Ford Fusion 2018", "All")
}
DBC = {

@ -51,13 +51,13 @@ class CAR:
CAR_INFO = {
CAR.HOLDEN_ASTRA: CarInfo("Holden Astra RS-V BK", {2017}, "Adaptive Cruise"),
CAR.VOLT: CarInfo("Chevrolet Volt Premier", {2017, 2018}, "Adaptive Cruise"),
CAR.CADILLAC_ATS: CarInfo("CADILLAC ATS Premium Performance", {2018}, "Adaptive Cruise"),
CAR.MALIBU: CarInfo("Chevrolet Malibu Premier", {2017}, "Adaptive Cruise"),
CAR.ACADIA: CarInfo("GMC Acadia Denali", {2018}, "Adaptive Cruise"),
CAR.BUICK_REGAL: CarInfo("Buick Regal Essence", {2018}, "Adaptive Cruise"),
CAR.ESCALADE_ESV: CarInfo("Cadillac Escalade ESV", {2016}, "ACC + LKAS"),
CAR.HOLDEN_ASTRA: CarInfo("Holden Astra 2017", "Adaptive Cruise"),
CAR.VOLT: CarInfo("Chevrolet Volt 2017-18", "Adaptive Cruise"),
CAR.CADILLAC_ATS: CarInfo("Cadillac ATS Premium Performance 2018", "Adaptive Cruise"),
CAR.MALIBU: CarInfo("Chevrolet Malibu Premier 2017", "Adaptive Cruise"),
CAR.ACADIA: CarInfo("GMC Acadia 2018", "Adaptive Cruise"),
CAR.BUICK_REGAL: CarInfo("Buick Regal Essence 2018", "Adaptive Cruise"),
CAR.ESCALADE_ESV: CarInfo("Cadillac Escalade ESV 2016", "ACC + LKAS"),
}

@ -67,8 +67,8 @@ VISUAL_HUD = {
class CAR:
ACCORD = "HONDA ACCORD 2018"
ACCORDH = "HONDA ACCORD HYBRID 2018"
CIVIC = "HONDA CIVIC 2016" # Sedan/Coupe 2016-18
CIVIC_BOSCH = "HONDA CIVIC (BOSCH) 2019" # Bosch Sedan/Coupe 2019-2020
CIVIC = "HONDA CIVIC 2016"
CIVIC_BOSCH = "HONDA CIVIC (BOSCH) 2019"
CIVIC_BOSCH_DIESEL = "HONDA CIVIC SEDAN 1.6 DIESEL 2019"
ACURA_ILX = "ACURA ILX 2016"
CRV = "HONDA CR-V 2016"
@ -90,31 +90,31 @@ class CAR:
CAR_INFO = {
CAR.ACCORD: CarInfo("Honda Accord", {2018, 2019, 2020, 2021}, "All", min_steer_speed=3. * CV.MPH_TO_MS),
CAR.ACCORDH: CarInfo("Honda Accord Hybrid", {2018, 2019, 2020, 2021}, "All", min_steer_speed=3. * CV.MPH_TO_MS),
CAR.CIVIC: CarInfo("Honda Civic Sedan/Coupe", {2016, 2017, 2018}, "Honda Sensing", min_steer_speed=12. * CV.MPH_TO_MS), # Nidec
CAR.ACCORD: CarInfo("Honda Accord 2018-21", "All", min_steer_speed=3. * CV.MPH_TO_MS),
CAR.ACCORDH: CarInfo("Honda Accord Hybrid 2018-21", "All", min_steer_speed=3. * CV.MPH_TO_MS),
CAR.CIVIC: CarInfo("Honda Civic Sedan/Coupe 2016-18", "Honda Sensing", min_steer_speed=12. * CV.MPH_TO_MS),
CAR.CIVIC_BOSCH: [
CarInfo("Honda Civic Sedan/Coupe", {2019, 2020}, "All", min_steer_speed=2. * CV.MPH_TO_MS),
CarInfo("Honda Civic Hatchback", {2017, 2018, 2019, 2020, 2021}, "All", min_steer_speed=12. * CV.MPH_TO_MS),
CarInfo("Honda Civic Sedan/Coupe 2019-20", "All", min_steer_speed=2. * CV.MPH_TO_MS),
CarInfo("Honda Civic Hatchback 2017-21", "All", min_steer_speed=12. * CV.MPH_TO_MS),
],
# TODO: same as sedan/coupe, but no ALC under 12. make sure diesel exception is in readme
# CAR.CIVIC_BOSCH_DIESEL: CarInfo("Honda Civic Sedan 1.6 DIESEL", {2019, 2020}, "All"),
CAR.ACURA_ILX: CarInfo("Acura ILX", {2016, 2017, 2018, 2019}, "AcuraWatch Plus", min_steer_speed=25. * CV.MPH_TO_MS),
CAR.CRV: CarInfo("Honda CR-V", {2015, 2016}, "Touring", min_steer_speed=12. * CV.MPH_TO_MS),
CAR.CRV_5G: CarInfo("Honda CR-V", {2017, 2018, 2019, 2020, 2021}, "Honda Sensing", min_steer_speed=12. * CV.MPH_TO_MS),
# CAR.CRV_EU: CarInfo("Honda CR-V EU", {2015, 2016}, "Touring"), # Euro version of CRV Touring
CAR.CRV_HYBRID: CarInfo("Honda CR-V Hybrid", {2017, 2018, 2019}, "Honda Sensing", min_steer_speed=12. * CV.MPH_TO_MS),
CAR.FIT: CarInfo("Honda Fit", {2018, 2019}, "Honda Sensing", min_steer_speed=12. * CV.MPH_TO_MS),
CAR.FREED: CarInfo("Honda Freed", {2020}, "Honda Sensing", min_steer_speed=12. * CV.MPH_TO_MS),
CAR.HRV: CarInfo("Honda HR-V", {2019, 2020}, "Honda Sensing", min_steer_speed=12. * CV.MPH_TO_MS),
CAR.ODYSSEY: CarInfo("Honda Odyssey", {2018, 2019, 2020}, "Honda Sensing"),
CAR.ACURA_RDX: CarInfo("Acura RDX", {2016, 2017, 2018}, "AcuraWatch Plus", min_steer_speed=12. * CV.MPH_TO_MS),
CAR.ACURA_RDX_3G: CarInfo("Acura RDX", {2019, 2020, 2021}, "All", min_steer_speed=3. * CV.MPH_TO_MS),
CAR.PILOT: CarInfo("Honda Pilot", {2016, 2017, 2018, 2019, 2020, 2021}, "Honda Sensing", min_steer_speed=12. * CV.MPH_TO_MS),
CAR.PASSPORT: CarInfo("Honda Passport", {2019, 2020, 2021}, "All", min_steer_speed=12. * CV.MPH_TO_MS),
CAR.RIDGELINE: CarInfo("Honda Ridgeline", {2017, 2018, 2019, 2020, 2021}, "Honda Sensing", min_steer_speed=12. * CV.MPH_TO_MS),
CAR.INSIGHT: CarInfo("Honda Insight", {2019, 2020, 2021}, "All", min_steer_speed=3. * CV.MPH_TO_MS),
CAR.HONDA_E: CarInfo("Honda E", {2020}, "All", min_steer_speed=3. * CV.MPH_TO_MS),
# CAR.CIVIC_BOSCH_DIESEL: CarInfo("Honda Civic Sedan 1.6 DIESEL", "All"),
CAR.ACURA_ILX: CarInfo("Acura ILX 2016-19", "AcuraWatch Plus", min_steer_speed=25. * CV.MPH_TO_MS),
CAR.CRV: CarInfo("Honda CR-V 2015-16", "Touring", min_steer_speed=12. * CV.MPH_TO_MS),
CAR.CRV_5G: CarInfo("Honda CR-V 2017-21", "Honda Sensing", min_steer_speed=12. * CV.MPH_TO_MS),
# CAR.CRV_EU: CarInfo("Honda CR-V EU", "Touring"), # Euro version of CRV Touring
CAR.CRV_HYBRID: CarInfo("Honda CR-V Hybrid 2017-19", "Honda Sensing", min_steer_speed=12. * CV.MPH_TO_MS),
CAR.FIT: CarInfo("Honda Fit 2018-19", "Honda Sensing", min_steer_speed=12. * CV.MPH_TO_MS),
CAR.FREED: CarInfo("Honda Freed 2020", "Honda Sensing", min_steer_speed=12. * CV.MPH_TO_MS),
CAR.HRV: CarInfo("Honda HR-V 2019-20", "Honda Sensing", min_steer_speed=12. * CV.MPH_TO_MS),
CAR.ODYSSEY: CarInfo("Honda Odyssey 2018-20", "Honda Sensing"),
CAR.ACURA_RDX: CarInfo("Acura RDX 2016-18", "AcuraWatch Plus", min_steer_speed=12. * CV.MPH_TO_MS),
CAR.ACURA_RDX_3G: CarInfo("Acura RDX 2019-21", "All", min_steer_speed=3. * CV.MPH_TO_MS),
CAR.PILOT: CarInfo("Honda Pilot 2016-21", "Honda Sensing", min_steer_speed=12. * CV.MPH_TO_MS),
CAR.PASSPORT: CarInfo("Honda Passport 2019-21", "All", min_steer_speed=12. * CV.MPH_TO_MS),
CAR.RIDGELINE: CarInfo("Honda Ridgeline 2017-21", "Honda Sensing", min_steer_speed=12. * CV.MPH_TO_MS),
CAR.INSIGHT: CarInfo("Honda Insight 2019-21", "All", min_steer_speed=3. * CV.MPH_TO_MS),
CAR.HONDA_E: CarInfo("Honda E 2020", "All", min_steer_speed=3. * CV.MPH_TO_MS),
}

@ -25,12 +25,12 @@ class CAR:
CAR_INFO = {
CAR.CX5: CarInfo("Mazda CX-5", {2017, 2019}, "All"), # TODO: verify years for first 4
CAR.CX9: CarInfo("Mazda CX-9", {2016, 2017}, "All"),
CAR.MAZDA3: CarInfo("Mazda 3", {2017}, "All"),
CAR.MAZDA6: CarInfo("Mazda 6", {2017}, "All"),
CAR.CX9_2021: CarInfo("Mazda CX-9", {2021}, "All"),
CAR.CX5_2022: CarInfo("Mazda CX-5", {2022}, "All"),
CAR.CX5: CarInfo("Mazda CX-5 2017, 2019", "All"), # TODO: verify years for first 4
CAR.CX9: CarInfo("Mazda CX-9 2016-17", "All"),
CAR.MAZDA3: CarInfo("Mazda 3 2017", "All"),
CAR.MAZDA6: CarInfo("Mazda 6 2017", "All"),
CAR.CX9_2021: CarInfo("Mazda CX-9 2021", "All"),
CAR.CX5_2022: CarInfo("Mazda CX-5 2022", "All"),
}

@ -22,12 +22,10 @@ class CAR:
CAR_INFO = {
CAR.XTRAIL: CarInfo("Nissan X-Trail", {2017}, "ProPILOT"),
CAR.LEAF: CarInfo("Nissan Leaf", {2018, 2019, 2020, 2021, 2022}, "ProPILOT"),
# TODO: ensure we can leave out cars when generating docs
# CAR.LEAF_IC: CarInfo("Nissan Leaf Instrument Cluster", {2018, 2019, 2020, 2021, 2022}, "ProPILOT"),
CAR.ROGUE: CarInfo("Nissan Rogue", {2018, 2019, 2020}, "All"),
CAR.ALTIMA: CarInfo("Nissan Altima", {2019, 2020}, "ProPILOT"),
CAR.XTRAIL: CarInfo("Nissan X-Trail 2017", "ProPILOT"),
CAR.LEAF: CarInfo("Nissan Leaf 2018-22", "ProPILOT"),
CAR.ROGUE: CarInfo("Nissan Rogue 2018-20", "ProPILOT"),
CAR.ALTIMA: CarInfo("Nissan Altima 2019-20", "ProPILOT"),
}
FINGERPRINTS = {

@ -28,14 +28,13 @@ class CAR:
CAR_INFO = {
CAR.ASCENT: CarInfo("Subaru Ascent Limited", {2019}, "EyeSight"),
CAR.IMPREZA: CarInfo("Subaru Impreza Limited", {2017, 2018, 2019}, "EyeSight"),
CAR.IMPREZA_2020: CarInfo("Subaru Impreza Sport", {2020, 2021}, "EyeSight"),
CAR.FORESTER: CarInfo("Subaru Forester", {2019, 2020, 2021}, "EyeSight"),
CAR.FORESTER_PREGLOBAL: CarInfo("Subaru Forester", {2017, 2018}, "EyeSight"),
CAR.LEGACY_PREGLOBAL: CarInfo("Subaru Legacy", {2015, 2016, 2017, 2018}, "EyeSight"),
CAR.OUTBACK_PREGLOBAL: CarInfo("Subaru Outback", {2015, 2016, 2017}, "EyeSight"),
CAR.OUTBACK_PREGLOBAL_2018: CarInfo("Subaru Outback", {2018, 2019}, "EyeSight"),
CAR.ASCENT: CarInfo("Subaru Ascent 2019", "EyeSight"),
CAR.IMPREZA: CarInfo("Subaru Impreza 2017-19", "EyeSight"),
CAR.FORESTER: CarInfo("Subaru Forester 2019-21", "EyeSight"),
CAR.FORESTER_PREGLOBAL: CarInfo("Subaru Forester 2017-18", "EyeSight"),
CAR.LEGACY_PREGLOBAL: CarInfo("Subaru Legacy 2015-18", "EyeSight"),
CAR.OUTBACK_PREGLOBAL: CarInfo("Subaru Outback 2015-17", "EyeSight"),
CAR.OUTBACK_PREGLOBAL_2018: CarInfo("Subaru Outback 2018-19", "EyeSight"),
}

@ -12,8 +12,8 @@ class CAR:
CAR_INFO = {
CAR.AP1_MODELS: CarInfo("Tesla AP1 Model S", {}, "All"),
CAR.AP2_MODELS: CarInfo("Tesla AP2 Model S", {}, "All"),
CAR.AP1_MODELS: CarInfo("Tesla AP1 Model S", "All"),
CAR.AP2_MODELS: CarInfo("Tesla AP2 Model S", "All"),
}
FINGERPRINTS = {

@ -89,49 +89,49 @@ class CAR:
CAR_INFO = {
CAR.ARTEON_MK1: CarInfo("Volkswagen Arteon", {2018, 2021}, "Driver Assistance"),
CAR.ATLAS_MK1: CarInfo("Volkswagen Atlas", {2018, 2019, 2022}, "Driver Assistance"),
CAR.ARTEON_MK1: CarInfo("Volkswagen Arteon 2018, 2021", "Driver Assistance"),
CAR.ATLAS_MK1: CarInfo("Volkswagen Atlas 2018-19, 2022", "Driver Assistance"),
CAR.GOLF_MK7: [
CarInfo("Volkswagen e-Golf", {2014, 2019, 2020}, "Driver Assistance"),
CarInfo("Volkswagen Golf", {2015, 2016, 2017, 2018, 2019, 2020}, "Driver Assistance"),
CarInfo("Volkswagen Golf Alltrack", {2017, 2018}, "Driver Assistance"),
CarInfo("Volkswagen Golf GTE", {2016}, "Driver Assistance"),
CarInfo("Volkswagen Golf GTI", {2018, 2019, 2020}, "Driver Assistance"),
CarInfo("Volkswagen Golf R", {2016, 2017, 2018, 2019}, "Driver Assistance"),
CarInfo("Volkswagen Golf SportsVan", {2016}, "Driver Assistance"),
CarInfo("Volkswagen Golf SportWagen", {2016}, "Driver Assistance"),
CarInfo("Volkswagen e-Golf 2014, 2019-20", "Driver Assistance"),
CarInfo("Volkswagen Golf 2015-20", "Driver Assistance"),
CarInfo("Volkswagen Golf Alltrack 2017-18", "Driver Assistance"),
CarInfo("Volkswagen Golf GTE 2016", "Driver Assistance"),
CarInfo("Volkswagen Golf GTI 2018-20", "Driver Assistance"),
CarInfo("Volkswagen Golf R 2016-19", "Driver Assistance"),
CarInfo("Volkswagen Golf SportsVan 2016", "Driver Assistance"),
CarInfo("Volkswagen Golf SportWagen 2015", "Driver Assistance"),
],
CAR.JETTA_MK7: [
CarInfo("Volkswagen Jetta", {2018, 2019, 2020}, "Driver Assistance"),
CarInfo("Volkswagen Jetta GLI", {2021}, "Driver Assistance"),
CarInfo("Volkswagen Jetta 2018-20", "Driver Assistance"),
CarInfo("Volkswagen Jetta GLI 2021", "Driver Assistance"),
],
CAR.PASSAT_MK8: CarInfo("Volkswagen Passat", {2016, 2017, 2018}, "Driver Assistance"),
CAR.POLO_MK6: CarInfo("Volkswagen Polo", {2020}, "Driver Assistance"),
CAR.TAOS_MK1: CarInfo("Volkswagen Taos", {2022}, "Driver Assistance"),
CAR.TCROSS_MK1: CarInfo("Volkswagen T-Cross", {2021}, "Driver Assistance"),
CAR.TIGUAN_MK2: CarInfo("Volkswagen Tiguan", {2020}, "Driver Assistance"),
CAR.TOURAN_MK2: CarInfo("Volkswagen Touran", {2017}, "Driver Assistance"),
CAR.PASSAT_MK8: CarInfo("Volkswagen Passat 2016-18", "Driver Assistance"),
CAR.POLO_MK6: CarInfo("Volkswagen Polo 2020", "Driver Assistance"),
CAR.TAOS_MK1: CarInfo("Volkswagen Taos 2022", "Driver Assistance"),
CAR.TCROSS_MK1: CarInfo("Volkswagen T-Cross 2021", "Driver Assistance"),
CAR.TIGUAN_MK2: CarInfo("Volkswagen Tiguan 2020", "Driver Assistance"),
CAR.TOURAN_MK2: CarInfo("Volkswagen Touran 2017", "Driver Assistance"),
CAR.TRANSPORTER_T61: [
CarInfo("Volkswagen Caravelle", {2020}, "Driver Assistance"),
CarInfo("Volkswagen California", {2021}, "Driver Assistance"),
CarInfo("Volkswagen Caravelle 2020", "Driver Assistance"),
CarInfo("Volkswagen California 2021", "Driver Assistance"),
],
CAR.TROC_MK1: CarInfo("Volkswagen T-Roc", {2021}, "Driver Assistance"),
CAR.TROC_MK1: CarInfo("Volkswagen T-Roc 2021", "Driver Assistance"),
CAR.AUDI_A3_MK3: [
CarInfo("Audi A3", {2014, 2015, 2016, 2017, 2018, 2019}, "ACC + Lane Assist"),
CarInfo("Audi A3 Sportback e-tron", {2017, 2018}, "ACC + Lane Assist"),
CarInfo("Audi A3 2014-19", "ACC + Lane Assist"),
CarInfo("Audi A3 Sportback e-tron 2017-18", "ACC + Lane Assist"),
],
CAR.AUDI_Q2_MK1: CarInfo("Audi Q2", {2018}, "ACC + Lane Assist"),
CAR.AUDI_Q3_MK2: CarInfo("Audi Q3", {2020, 2021}, "ACC + Lane Assist"),
CAR.SEAT_ATECA_MK1: CarInfo("SEAT Ateca", {2018}, "Driver Assistance"),
CAR.SEAT_LEON_MK3: CarInfo("SEAT Leon", {2014, 2015, 2016, 2017, 2018, 2019, 2020}, "Driver Assistance"),
CAR.SKODA_KAMIQ_MK1: CarInfo("Škoda Kamiq", {2021}, "Driver Assistance"),
CAR.SKODA_KAROQ_MK1: CarInfo("Škoda Karoq", {2019}, "Driver Assistance"),
CAR.SKODA_KODIAQ_MK1: CarInfo("Škoda Kodiaq", {2018, 2019}, "Driver Assistance"),
CAR.SKODA_SCALA_MK1: CarInfo("Škoda Scala", {2020}, "Driver Assistance"),
CAR.SKODA_SUPERB_MK3: CarInfo("Škoda Superb", {2015, 2017, 2018}, "Driver Assistance"),
CAR.AUDI_Q2_MK1: CarInfo("Audi Q2 2018", "ACC + Lane Assist"),
CAR.AUDI_Q3_MK2: CarInfo("Audi Q3 2020-21", "ACC + Lane Assist"),
CAR.SEAT_ATECA_MK1: CarInfo("SEAT Ateca 2018", "Driver Assistance"),
CAR.SEAT_LEON_MK3: CarInfo("SEAT Leon 2014-2020", "Driver Assistance"),
CAR.SKODA_KAMIQ_MK1: CarInfo("Škoda Kamiq 2021", "Driver Assistance"),
CAR.SKODA_KAROQ_MK1: CarInfo("Škoda Karoq 2019", "Driver Assistance"),
CAR.SKODA_KODIAQ_MK1: CarInfo("Škoda Kodiaq 2018-19", "Driver Assistance"),
CAR.SKODA_SCALA_MK1: CarInfo("Škoda Scala 2020", "Driver Assistance"),
CAR.SKODA_SUPERB_MK3: CarInfo("Škoda Superb 2015-18", "Driver Assistance"),
CAR.SKODA_OCTAVIA_MK3: [
CarInfo("Škoda Octavia", {2015, 2018, 2019}, "Driver Assistance"),
CarInfo("Škoda Octavia RS", {2016}, "Driver Assistance"),
CarInfo("Škoda Octavia 2015, 2018-19", "Driver Assistance"),
CarInfo("Škoda Octavia RS 2016", "Driver Assistance"),
],
}

Loading…
Cancel
Save