mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-09-29 23:43:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'sunnypilot/sunnypilot/master' into feature/slc

Browse Source
This commit is contained in:
Jason Wen
2025-09-21 01:16:59 -04:00
parent 484f946f4e 563ae65443
commit 5f75b55488
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/params_keys.h
+1 -1
View File
@@ -224,7 +224,7 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
{"OsmStateName", {PERSISTENT, STRING, "All"}},
{"OsmStateTitle", {PERSISTENT, STRING}},
{"OsmWayTest", {PERSISTENT, STRING}},
{"RoadName", {CLEAR_ON_ONROAD_TRANSITION, STRING}},
{"RoadName", {PERSISTENT, STRING}},
// Speed Limit
{"SpeedLimitMode", {PERSISTENT | BACKUP, INT, "1"}},
sunnypilot/selfdrive/car/intelligent_cruise_button_management/controller.py
+1 -3
View File
@@ -108,9 +108,7 @@ class IntelligentCruiseButtonManagement:
def update_readiness(self, CS: car.CarState, CC: car.CarControl) -> None:
update_manual_button_timers(CS, self.cruise_button_timers)
allowed_speed = CS.vEgo > ALLOWED_SPEED_THRESHOLD
ready = CS.cruiseState.enabled and allowed_speed and not CC.cruiseControl.override and not CC.cruiseControl.cancel and \
not CC.cruiseControl.resume
ready = CC.enabled and not CC.cruiseControl.override and not CC.cruiseControl.cancel and not CC.cruiseControl.resume
button_pressed = any(self.cruise_button_timers[k] > 0 for k in self.cruise_button_timers)
self.is_ready = ready and not button_pressed