Consider regen properly in test_models (#25409)

* Consider regen properly in test_models

* bump panda

* bump panda

* can use the more interesting segment now

* rm
old-commit-hash: 4d351427c5
taco
Shane Smiskol 3 years ago committed by GitHub
parent df1668b35f
commit 5b84ad22b5
  1. 2
      panda
  2. 2
      selfdrive/car/tests/routes.py
  3. 3
      selfdrive/car/tests/test_models.py

@ -1 +1 @@
Subproject commit 15eda6a7c9cf4b0c7b5a7bbde25fcab3ff0a98fc
Subproject commit 788e0b5ac944858fd9b3d2ea98e4049df0adb51b

@ -48,7 +48,7 @@ routes = [
CarTestRoute("aa20e335f61ba898|2019-02-05--16-59-04", GM.BUICK_REGAL),
CarTestRoute("46460f0da08e621e|2021-10-26--07-21-46", GM.ESCALADE_ESV),
CarTestRoute("c950e28c26b5b168|2018-05-30--22-03-41", GM.VOLT),
CarTestRoute("f08912a233c1584f|2022-08-11--18-02-41", GM.BOLT_EUV),
CarTestRoute("f08912a233c1584f|2022-08-11--18-02-41", GM.BOLT_EUV, segment=1),
CarTestRoute("38aa7da107d5d252|2022-08-15--16-01-12", GM.SILVERADO),
CarTestRoute("0e7a2ba168465df5|2020-10-18--14-14-22", HONDA.ACURA_RDX_3G),

@ -243,7 +243,8 @@ class TestCarModelBase(unittest.TestCase):
if CS.brakePressed and not self.safety.get_brake_pressed_prev():
if self.CP.carFingerprint in (HONDA.PILOT, HONDA.PASSPORT, HONDA.RIDGELINE) and CS.brake > 0.05:
brake_pressed = False
checks['brakePressed'] += brake_pressed != self.safety.get_brake_pressed_prev()
safety_brake_pressed = self.safety.get_brake_pressed_prev() or self.safety.get_regen_braking_prev()
checks['brakePressed'] += brake_pressed != safety_brake_pressed
if self.CP.pcmCruise:
# On most pcmCruise cars, openpilot's state is always tied to the PCM's cruise state.

Loading…
Cancel
Save