From 194ad352c1bcad2ddfda1db845d6c3e54e6d8d01 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 10 Mar 2022 17:42:49 -0800 Subject: [PATCH] start to convert years to strings --- selfdrive/car/__init__.py | 2 +- selfdrive/car/hyundai/values.py | 76 ++++++++++++++--------------- selfdrive/car/toyota/values.py | 86 +++++++++++++++++---------------- 3 files changed, 83 insertions(+), 81 deletions(-) diff --git a/selfdrive/car/__init__.py b/selfdrive/car/__init__.py index 4435ac810e..cfc146630b 100644 --- a/selfdrive/car/__init__.py +++ b/selfdrive/car/__init__.py @@ -7,7 +7,7 @@ from common.numpy_fast import clip # kg of standard extra cargo to count for drive, gas, etc... STD_CARGO_KG = 136. -CarInfo = namedtuple('CarInfo', ['name', 'years', 'package', 'min_steer_speed', 'min_enable_speed'], defaults=[None, None]) +CarInfo = namedtuple('CarInfo', ['name', 'package', 'min_steer_speed', 'min_enable_speed'], defaults=[None, None]) def gen_empty_fingerprint(): diff --git a/selfdrive/car/hyundai/values.py b/selfdrive/car/hyundai/values.py index 63d7d2ae32..9edee9f60a 100644 --- a/selfdrive/car/hyundai/values.py +++ b/selfdrive/car/hyundai/values.py @@ -69,50 +69,50 @@ class CAR: CAR_INFO = { - CAR.ELANTRA: CarInfo("Hyundai Elantra", {2017, 2018, 2019}, "SCC + LKAS"), - CAR.ELANTRA_2021: CarInfo("Hyundai Elantra", {2021}, "SCC + LKAS"), - CAR.ELANTRA_HEV_2021: CarInfo("Hyundai Elantra Hybrid", {2021}, "SCC + LKAS"), - CAR.ELANTRA_GT_I30: CarInfo("Hyundai i30 N Line 2019 & GT 2018 DCT", {2018, 2019}, "SCC + LKAS"), - CAR.HYUNDAI_GENESIS: CarInfo("Hyundai Genesis", {2015, 2016}, "SCC + LKAS"), - CAR.IONIQ: CarInfo("Hyundai Ioniq Hybrid", {2017, 2018, 2019}, "SCC + LKAS"), - CAR.IONIQ_HEV_2022: CarInfo("Hyundai Ioniq Hybrid", {2020, 2021, 2022}, "SCC + LFA"), - CAR.IONIQ_EV_LTD: CarInfo("Hyundai Ioniq Electric Limited", {2019}, "SCC + LKAS"), - CAR.IONIQ_EV_2020: CarInfo("Hyundai Ioniq Electric", {2020}, "SCC + LKAS"), - CAR.IONIQ_PHEV: CarInfo("Hyundai Ioniq Plug-In Hybrid", {2020, 2021}, "SCC + LKAS"), - CAR.KONA: CarInfo("Hyundai Kona", {2020}, "SCC + LKAS"), - CAR.KONA_EV: CarInfo("Hyundai Kona Electric", {2018, 2019}, "SCC + LKAS"), - CAR.KONA_HEV: CarInfo("Hyundai Kona Hybrid", {2020}, "SCC + LKAS"), - CAR.SANTA_FE: CarInfo("Hyundai Santa Fe", {2019, 2020}, "All"), - CAR.SANTA_FE_2022: CarInfo("Hyundai Santa Fe", {2021, 2022}, "All"), - CAR.SANTA_FE_HEV_2022: CarInfo("Hyundai Santa Fe Hybrid", {2022}, "All"), - CAR.SANTA_FE_PHEV_2022: CarInfo("Hyundai Santa Fe Plug-In Hybrid", {2022}, "All"), - CAR.SONATA: CarInfo("Hyundai Sonata", {2020, 2021, 2022}, "All"), - CAR.SONATA_LF: CarInfo("Hyundai Sonata", {2018, 2019}, "SCC + LKAS"), + CAR.ELANTRA: CarInfo("Hyundai Elantra 2017-19", "SCC + LKAS"), + CAR.ELANTRA_2021: CarInfo("Hyundai Elantra 2021", "SCC + LKAS"), + CAR.ELANTRA_HEV_2021: CarInfo("Hyundai Elantra Hybrid 2021", "SCC + LKAS"), + CAR.ELANTRA_GT_I30: CarInfo("Hyundai i30 N Line 2019 & GT 2018 DCT", "SCC + LKAS"), + CAR.HYUNDAI_GENESIS: CarInfo("Hyundai Genesis 2015-16", "SCC + LKAS"), + CAR.IONIQ: CarInfo("Hyundai Ioniq Hybrid 2017-19", "SCC + LKAS"), + CAR.IONIQ_HEV_2022: CarInfo("Hyundai Ioniq Hybrid 2020-22", "SCC + LFA"), + CAR.IONIQ_EV_LTD: CarInfo("Hyundai Ioniq Electric Limited 2019", "SCC + LKAS"), + CAR.IONIQ_EV_2020: CarInfo("Hyundai Ioniq Electric 2020", "SCC + LKAS"), + CAR.IONIQ_PHEV: CarInfo("Hyundai Ioniq Plug-In Hybrid 2020-21", "SCC + LKAS"), + CAR.KONA: CarInfo("Hyundai Kona 2020", "SCC + LKAS"), + CAR.KONA_EV: CarInfo("Hyundai Kona Electric 2018-19", "SCC + LKAS"), + CAR.KONA_HEV: CarInfo("Hyundai Kona Hybrid 2020", "SCC + LKAS"), + CAR.SANTA_FE: CarInfo("Hyundai Santa Fe 2019-20", "All"), + CAR.SANTA_FE_2022: CarInfo("Hyundai Santa Fe 2021-22", "All"), + CAR.SANTA_FE_HEV_2022: CarInfo("Hyundai Santa Fe Hybrid 2022", "All"), + CAR.SANTA_FE_PHEV_2022: CarInfo("Hyundai Santa Fe Plug-In Hybrid 2022", "All"), + CAR.SONATA: CarInfo("Hyundai Sonata 2020-22", "All"), + CAR.SONATA_LF: CarInfo("Hyundai Sonata 2018-19", "SCC + LKAS"), CAR.PALISADE: [ - CarInfo("Hyundai Palisade", {2020, 2021}, "All"), - CarInfo("Kia Telluride", {2020}, "All"), + CarInfo("Hyundai Palisade 2020-21", "All"), + CarInfo("Kia Telluride 2020-21", "All"), ], - CAR.VELOSTER: CarInfo("Hyundai Veloster", {2019, 2020}, "SCC + LKAS"), - CAR.SONATA_HYBRID: CarInfo("Hyundai Sonata Hybrid", {2021, 2022}, "All"), + CAR.VELOSTER: CarInfo("Hyundai Veloster 2019-20", "SCC + LKAS"), + CAR.SONATA_HYBRID: CarInfo("Hyundai Sonata Hybrid 2021-22", "All"), # Kia - CAR.KIA_FORTE: CarInfo("Kia Forte", {2018, 2019, 2020, 2021}, "SCC + LKAS"), - CAR.KIA_K5_2021: CarInfo("Kia K5", {2021, 2022}, "SCC + LFA"), - CAR.KIA_NIRO_EV: CarInfo("Kia Niro EV", {2019, 2020, 2021, 2022}, "All"), - CAR.KIA_NIRO_HEV: CarInfo("Kia Niro Plug-In Hybrid", {2019}, "SCC + LKAS"), - CAR.KIA_NIRO_HEV_2021: CarInfo("Kia Niro Hybrid", {2021}, "SCC + LKAS"), - CAR.KIA_OPTIMA: CarInfo("Kia Optima SX 2019 & 2016", {2017, 2019}, "SCC + LKAS"), - CAR.KIA_OPTIMA_H: CarInfo("Kia Optima Hybrid 2017 & Sports 2019", {2017, 2019}, "SCC + LKAS"), - CAR.KIA_SELTOS: CarInfo("Kia Seltos", {2021}, "SCC + LKAS"), - CAR.KIA_SORENTO: CarInfo("Kia Sorento GT-Line", {2018, 2019}, "SCC + LKAS"), - CAR.KIA_STINGER: CarInfo("Kia Stinger GT2", {2018}, "SCC + LKAS"), - CAR.KIA_CEED: CarInfo("Kia Ceed Intro Edition", {2019}, "SCC + LKAS"), + CAR.KIA_FORTE: CarInfo("Kia Forte 2018-21", "SCC + LKAS"), + CAR.KIA_K5_2021: CarInfo("Kia K5 2021-22", "SCC + LFA"), + CAR.KIA_NIRO_EV: CarInfo("Kia Niro EV 2019-22", "All"), + CAR.KIA_NIRO_HEV: CarInfo("Kia Niro Plug-In Hybrid 2019", "SCC + LKAS"), + CAR.KIA_NIRO_HEV_2021: CarInfo("Kia Niro Hybrid 2021", "SCC + LKAS"), + CAR.KIA_OPTIMA: CarInfo("Kia Optima SX 2019 & 2016", "SCC + LKAS"), # TODO + CAR.KIA_OPTIMA_H: CarInfo("Kia Optima Hybrid 2017 & Sports 2019", "SCC + LKAS"), # TODO + CAR.KIA_SELTOS: CarInfo("Kia Seltos 2021", "SCC + LKAS"), + CAR.KIA_SORENTO: CarInfo("Kia Sorento GT-Line 2018-19", "SCC + LKAS"), + CAR.KIA_STINGER: CarInfo("Kia Stinger GT2 2018", "SCC + LKAS"), + CAR.KIA_CEED: CarInfo("Kia Ceed Intro Edition 2019", "SCC + LKAS"), # Genesis - CAR.GENESIS_G70: CarInfo("Genesis G70", {2018}, "All"), - CAR.GENESIS_G70_2020: CarInfo("Genesis G70", {2020}, "All"), - CAR.GENESIS_G80: CarInfo("Genesis G80", {2018}, "All"), - CAR.GENESIS_G90: CarInfo("Genesis G90", {2018}, "All"), + CAR.GENESIS_G70: CarInfo("Genesis G70 2018", "All"), + CAR.GENESIS_G70_2020: CarInfo("Genesis G70 2020", "All"), + CAR.GENESIS_G80: CarInfo("Genesis G80 2018", "All"), + CAR.GENESIS_G90: CarInfo("Genesis G90 2018", "All"), } class Buttons: diff --git a/selfdrive/car/toyota/values.py b/selfdrive/car/toyota/values.py index ca71ba005a..e0cf71f09b 100644 --- a/selfdrive/car/toyota/values.py +++ b/selfdrive/car/toyota/values.py @@ -73,52 +73,54 @@ class CAR: CAR_INFO = { # Toyota - CAR.ALPHARD_TSS2: CarInfo("Toyota Alphard", {2019, 2020}, "All"), - CAR.AVALON: CarInfo("Toyota Avalon", {2016, 2017, 2018, 2019, 2020, 2021}, 'TSS-P'), - CAR.AVALON_2019: CarInfo("Toyota Avalon", {2022}, 'TSS-P'), - CAR.AVALONH_2019: CarInfo("Toyota Avalon Hybrid", {2019, 2020, 2021}, 'TSS-P'), - CAR.AVALON_TSS2: CarInfo("Toyota Avalon", {2022}, "All"), - CAR.CAMRY: CarInfo("Toyota Camry", {2018, 2019, 2020}, "All"), - CAR.CAMRYH: CarInfo("Toyota Camry Hybrid", {2018, 2019, 2020}, "All"), - CAR.CAMRY_TSS2: CarInfo("Toyota Camry", {2021, 2022}, "All"), # TSS 2.5 - CAR.CAMRYH_TSS2: CarInfo("Toyota Camry Hybrid", {2021, 2022}, "All"), - CAR.CHR: CarInfo("Toyota C-HR", {2017, 2018, 2019, 2020, 2021}, "All"), - CAR.CHRH: CarInfo("Toyota C-HR Hybrid", {2017, 2018, 2019}, "All"), - CAR.COROLLA: CarInfo("Toyota Corolla", {2017, 2018, 2019}, "All"), - CAR.COROLLA_TSS2: CarInfo("Toyota Corolla TSS2", {2020, 2021, 2022}, "All"), - # LSS2 Lexus UX Hybrid is same as a TSS2 Corolla Hybrid - CAR.COROLLAH_TSS2: CarInfo("Toyota Corolla Hybrid TSS2", {2020, 2021, 2022}, "All"), - CAR.HIGHLANDER: CarInfo("Toyota Highlander", {2017, 2018, 2019}, "All"), - CAR.HIGHLANDER_TSS2: CarInfo("Toyota Highlander", {2020, 2021, 2022}, "All"), - CAR.HIGHLANDERH: CarInfo("Toyota Highlander Hybrid", {2017, 2018, 2019}, "All"), - CAR.HIGHLANDERH_TSS2: CarInfo("Toyota Highlander Hybrid", {2020, 2021, 2022}, "All"), + CAR.ALPHARD_TSS2: CarInfo("Toyota Alphard 2019-20", "All"), + CAR.AVALON: CarInfo("Toyota Avalon 2016-21", 'TSS-P'), + CAR.AVALON_2019: CarInfo("Toyota Avalon 2022", 'TSS-P'), + CAR.AVALONH_2019: CarInfo("Toyota Avalon Hybrid 2019-21", 'TSS-P'), + CAR.AVALON_TSS2: CarInfo("Toyota Avalon 2022", "All"), + CAR.CAMRY: CarInfo("Toyota Camry 2018-20", "All"), + CAR.CAMRYH: CarInfo("Toyota Camry Hybrid 2018-20", "All"), + CAR.CAMRY_TSS2: CarInfo("Toyota Camry 2021-22", "All"), + CAR.CAMRYH_TSS2: CarInfo("Toyota Camry Hybrid 2021-22", "All"), + CAR.CHR: CarInfo("Toyota C-HR 2017-21", "All"), + CAR.CHRH: CarInfo("Toyota C-HR Hybrid 2017-19", "All"), + CAR.COROLLA: CarInfo("Toyota Corolla 2017-19", "All"), + CAR.COROLLA_TSS2: CarInfo("Toyota Corolla 2020-22", "All"), + CAR.COROLLAH_TSS2: [ + CarInfo("Toyota Corolla Hybrid 2020-22", "All"), + CarInfo("Lexus UX Hybrid 2019-21", "All"), + ], + CAR.HIGHLANDER: CarInfo("Toyota Highlander 2017-19", "All"), + CAR.HIGHLANDER_TSS2: CarInfo("Toyota Highlander 2020-22", "All"), + CAR.HIGHLANDERH: CarInfo("Toyota Highlander Hybrid 2017-19", "All"), + CAR.HIGHLANDERH_TSS2: CarInfo("Toyota Highlander Hybrid 2020-22", "All"), CAR.PRIUS: [ - CarInfo("Toyota Prius", {2016, 2017, 2018, 2019, 2020}, 'TSS-P'), - CarInfo("Toyota Prius Prime", {2017, 2018, 2019, 2020}, 'All'), + CarInfo("Toyota Prius 2016-20", 'TSS-P'), + CarInfo("Toyota Prius Prime 2017-20", 'All'), ], - 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.RAV4: CarInfo("Toyota RAV4", {2016, 2017, 2018}, 'TSS-P'), - CAR.RAV4H: CarInfo("Toyota RAV4 Hybrid", {2016, 2017, 2018}, 'TSS-P'), - CAR.RAV4_TSS2: CarInfo("Toyota RAV4", {2019, 2020, 2021}, "All"), - CAR.RAV4H_TSS2: CarInfo("Toyota RAV4 Hybrid", {2019, 2020, 2021}, "All"), - CAR.MIRAI: CarInfo("Toyota Mirai", {2021}, "All"), # TSS 2.5 - CAR.SIENNA: CarInfo("Toyota Sienna", {2018, 2019, 2020}, "All"), + CAR.PRIUS_V: CarInfo("Toyota Prius v 2017", 'TSS-P', min_enable_speed=MIN_ACC_SPEED), + CAR.PRIUS_TSS2: CarInfo("Toyota Prius Prime 2021-22", "All"), + CAR.RAV4: CarInfo("Toyota RAV4 2016-18", 'TSS-P'), + CAR.RAV4H: CarInfo("Toyota RAV4 Hybrid 2016-18", 'TSS-P'), + CAR.RAV4_TSS2: CarInfo("Toyota RAV4 2019-21", "All"), + CAR.RAV4H_TSS2: CarInfo("Toyota RAV4 Hybrid 2019-21", "All"), + CAR.MIRAI: CarInfo("Toyota Mirai 2021", "All"), + CAR.SIENNA: CarInfo("Toyota Sienna 2018-20", "All"), # Lexus - CAR.LEXUS_CTH: CarInfo("Lexus CT Hybrid", {2017, 2018}, 'LSS'), - CAR.LEXUS_ESH: CarInfo("Lexus ES Hybrid", {2017, 2018}, 'LSS'), - CAR.LEXUS_ES_TSS2: CarInfo("Lexus ES", {2019, 2020, 2021}, "All"), - CAR.LEXUS_ESH_TSS2: CarInfo("Lexus ES Hybrid", {2019, 2020, 2021}, "All"), - CAR.LEXUS_IS: CarInfo("Lexus IS", {2017, 2018, 2019}, "All"), - CAR.LEXUS_NX: CarInfo("Lexus NX", {2018, 2019}, "All"), - CAR.LEXUS_NXH: CarInfo("Lexus NX Hybrid", {2018, 2019}, "All"), - CAR.LEXUS_NX_TSS2: CarInfo("Lexus NX", {2020}, "All"), - CAR.LEXUS_RC: CarInfo("Lexus RC", {2020}, "All"), - CAR.LEXUS_RX: CarInfo("Lexus RX", {2016, 2017, 2018}, "All"), - CAR.LEXUS_RXH: CarInfo("Lexus RX Hybrid", {2016, 2017, 2018, 2019}, "All"), - CAR.LEXUS_RX_TSS2: CarInfo("Lexus RX", {2020, 2021}, "All"), - CAR.LEXUS_RXH_TSS2: CarInfo("Lexus RX Hybrid", {2020, 2021}, "All"), + CAR.LEXUS_CTH: CarInfo("Lexus CT Hybrid 2017-18", 'LSS'), + CAR.LEXUS_ESH: CarInfo("Lexus ES Hybrid 2017-18", 'LSS'), + CAR.LEXUS_ES_TSS2: CarInfo("Lexus ES 2019-21", "All"), + CAR.LEXUS_ESH_TSS2: CarInfo("Lexus ES Hybrid 2019-21", "All"), + CAR.LEXUS_IS: CarInfo("Lexus IS 2017-19", "All"), + CAR.LEXUS_NX: CarInfo("Lexus NX 2018-19", "All"), + CAR.LEXUS_NXH: CarInfo("Lexus NX Hybrid 2018-19", "All"), + CAR.LEXUS_NX_TSS2: CarInfo("Lexus NX 2020", "All"), + CAR.LEXUS_RC: CarInfo("Lexus RC 2020", "All"), + CAR.LEXUS_RX: CarInfo("Lexus RX 2016-18", "All"), + CAR.LEXUS_RXH: CarInfo("Lexus RX Hybrid 2016-19", "All"), + CAR.LEXUS_RX_TSS2: CarInfo("Lexus RX 2020-21", "All"), + CAR.LEXUS_RXH_TSS2: CarInfo("Lexus RX Hybrid 2020-21", "All"), } # (addr, cars, bus, 1/freq*100, vl)