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

Merge branch 'SP-162-kia-ceed-phev-non-scc-2022' into master-dev-c3

Browse Source
This commit is contained in:
Jason Wen
2024-06-19 19:06:04 -04:00
parent ba14ae6b1d b1f4d05051
commit b7ddd9e2e4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/car/hyundai/carstate.py
+3 -3
View File
@@ -120,8 +120,8 @@ class CarState(CarStateBase):
cruise_available_msg = "E_CRUISE_CONTROL" if self.CP.flags & (HyundaiFlags.HYBRID | HyundaiFlags.EV) else "EMS16"
cruise_enabled_msg = "E_CRUISE_CONTROL" if self.CP.flags & (HyundaiFlags.HYBRID | HyundaiFlags.EV) else "LVR12"
cruise_speed_msg = "ELECT_GEAR" if self.CP.flags & (HyundaiFlags.HYBRID | HyundaiFlags.EV) else "LVR12"
ret.cruiseState.available = cp.vl[cruise_available_msg]['CRUISE_LAMP_M'] != 0
ret.cruiseState.enabled = cp.vl[cruise_enabled_msg]['CF_Lvr_CruiseSet'] != 0
ret.cruiseState.available = cp.vl[cruise_available_msg]["CRUISE_LAMP_M"] != 0
ret.cruiseState.enabled = cp.vl[cruise_enabled_msg]["CF_Lvr_CruiseSet"] != 0
ret.cruiseState.speed = cp.vl[cruise_speed_msg]["CF_Lvr_CruiseSet"] * speed_conv
ret.cruiseState.standstill = False
ret.cruiseState.nonAdaptive = False
@@ -367,7 +367,7 @@ class CarState(CarStateBase):
if CP.flags & (HyundaiFlags.HYBRID | HyundaiFlags.EV):
messages.append(("ELECT_GEAR", 20))
if CP.spFlags & HyundaiFlagsSP.SP_NON_SCC:
if CP.carFingerprint in NON_SCC_CAR:
messages.append(("E_CRUISE_CONTROL", 10))
elif CP.carFingerprint in CAN_GEARS["use_cluster_gears"]:
pass