zhudongjer/carrot
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix.. decelCruise

Browse Source
This commit is contained in:
ajouatom 2025-02-19 18:38:45 +09:00
parent 2a28e7865d
commit 9cde9574cd
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
selfdrive/car/cruise.py
View File

@ -442,8 +442,6 @@ class VCruiseCarrot:
v_cruise_kph, button_type, long_pressed = self._carrot_command(v_cruise_kph, button_type, long_pressed) v_cruise_kph, button_type, long_pressed = self._carrot_command(v_cruise_kph, button_type, long_pressed)
cruise_activated = not self.enabled_last and CC.enabled
if button_type in [ButtonType.accelCruise, ButtonType.decelCruise]: if button_type in [ButtonType.accelCruise, ButtonType.decelCruise]:
if self.autoCruiseControl_cancel_timer > 0: if self.autoCruiseControl_cancel_timer > 0:
self._add_log(f"AutoCruiseControl cancel timer RESET {button_type}") self._add_log(f"AutoCruiseControl cancel timer RESET {button_type}")
@ -471,8 +469,6 @@ class VCruiseCarrot:
self._pause_auto_speed_up = True self._pause_auto_speed_up = True
if self._soft_hold_active > 0: if self._soft_hold_active > 0:
self._cruise_control(-1, -1, "Cruise off,softhold mode (decelCruise)") self._cruise_control(-1, -1, "Cruise off,softhold mode (decelCruise)")
elif cruise_activated:
v_cruise_kph = max(self.v_ego_kph_set, self._cruise_speed_min)
elif self.v_ego_kph_set > v_cruise_kph + 2: elif self.v_ego_kph_set > v_cruise_kph + 2:
v_cruise_kph = max(self.v_ego_kph_set, self._cruise_speed_min) v_cruise_kph = max(self.v_ego_kph_set, self._cruise_speed_min)
elif self._cruise_button_mode in [0, 1]: elif self._cruise_button_mode in [0, 1]: