Reset liveParameters if starting with invalid values (#2360)

* reset params if starting with invalid values

* newline

* No need to check stiffness
pull/2362/head
Willem Melching 5 years ago committed by GitHub
parent d28f488ea5
commit 63e23e9cd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      selfdrive/locationd/paramsd.py

@ -77,6 +77,8 @@ def main(sm=None, pm=None):
CP = car.CarParams.from_bytes(params_reader.get("CarParams", block=True))
cloudlog.info("paramsd got CarParams")
min_sr, max_sr = 0.5 * CP.steerRatio, 2.0 * CP.steerRatio
params = params_reader.get("LiveParameters")
# Check if car model matches
@ -86,6 +88,12 @@ def main(sm=None, pm=None):
cloudlog.info("Parameter learner found parameters for wrong car.")
params = None
if (params is not None) and not all((
abs(params['angleOffsetAverage']) < 10.0,
min_sr <= params['steerRatio'] <= max_sr)):
cloudlog.info(f"Invalid starting values found {params}")
params = None
if params is None:
params = {
'carFingerprint': CP.carFingerprint,
@ -100,7 +108,6 @@ def main(sm=None, pm=None):
params['stiffnessFactor'] = 1.0
learner = ParamsLearner(CP, params['steerRatio'], params['stiffnessFactor'], math.radians(params['angleOffsetAverage']))
min_sr, max_sr = 0.5 * CP.steerRatio, 2.0 * CP.steerRatio
while True:
sm.update()

Loading…
Cancel
Save