From b5a5d94a2c86d7321cc72818d4918156f6cc8120 Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Sat, 18 Jan 2025 20:39:05 -0500 Subject: [PATCH 1/2] bring them back --- selfdrive/car/car_specific.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/selfdrive/car/car_specific.py b/selfdrive/car/car_specific.py index e8094ee70d..cd2d66228c 100644 --- a/selfdrive/car/car_specific.py +++ b/selfdrive/car/car_specific.py @@ -71,18 +71,18 @@ class CarSpecificEvents: if self.CP.pcmCruise and CS.vEgo < self.CP.minEnableSpeed: events.add(EventName.belowEngageSpeed) - # if self.CP.pcmCruise: - # # we engage when pcm is active (rising edge) - # if CS.cruiseState.enabled and not CS_prev.cruiseState.enabled: - # events.add(EventName.pcmEnable) - # elif not CS.cruiseState.enabled and (CC.actuators.accel >= 0. or not self.CP.openpilotLongitudinalControl): - # # it can happen that car cruise disables while comma system is enabled: need to - # # keep braking if needed or if the speed is very low - # if CS.vEgo < self.CP.minEnableSpeed + 2.: - # # non loud alert if cruise disables below 25mph as expected (+ a little margin) - # events.add(EventName.speedTooLow) - # else: - # events.add(EventName.cruiseDisabled) + if self.CP.pcmCruise: + # we engage when pcm is active (rising edge) + if CS.cruiseState.enabled and not CS_prev.cruiseState.enabled: + events.add(EventName.pcmEnable) + elif not CS.cruiseState.enabled and (CC.actuators.accel >= 0. or not self.CP.openpilotLongitudinalControl): + # it can happen that car cruise disables while comma system is enabled: need to + # keep braking if needed or if the speed is very low + if CS.vEgo < self.CP.minEnableSpeed + 2.: + # non loud alert if cruise disables below 25mph as expected (+ a little margin) + events.add(EventName.speedTooLow) + else: + events.add(EventName.cruiseDisabled) if self.CP.minEnableSpeed > 0 and CS.vEgo < 0.001: events.add(EventName.manualRestart) From 9eb36a0b7e2cc1d8755da27c9dec3e7ed0b7d5c1 Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Sat, 18 Jan 2025 20:41:01 -0500 Subject: [PATCH 2/2] fix icons --- opendbc_repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc_repo b/opendbc_repo index a4444e5989..b4b0a180c8 160000 --- a/opendbc_repo +++ b/opendbc_repo @@ -1 +1 @@ -Subproject commit a4444e59891f1ffdb6da86db1932b31c386e6a14 +Subproject commit b4b0a180c814a01a9aa03829c4ce882eaec47b57