mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-08-24 06:33:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-priv' into master-dev-c3

Browse Source 
# Conflicts:
#	selfdrive/car/sunnypilot_carname.json
This commit is contained in:
Jason Wen
2024-06-24 17:57:41 -04:00
parent 80bc76791c ed84fb1f6f
commit a1b6b467a6
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/car/sunnypilot_carname.json
+11 -11
View File
@@ -92,10 +92,10 @@
"Hyundai Elantra Non-SCC 2022": "HYUNDAI_ELANTRA_2022_NON_SCC",
"Hyundai Genesis 2015-16": "HYUNDAI_GENESIS",
"Hyundai i30 2017-19": "HYUNDAI_ELANTRA_GT_I30",
"Hyundai Ioniq 5 (Southeast Asia only) 2022-23": "HYUNDAI_IONIQ_5",
"Hyundai Ioniq 5 (with HDA II) 2022-23": "HYUNDAI_IONIQ_5",
"Hyundai Ioniq 5 (without HDA II) 2022-23": "HYUNDAI_IONIQ_5",
"Hyundai Ioniq 6 (with HDA II) 2023": "HYUNDAI_IONIQ_6",
"Hyundai Ioniq 5 (Non-US only) 2022-24": "HYUNDAI_IONIQ_5",
"Hyundai Ioniq 5 (with HDA II) 2022-24": "HYUNDAI_IONIQ_5",
"Hyundai Ioniq 5 (without HDA II) 2022-24": "HYUNDAI_IONIQ_5",
"Hyundai Ioniq 6 (with HDA II) 2023-24": "HYUNDAI_IONIQ_6",
"Hyundai Ioniq Electric 2019": "HYUNDAI_IONIQ_EV_LTD",
"Hyundai Ioniq Electric 2020": "HYUNDAI_IONIQ_EV_2020",
"Hyundai Ioniq Hybrid 2017-19": "HYUNDAI_IONIQ",
@@ -131,7 +131,7 @@
"Kia Carnival (China only) 2023": "KIA_CARNIVAL_4TH_GEN",
"Kia Ceed 2019": "KIA_CEED",
"Kia Ceed PHEV Non-SCC 2022": "KIA_CEED_PHEV_2022_NON_SCC",
"Kia EV6 (Southeast Asia only) 2022-24": "KIA_EV6",
"Kia EV6 (Non-US only) 2022-24": "KIA_EV6",
"Kia EV6 (with HDA II) 2022-24": "KIA_EV6",
"Kia EV6 (without HDA II) 2022-24": "KIA_EV6",
"Kia Forte 2019-21": "KIA_FORTE",
@@ -192,8 +192,8 @@
"Lexus UX Hybrid 2019-23": "TOYOTA_COROLLA_TSS2",
"Lincoln Aviator 2020-23": "FORD_EXPLORER_MK6",
"Lincoln Aviator Plug-in Hybrid 2020-23": "FORD_EXPLORER_MK6",
"MAN eTGE 2020-23": "VOLKSWAGEN_CRAFTER_MK2",
"MAN TGE 2017-23": "VOLKSWAGEN_CRAFTER_MK2",
"MAN eTGE 2020-24": "VOLKSWAGEN_CRAFTER_MK2",
"MAN TGE 2017-24": "VOLKSWAGEN_CRAFTER_MK2",
"Mazda CX-5 2022-24": "MAZDA_CX5_2022",
"Mazda CX-9 2021-23": "MAZDA_CX9_2021",
"Nissan Altima 2019-20": "NISSAN_ALTIMA",
@@ -251,7 +251,7 @@
"Toyota Corolla Cross Hybrid (Non-US only) 2020-22": "TOYOTA_COROLLA_TSS2",
"Toyota Corolla Hatchback 2019-22": "TOYOTA_COROLLA_TSS2",
"Toyota Corolla Hybrid 2020-22": "TOYOTA_COROLLA_TSS2",
"Toyota Corolla Hybrid (Non-US only) 2020-23": "TOYOTA_COROLLA_TSS2",
"Toyota Corolla Hybrid (South America only) 2020-23": "TOYOTA_COROLLA_TSS2",
"Toyota Highlander 2017-19": "TOYOTA_HIGHLANDER",
"Toyota Highlander 2020-23": "TOYOTA_HIGHLANDER_TSS2",
"Toyota Highlander Hybrid 2017-19": "TOYOTA_HIGHLANDER",
@@ -283,8 +283,8 @@
"Volkswagen California 2021-23": "VOLKSWAGEN_TRANSPORTER_T61",
"Volkswagen Caravelle 2020": "VOLKSWAGEN_TRANSPORTER_T61",
"Volkswagen CC 2018-22": "VOLKSWAGEN_ARTEON_MK1",
"Volkswagen Crafter 2017-23": "VOLKSWAGEN_CRAFTER_MK2",
"Volkswagen e-Crafter 2018-23": "VOLKSWAGEN_CRAFTER_MK2",
"Volkswagen Crafter 2017-24": "VOLKSWAGEN_CRAFTER_MK2",
"Volkswagen e-Crafter 2018-24": "VOLKSWAGEN_CRAFTER_MK2",
"Volkswagen e-Golf 2014-20": "VOLKSWAGEN_GOLF_MK7",
"Volkswagen Golf 2015-20": "VOLKSWAGEN_GOLF_MK7",
"Volkswagen Golf Alltrack 2015-19": "VOLKSWAGEN_GOLF_MK7",
@@ -293,7 +293,7 @@
"Volkswagen Golf GTI 2015-21": "VOLKSWAGEN_GOLF_MK7",
"Volkswagen Golf R 2015-19": "VOLKSWAGEN_GOLF_MK7",
"Volkswagen Golf SportsVan 2015-20": "VOLKSWAGEN_GOLF_MK7",
"Volkswagen Grand California 2019-23": "VOLKSWAGEN_CRAFTER_MK2",
"Volkswagen Grand California 2019-24": "VOLKSWAGEN_CRAFTER_MK2",
"Volkswagen Jetta 2018-24": "VOLKSWAGEN_JETTA_MK7",
"Volkswagen Jetta GLI 2021-24": "VOLKSWAGEN_JETTA_MK7",
"Volkswagen Passat 2015-22": "VOLKSWAGEN_PASSAT_MK8",
selfdrive/car/volkswagen/carcontroller.py
+1 -1
View File
@@ -195,7 +195,7 @@ class CarController(CarControllerBase):
elif self.acc_type == 1:
self.cruise_button = 3 if self.cruise_button == 1 else 4 # resume, set
if self.frame % self.CCP.BTN_STEP == 0:
can_sends.append(self.CCS.create_acc_buttons_control(self.packer_pt, self.ext_bus, CS.gra_stock_values, frame=(self.frame // self.CCP.BTN_STEP),
can_sends.append(self.CCS.create_acc_buttons_control(self.packer_pt, CS.gra_stock_values, frame=(self.frame // self.CCP.BTN_STEP),
buttons=self.cruise_button, custom_stock_long=True))
self.send_count += 1
else: