remove sometimes wrong model years from name string

pull/23762/head
Shane Smiskol 3 years ago
parent 92da9bcc63
commit 0b01282b9b
  1. 80
      selfdrive/car/toyota/values.py

@ -72,49 +72,49 @@ class CAR(Enum):
CAR_INFO = { CAR_INFO = {
# Toyota # Toyota
CAR.ALPHARD_TSS2: CarInfo("Toyota Alphard 2020", {2019, 2020}), CAR.ALPHARD_TSS2: CarInfo("Toyota Alphard", {2019, 2020}),
CAR.AVALON: CarInfo("Toyota Avalon 2016", {2016, 2017, 2018, 2019, 2020, 2021}, 'TSS-P'), CAR.AVALON: CarInfo("Toyota Avalon", {2016, 2017, 2018, 2019, 2020, 2021}, 'TSS-P'),
CAR.AVALON_2019: CarInfo("Toyota Avalon 2019", {2022}, 'TSS-P'), CAR.AVALON_2019: CarInfo("Toyota Avalon", {2022}, 'TSS-P'),
CAR.AVALONH_2019: CarInfo("Toyota Avalon Hybrid 2019", {2019, 2020, 2021}, 'TSS-P'), CAR.AVALONH_2019: CarInfo("Toyota Avalon Hybrid", {2019, 2020, 2021}, 'TSS-P'),
CAR.AVALON_TSS2: CarInfo("Toyota Avalon 2022", {2022}), CAR.AVALON_TSS2: CarInfo("Toyota Avalon", {2022}),
CAR.CAMRY: CarInfo("Toyota Camry 2018", {2018, 2019, 2020}), CAR.CAMRY: CarInfo("Toyota Camry", {2018, 2019, 2020}),
CAR.CAMRYH: CarInfo("Toyota Camry Hybrid 2018", {2018, 2019, 2020}), CAR.CAMRYH: CarInfo("Toyota Camry Hybrid", {2018, 2019, 2020}),
CAR.CAMRY_TSS2: CarInfo("Toyota Camry 2021", {2021, 2022}), # TSS 2.5 CAR.CAMRY_TSS2: CarInfo("Toyota Camry", {2021, 2022}), # TSS 2.5
CAR.CAMRYH_TSS2: CarInfo("Toyota Camry Hybrid 2021", {2021, 2022}), CAR.CAMRYH_TSS2: CarInfo("Toyota Camry Hybrid", {2021, 2022}),
CAR.CHR: CarInfo("Toyota C-HR 2018", {2017, 2018, 2019, 2020, 2021}), CAR.CHR: CarInfo("Toyota C-HR", {2017, 2018, 2019, 2020, 2021}),
CAR.CHRH: CarInfo("Toyota C-HR Hybrid 2018", {2017, 2018, 2019}), CAR.CHRH: CarInfo("Toyota C-HR Hybrid", {2017, 2018, 2019}),
CAR.COROLLA: CarInfo("Toyota Corolla 2017", {2017, 2018, 2019}), CAR.COROLLA: CarInfo("Toyota Corolla", {2017, 2018, 2019}),
CAR.COROLLA_TSS2: CarInfo("Toyota Corolla TSS2 2019", {2020, 2021, 2022}), CAR.COROLLA_TSS2: CarInfo("Toyota Corolla TSS2", {2020, 2021, 2022}),
# LSS2 Lexus UX Hybrid is same as a TSS2 Corolla Hybrid # LSS2 Lexus UX Hybrid is same as a TSS2 Corolla Hybrid
CAR.COROLLAH_TSS2: CarInfo("Toyota Corolla Hybrid TSS2 2019", {2020, 2021, 2022}), CAR.COROLLAH_TSS2: CarInfo("Toyota Corolla Hybrid TSS2", {2020, 2021, 2022}),
CAR.HIGHLANDER: CarInfo("Toyota Highlander 2017", {2017, 2018, 2019}), CAR.HIGHLANDER: CarInfo("Toyota Highlander", {2017, 2018, 2019}),
CAR.HIGHLANDER_TSS2: CarInfo("Toyota Highlander 2020", {2020, 2021, 2022}), CAR.HIGHLANDER_TSS2: CarInfo("Toyota Highlander", {2020, 2021, 2022}),
CAR.HIGHLANDERH: CarInfo("Toyota Highlander Hybrid 2018", {2017, 2018, 2019}), CAR.HIGHLANDERH: CarInfo("Toyota Highlander Hybrid", {2017, 2018, 2019}),
CAR.HIGHLANDERH_TSS2: CarInfo("Toyota Highlander Hybrid 2020", {2020, 2021, 2022}), CAR.HIGHLANDERH_TSS2: CarInfo("Toyota Highlander Hybrid", {2020, 2021, 2022}),
CAR.PRIUS: CarInfo("Toyota Prius 2017", {2016, 2017, 2018, 2019, 2020}, 'TSS-P'), # TODO: Prius Prime is lost here (supports All packages) CAR.PRIUS: CarInfo("Toyota Prius", {2016, 2017, 2018, 2019, 2020}, 'TSS-P'), # TODO: Prius Prime is lost here (supports All packages)
CAR.PRIUS_V: CarInfo("Toyota Prius v 2017", {2017}, 'TSS-P'), CAR.PRIUS_V: CarInfo("Toyota Prius v", {2017}, 'TSS-P'),
CAR.PRIUS_TSS2: CarInfo("Toyota Prius Prime TSS2 2021", {2021, 2022}), CAR.PRIUS_TSS2: CarInfo("Toyota Prius Prime TSS2", {2021, 2022}),
CAR.RAV4: CarInfo("Toyota RAV4 2017", {2016, 2017, 2018}, 'TSS-P'), CAR.RAV4: CarInfo("Toyota RAV4", {2016, 2017, 2018}, 'TSS-P'),
CAR.RAV4H: CarInfo("Toyota RAV4 Hybrid 2017", {2016, 2017, 2018}, 'TSS-P'), CAR.RAV4H: CarInfo("Toyota RAV4 Hybrid", {2016, 2017, 2018}, 'TSS-P'),
CAR.RAV4_TSS2: CarInfo("Toyota RAV4 2019", {2019, 2020, 2021}), CAR.RAV4_TSS2: CarInfo("Toyota RAV4", {2019, 2020, 2021}),
CAR.RAV4H_TSS2: CarInfo("Toyota RAV4 Hybrid 2019", {2019, 2020, 2021}), CAR.RAV4H_TSS2: CarInfo("Toyota RAV4 Hybrid", {2019, 2020, 2021}),
CAR.MIRAI: CarInfo("Toyota Mirai 2021", {2021}), # TSS 2.5 CAR.MIRAI: CarInfo("Toyota Mirai", {2021}), # TSS 2.5
CAR.SIENNA: CarInfo("Toyota Sienna 2018", {2018, 2019, 2020}), CAR.SIENNA: CarInfo("Toyota Sienna", {2018, 2019, 2020}),
# Lexus # Lexus
CAR.LEXUS_CTH: CarInfo("Lexus CT Hybrid 2018", {2017, 2018}, 'LSS'), CAR.LEXUS_CTH: CarInfo("Lexus CT Hybrid", {2017, 2018}, 'LSS'),
CAR.LEXUS_ESH: CarInfo("Lexus ES Hybrid 2018", {2017, 2018}, 'LSS'), CAR.LEXUS_ESH: CarInfo("Lexus ES Hybrid", {2017, 2018}, 'LSS'),
CAR.LEXUS_ES_TSS2: CarInfo("Lexus ES 2019", {2019, 2020, 2021}), CAR.LEXUS_ES_TSS2: CarInfo("Lexus ES", {2019, 2020, 2021}),
CAR.LEXUS_ESH_TSS2: CarInfo("Lexus ES Hybrid 2019", {2019, 2020, 2021}), CAR.LEXUS_ESH_TSS2: CarInfo("Lexus ES Hybrid", {2019, 2020, 2021}),
CAR.LEXUS_IS: CarInfo("Lexus IS 2018", {2017, 2018, 2019}), CAR.LEXUS_IS: CarInfo("Lexus IS", {2017, 2018, 2019}),
CAR.LEXUS_NX: CarInfo("Lexus NX 2018", {2018, 2019}), CAR.LEXUS_NX: CarInfo("Lexus NX", {2018, 2019}),
CAR.LEXUS_NXH: CarInfo("Lexus NX Hybrid 2018", {2018, 2019}), CAR.LEXUS_NXH: CarInfo("Lexus NX Hybrid", {2018, 2019}),
CAR.LEXUS_NX_TSS2: CarInfo("Lexus NX 2020", {2020}), CAR.LEXUS_NX_TSS2: CarInfo("Lexus NX", {2020}),
CAR.LEXUS_RC: CarInfo("Lexus RC 2020", {2020}), CAR.LEXUS_RC: CarInfo("Lexus RC", {2020}),
CAR.LEXUS_RX: CarInfo("Lexus RX 2016", {2016, 2017, 2018}), CAR.LEXUS_RX: CarInfo("Lexus RX", {2016, 2017, 2018}),
CAR.LEXUS_RXH: CarInfo("Lexus RX Hybrid 2017", {2016, 2017, 2018, 2019}), CAR.LEXUS_RXH: CarInfo("Lexus RX Hybrid", {2016, 2017, 2018, 2019}),
CAR.LEXUS_RX_TSS2: CarInfo("Lexus RX 2020", {2020, 2021}), CAR.LEXUS_RX_TSS2: CarInfo("Lexus RX", {2020, 2021}),
CAR.LEXUS_RXH_TSS2: CarInfo("Lexus RX Hybrid 2020", {2020, 2021}), CAR.LEXUS_RXH_TSS2: CarInfo("Lexus RX Hybrid", {2020, 2021}),
} }
# (addr, cars, bus, 1/freq*100, vl) # (addr, cars, bus, 1/freq*100, vl)

Loading…
Cancel
Save