From fe6d73074ef9784f0ba6f7ccc9efc59cf69699f6 Mon Sep 17 00:00:00 2001
From: Jason Wen <haibin.wen3@gmail.com>
Date: Fri, 25 Aug 2023 10:28:28 -0400
Subject: [PATCH] Sync with CanBus helper

---
 selfdrive/car/hyundai/carstate.py   | 4 ++--
 selfdrive/car/hyundai/hyundaican.py | 3 ++-
 selfdrive/car/hyundai/interface.py  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/selfdrive/car/hyundai/carstate.py b/selfdrive/car/hyundai/carstate.py
index 55c7fc9b3b..7564b7cdd3 100644
--- a/selfdrive/car/hyundai/carstate.py
+++ b/selfdrive/car/hyundai/carstate.py
@@ -287,7 +287,7 @@ class CarState(CarStateBase):
     else:
       messages.append(("LVR12", 100))
 
-    bus = 5 if CP.flags & HyundaiFlags.CAN_CANFD_HDA2.value else 0
+    bus = CanBus(CP).ECAN if CP.flags & HyundaiFlags.CAN_CANFD_HDA2.value else 0
     return CANParser(DBC[CP.carFingerprint]["pt"], messages, bus)
 
   @staticmethod
@@ -314,7 +314,7 @@ class CarState(CarStateBase):
     if CP.flags & HyundaiFlags.CAN_CANFD_HDA2:
       messages.append(("CAM_0x2a4", 20))
 
-    bus = 6 if CP.flags & HyundaiFlags.CAN_CANFD_HDA2 else 2
+    bus = CanBus(CP).CAM if CP.flags & HyundaiFlags.CAN_CANFD_HDA2 else 2
     return CANParser(DBC[CP.carFingerprint]["pt"], messages, bus)
 
   def get_can_parser_canfd(self, CP):
diff --git a/selfdrive/car/hyundai/hyundaican.py b/selfdrive/car/hyundai/hyundaican.py
index d470fce636..c3d445c30f 100644
--- a/selfdrive/car/hyundai/hyundaican.py
+++ b/selfdrive/car/hyundai/hyundaican.py
@@ -1,4 +1,5 @@
 import crcmod
+from selfdrive.car.hyundai.hyundaicanfd import CanBus
 from selfdrive.car.hyundai.values import HyundaiFlags, CAR, CHECKSUM, CAMERA_SCC_CAR
 
 hyundai_checksum = crcmod.mkCrcFun(0x11D, initCrc=0xFD, rev=False, xorOut=0xdf)
@@ -112,7 +113,7 @@ def create_clu11(packer, frame, clu11, button, CP):
   values["CF_Clu_CruiseSwState"] = button
   values["CF_Clu_AliveCnt1"] = frame % 0x10
   # send buttons to camera on camera-scc based cars
-  bus = 2 if CP.carFingerprint in CAMERA_SCC_CAR else 5 if CP.flags & HyundaiFlags.CAN_CANFD_HDA2 else 0
+  bus = 2 if CP.carFingerprint in CAMERA_SCC_CAR else CanBus(CP).ECAN if CP.flags & HyundaiFlags.CAN_CANFD_HDA2 else 0
   return packer.make_can_msg("CLU11", bus, values)
 
 
diff --git a/selfdrive/car/hyundai/interface.py b/selfdrive/car/hyundai/interface.py
index 292fbfb195..24c2b72f44 100644
--- a/selfdrive/car/hyundai/interface.py
+++ b/selfdrive/car/hyundai/interface.py
@@ -266,7 +266,7 @@ class CarInterface(CarInterfaceBase):
     if candidate in CANFD_CAR:
       ret.enableBsm = 0x1e5 in fingerprint[CAN.ECAN]
     else:
-      bus = 5 if ret.flags & HyundaiFlags.CAN_CANFD_HDA2 else 0
+      bus = CAN.ECAN if ret.flags & HyundaiFlags.CAN_CANFD_HDA2 else 0
       ret.enableBsm = 0x58b in fingerprint[bus]
 
     # *** panda safety config ***