Skip to content

Commit 612695b

Browse files
committed
Merge branch 'kegman-devel' of https://github.com/kegman/openpilot into kegman-devel
2 parents 6531ed2 + 88a3d43 commit 612695b

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

selfdrive/car/honda/carstate.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,6 @@ def update(self, cp, cp_cam):
278278

279279
self.steer_torque_driver = cp.vl["STEER_STATUS"]['STEER_TORQUE_SENSOR']
280280
self.steer_override = abs(self.steer_torque_driver) > STEER_THRESHOLD[self.CP.carFingerprint]
281-
282281
self.brake_switch = cp.vl["POWERTRAIN_DATA"]['BRAKE_SWITCH']
283282

284283
if self.CP.radarOffCan:
@@ -305,13 +304,20 @@ def update(self, cp, cp_cam):
305304
self.brake_pressed = cp.vl["POWERTRAIN_DATA"]['BRAKE_PRESSED'] or \
306305
(self.brake_switch and self.brake_switch_prev and \
307306
cp.ts["POWERTRAIN_DATA"]['BRAKE_SWITCH'] != self.brake_switch_ts)
307+
308308
self.brake_switch_prev = self.brake_switch
309309
self.brake_switch_ts = cp.ts["POWERTRAIN_DATA"]['BRAKE_SWITCH']
310310

311311
self.user_brake = cp.vl["VSA_STATUS"]['USER_BRAKE']
312312
self.pcm_acc_status = cp.vl["POWERTRAIN_DATA"]['ACC_STATUS']
313313
self.hud_lead = cp.vl["ACC_HUD"]['HUD_LEAD']
314314

315+
# gets rid of Pedal Grinding noise
316+
if self.user_brake > 0.05 or self.brake_pressed:
317+
self.brake_pressed = 1
318+
else:
319+
self.brake_pressed = 0
320+
315321
# when user presses distance button on steering wheel
316322
if self.cruise_setting == 3:
317323
if cp.vl["SCM_BUTTONS"]["CRUISE_SETTING"] == 0:

selfdrive/controls/lib/longcontrol.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
STOPPING_BRAKE_RATE = 0.2 # brake_travel/s while trying to stop
1414
STARTING_BRAKE_RATE = 0.8 # brake_travel/s while releasing on restart
15-
BRAKE_STOPPING_TARGET = 0.1 # apply at least this amount of brake to maintain the vehicle stationary
15+
BRAKE_STOPPING_TARGET = 0.25 # apply at least this amount of brake to maintain the vehicle stationary
1616

1717
_MAX_SPEED_ERROR_BP = [0., 30.] # speed breakpoints
1818
_MAX_SPEED_ERROR_V = [1.5, .8] # max positive v_pid error VS actual speed; this avoids controls windup due to slow pedal resp

0 commit comments

Comments
 (0)