correct some spelling errors (#628)

old-commit-hash: d8b1e99d77
commatwo_master
marcbou 6 years ago committed by rbiasini
parent 7df6dd4ccb
commit 0a4a8f203b
  1. 8
      selfdrive/car/honda/carcontroller.py
  2. 4
      selfdrive/controls/lib/driver_monitor.py

@ -12,9 +12,9 @@ def actuator_hystereses(brake, braking, brake_steady, v_ego, car_fingerprint):
# hyst params # hyst params
brake_hyst_on = 0.02 # to activate brakes exceed this value brake_hyst_on = 0.02 # to activate brakes exceed this value
brake_hyst_off = 0.005 # to deactivate brakes below this value brake_hyst_off = 0.005 # to deactivate brakes below this value
brake_hyst_gap = 0.01 # don't change brake command for small ocilalitons within this value brake_hyst_gap = 0.01 # don't change brake command for small oscillations within this value
#*** histeresis logic to avoid brake blinking. go above 0.1 to trigger #*** hysteresis logic to avoid brake blinking. go above 0.1 to trigger
if (brake < brake_hyst_on and not braking) or brake < brake_hyst_off: if (brake < brake_hyst_on and not braking) or brake < brake_hyst_off:
brake = 0. brake = 0.
braking = brake > 0. braking = brake > 0.
@ -34,7 +34,7 @@ def actuator_hystereses(brake, braking, brake_steady, v_ego, car_fingerprint):
return brake, braking, brake_steady return brake, braking, brake_steady
def brake_pump_hysteresys(apply_brake, apply_brake_last, last_pump_ts): def brake_pump_hysteresis(apply_brake, apply_brake_last, last_pump_ts):
ts = sec_since_boot() ts = sec_since_boot()
pump_on = False pump_on = False
@ -174,7 +174,7 @@ class CarController(object):
# Send gas and brake commands. # Send gas and brake commands.
if (frame % 2) == 0: if (frame % 2) == 0:
idx = frame // 2 idx = frame // 2
pump_on, self.last_pump_ts = brake_pump_hysteresys(apply_brake, self.apply_brake_last, self.last_pump_ts) pump_on, self.last_pump_ts = brake_pump_hysteresis(apply_brake, self.apply_brake_last, self.last_pump_ts)
can_sends.append(hondacan.create_brake_command(self.packer, apply_brake, pump_on, can_sends.append(hondacan.create_brake_command(self.packer, apply_brake, pump_on,
pcm_override, pcm_cancel_cmd, hud.chime, hud.fcw, idx)) pcm_override, pcm_cancel_cmd, hud.chime, hud.fcw, idx))
self.apply_brake_last = apply_brake self.apply_brake_last = apply_brake

@ -51,7 +51,7 @@ class _DriverPose():
self.pitch_offset = 0. self.pitch_offset = 0.
def _monitor_hysteresys(variance_level, monitor_valid_prev): def _monitor_hysteresis(variance_level, monitor_valid_prev):
var_thr = 0.63 if monitor_valid_prev else 0.37 var_thr = 0.63 if monitor_valid_prev else 0.37
return variance_level < var_thr return variance_level < var_thr
@ -124,7 +124,7 @@ class DriverStatus():
self.monitor_param_on = params.get("IsDriverMonitoringEnabled") == "1" self.monitor_param_on = params.get("IsDriverMonitoringEnabled") == "1"
self.ts_last_check = ts self.ts_last_check = ts
self.monitor_valid = _monitor_hysteresys(self.variance_filter.x, monitor_valid_prev) self.monitor_valid = _monitor_hysteresis(self.variance_filter.x, monitor_valid_prev)
self.monitor_on = self.monitor_valid and self.monitor_param_on self.monitor_on = self.monitor_valid and self.monitor_param_on
if monitor_param_on_prev != self.monitor_param_on: if monitor_param_on_prev != self.monitor_param_on:
self._reset_filters() self._reset_filters()

Loading…
Cancel
Save