paramsd: remove usages of llk nested structures (#33317)

* Remove usages of llk nested structures

* Rename to debugFitlerState

* Semicolon

* Initial parameters debugFilterState
pull/33306/head
Kacper Rączy 8 months ago committed by GitHub
parent 4baf6c1be9
commit 51fae363e4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 8
      cereal/log.capnp
  2. 9
      selfdrive/locationd/paramsd.py

@ -2082,9 +2082,15 @@ struct LiveParametersData {
stiffnessFactorStd @12 :Float32; stiffnessFactorStd @12 :Float32;
steerRatioStd @13 :Float32; steerRatioStd @13 :Float32;
roll @14 :Float32; roll @14 :Float32;
filterState @15 :LiveLocationKalman.Measurement; debugFilterState @16 :FilterState;
yawRateDEPRECATED @7 :Float32; yawRateDEPRECATED @7 :Float32;
filterStateDEPRECATED @15 :LiveLocationKalman.Measurement;
struct FilterState {
value @0 : List(Float64);
std @1 : List(Float64);
}
} }
struct LiveTorqueParametersData { struct LiveTorqueParametersData {

@ -177,7 +177,7 @@ def main():
pInitial = None pInitial = None
if DEBUG: if DEBUG:
pInitial = np.array(params['filterState']['std']) if 'filterState' in params else None pInitial = np.array(params['debugFilterState']['std']) if 'debugFilterState' in params else None
learner = ParamsLearner(CP, params['steerRatio'], params['stiffnessFactor'], math.radians(params['angleOffsetAverageDeg']), pInitial) learner = ParamsLearner(CP, params['steerRatio'], params['stiffnessFactor'], math.radians(params['angleOffsetAverageDeg']), pInitial)
angle_offset_average = params['angleOffsetAverageDeg'] angle_offset_average = params['angleOffsetAverageDeg']
@ -242,10 +242,9 @@ def main():
liveParameters.angleOffsetAverageStd = float(P[States.ANGLE_OFFSET].item()) liveParameters.angleOffsetAverageStd = float(P[States.ANGLE_OFFSET].item())
liveParameters.angleOffsetFastStd = float(P[States.ANGLE_OFFSET_FAST].item()) liveParameters.angleOffsetFastStd = float(P[States.ANGLE_OFFSET_FAST].item())
if DEBUG: if DEBUG:
liveParameters.filterState = log.LiveLocationKalman.Measurement.new_message() liveParameters.debugFilterState = log.LiveParametersData.FilterState.new_message()
liveParameters.filterState.value = x.tolist() liveParameters.debugFilterState.value = x.tolist()
liveParameters.filterState.std = P.tolist() liveParameters.debugFilterState.std = P.tolist()
liveParameters.filterState.valid = True
msg.valid = sm.all_checks() msg.valid = sm.all_checks()

Loading…
Cancel
Save