|
|
@ -44,7 +44,7 @@ class CarState(CarStateBase): |
|
|
|
|
|
|
|
|
|
|
|
ret.vEgoRaw = float(np.mean([ret.wheelSpeeds.fl, ret.wheelSpeeds.fr, ret.wheelSpeeds.rl, ret.wheelSpeeds.rr])) |
|
|
|
ret.vEgoRaw = float(np.mean([ret.wheelSpeeds.fl, ret.wheelSpeeds.fr, ret.wheelSpeeds.rl, ret.wheelSpeeds.rr])) |
|
|
|
ret.vEgo, ret.aEgo = self.update_speed_kf(ret.vEgoRaw) |
|
|
|
ret.vEgo, ret.aEgo = self.update_speed_kf(ret.vEgoRaw) |
|
|
|
ret.standstill = ret.vEgo < 0.1 |
|
|
|
ret.standstill = ret.vEgoRaw == 0 |
|
|
|
|
|
|
|
|
|
|
|
# Update steering angle, rate, yaw rate, and driver input torque. VW send |
|
|
|
# Update steering angle, rate, yaw rate, and driver input torque. VW send |
|
|
|
# the sign/direction in a separate signal so they must be recombined. |
|
|
|
# the sign/direction in a separate signal so they must be recombined. |
|
|
@ -160,7 +160,7 @@ class CarState(CarStateBase): |
|
|
|
# vEgo obtained from Bremse_1 vehicle speed rather than Bremse_3 wheel speeds because Bremse_3 isn't present on NSF |
|
|
|
# vEgo obtained from Bremse_1 vehicle speed rather than Bremse_3 wheel speeds because Bremse_3 isn't present on NSF |
|
|
|
ret.vEgoRaw = pt_cp.vl["Bremse_1"]["Geschwindigkeit_neu__Bremse_1_"] * CV.KPH_TO_MS |
|
|
|
ret.vEgoRaw = pt_cp.vl["Bremse_1"]["Geschwindigkeit_neu__Bremse_1_"] * CV.KPH_TO_MS |
|
|
|
ret.vEgo, ret.aEgo = self.update_speed_kf(ret.vEgoRaw) |
|
|
|
ret.vEgo, ret.aEgo = self.update_speed_kf(ret.vEgoRaw) |
|
|
|
ret.standstill = ret.vEgo < 0.1 |
|
|
|
ret.standstill = ret.vEgoRaw == 0 |
|
|
|
|
|
|
|
|
|
|
|
# Update steering angle, rate, yaw rate, and driver input torque. VW send |
|
|
|
# Update steering angle, rate, yaw rate, and driver input torque. VW send |
|
|
|
# the sign/direction in a separate signal so they must be recombined. |
|
|
|
# the sign/direction in a separate signal so they must be recombined. |
|
|
|