From 24570ad8a766f97099e76020c77d6acf4a2d2305 Mon Sep 17 00:00:00 2001
From: Shane Smiskol <shane@smiskol.com>
Date: Mon, 14 Feb 2022 19:56:57 -0800
Subject: [PATCH] Mazda, Ford

---
 selfdrive/car/ford/values.py  | 14 +++++++++++---
 selfdrive/car/mazda/values.py | 31 ++++++++++++++++++++++---------
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/selfdrive/car/ford/values.py b/selfdrive/car/ford/values.py
index e1e2206472..c3100dab1e 100644
--- a/selfdrive/car/ford/values.py
+++ b/selfdrive/car/ford/values.py
@@ -1,11 +1,19 @@
-from selfdrive.car import dbc_dict
+from enum import Enum
+
+from selfdrive.car import CarInfo, dbc_dict
 from cereal import car
 Ecu = car.CarParams.Ecu
 
 MAX_ANGLE = 87.  # make sure we never command the extremes (0xfff) which cause latching fault
 
-class CAR:
-  FUSION = "FORD FUSION 2018"
+
+class CAR(Enum):
+  FUSION = 0
+
+
+CAR_INFO = {
+  CAR.FUSION: CarInfo("Ford Fusion", {2018})
+}
 
 DBC = {
   CAR.FUSION: dbc_dict('ford_fusion_2018_pt', 'ford_fusion_2018_adas'),
diff --git a/selfdrive/car/mazda/values.py b/selfdrive/car/mazda/values.py
index 1fcf184281..5605ff4805 100644
--- a/selfdrive/car/mazda/values.py
+++ b/selfdrive/car/mazda/values.py
@@ -1,4 +1,6 @@
-from selfdrive.car import dbc_dict
+from enum import Enum
+
+from selfdrive.car import CarInfo, dbc_dict
 from cereal import car
 Ecu = car.CarParams.Ecu
 
@@ -14,13 +16,25 @@ class CarControllerParams:
   STEER_DRIVER_FACTOR = 1         # from dbc
   STEER_ERROR_MAX = 350           # max delta between torque cmd and torque motor
 
-class CAR:
-  CX5 = "MAZDA CX-5"
-  CX9 = "MAZDA CX-9"
-  MAZDA3 = "MAZDA 3"
-  MAZDA6 = "MAZDA 6"
-  CX9_2021 = "MAZDA CX-9 2021"
-  CX5_2022 = "MAZDA CX-5 2022"
+
+class CAR(Enum):
+  CX5 = 0
+  CX9 = 1
+  MAZDA3 = 2
+  MAZDA6 = 3
+  CX9_2021 = 4
+  CX5_2022 = 5
+
+
+CAR_INFO = {
+  CAR.CX5: CarInfo("Mazda CX-5", {2017, 2019}),  # TODO: verify years for first 4
+  CAR.CX9: CarInfo("Mazda CX-9", {2016, 2017}),
+  CAR.MAZDA3: CarInfo("Mazda 3", {2017}),
+  CAR.MAZDA6: CarInfo("Mazda 6", {2017}),
+  CAR.CX9_2021: CarInfo("Mazda CX-9", {2021}),
+  CAR.CX5_2022: CarInfo("Mazda CX-5", {2022}),
+}
+
 
 class LKAS_LIMITS:
   STEER_THRESHOLD = 15
@@ -206,7 +220,6 @@ FW_VERSIONS = {
       b'PYKE-21PS1-B\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00',
     ],
   },
-
   CAR.MAZDA6: {
     (Ecu.eps, 0x730, None): [
       b'GBEF-3210X-B-00\x00\x00\x00\x00\x00\x00\x00\x00\x00',