mawei
/
panda
mirror of https://github.com/commaai/panda.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

safety tests: rename gas interceptor test (#1774) 

* more appropriate name for gas interceptor

* safety
This commit is contained in:
Shane Smiskol 2023-12-12 22:15:36 -08:00 committed by GitHub
parent a88fe8c883
commit 294992ac2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/safety/safety_toyota.h
View File

@ -46,7 +46,7 @@ const int TOYOTA_GAS_INTERCEPTOR_THRSLD = 805;
const CanMsg TOYOTA_TX_MSGS[] = {{0x283, 0, 7}, {0x2E6, 0, 8}, {0x2E7, 0, 8}, {0x33E, 0, 7}, {0x344, 0, 8}, {0x365, 0, 7}, {0x366, 0, 7}, {0x4CB, 0, 8}, // DSU bus 0
{0x128, 1, 6}, {0x141, 1, 4}, {0x160, 1, 8}, {0x161, 1, 7}, {0x470, 1, 4}, // DSU bus 1
{0x2E4, 0, 5}, {0x191, 0, 8}, {0x411, 0, 8}, {0x412, 0, 8}, {0x343, 0, 8}, {0x1D2, 0, 8}, // LKAS + ACC
{0x200, 0, 6}}; // interceptor
{0x200, 0, 6}}; // gas interceptor
#define TOYOTA_COMMON_RX_CHECKS(lta) \
{.msg = {{ 0xaa, 0, 8, .check_checksum = false, .frequency = 83U}, { 0 }, { 0 }}}, \

4
tests/safety/common.py
View File

@ -118,13 +118,13 @@ class PandaSafetyTestBase(unittest.TestCase):
self.assertEqual(meas_max_func(), 0)
class InterceptorSafetyTest(PandaSafetyTestBase):
class GasInterceptorSafetyTest(PandaSafetyTestBase):
INTERCEPTOR_THRESHOLD = 0
@classmethod
def setUpClass(cls):
if cls.__name__ == "InterceptorSafetyTest":
if cls.__name__ == "GasInterceptorSafetyTest":
cls.safety = None
raise unittest.SkipTest

8
tests/safety/test_honda.py
View File

@ -23,8 +23,8 @@ HONDA_BOSCH = 1
# * Nidec
# * normal
# * alt SCM messages
# * interceptor
# * interceptor with alt SCM messages
# * gas interceptor
# * gas interceptor with alt SCM messages
# * Bosch
# * Bosch with Longitudinal Support
# * Bosch Radarless
@ -352,7 +352,7 @@ class TestHondaNidecSafety(HondaPcmEnableBase, TestHondaNidecSafetyBase):
pass
class TestHondaNidecInterceptorSafety(TestHondaNidecSafety, common.InterceptorSafetyTest):
class TestHondaNidecGasInterceptorSafety(TestHondaNidecSafety, common.GasInterceptorSafetyTest):
"""
Covers the Honda Nidec safety mode with a gas interceptor
"""
@ -380,7 +380,7 @@ class TestHondaNidecAltSafety(TestHondaNidecSafety):
return self.packer.make_can_msg_panda("SCM_BUTTONS", bus, values)
class TestHondaNidecAltInterceptorSafety(TestHondaNidecSafety, common.InterceptorSafetyTest):
class TestHondaNidecAltGasInterceptorSafety(TestHondaNidecSafety, common.GasInterceptorSafetyTest):
"""
Covers the Honda Nidec safety mode with alt SCM messages and gas interceptor
"""

4
tests/safety/test_toyota.py
View File

@ -10,13 +10,13 @@ import panda.tests.safety.common as common
from panda.tests.safety.common import CANPackerPanda
class TestToyotaSafetyBase(common.PandaCarSafetyTest, common.InterceptorSafetyTest,
class TestToyotaSafetyBase(common.PandaCarSafetyTest, common.GasInterceptorSafetyTest,
common.LongitudinalAccelSafetyTest):
TX_MSGS = [[0x283, 0], [0x2E6, 0], [0x2E7, 0], [0x33E, 0], [0x344, 0], [0x365, 0], [0x366, 0], [0x4CB, 0], # DSU bus 0
[0x128, 1], [0x141, 1], [0x160, 1], [0x161, 1], [0x470, 1], # DSU bus 1
[0x2E4, 0], [0x191, 0], [0x411, 0], [0x412, 0], [0x343, 0], [0x1D2, 0], # LKAS + ACC
[0x200, 0], [0x750, 0]] # interceptor + blindspot monitor
[0x200, 0], [0x750, 0]] # gas interceptor + blindspot monitor
STANDSTILL_THRESHOLD = 0 # kph
RELAY_MALFUNCTION_ADDRS = {0: (0x2E4,)}
FWD_BLACKLISTED_ADDRS = {2: [0x2E4, 0x412, 0x191, 0x343]}