From c9992a80c04053ba953ffc5a07c5f1c8e701174d Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sun, 21 Nov 2021 14:51:47 -0800 Subject: [PATCH] bosch_harness -> bosch --- python/__init__.py | 2 +- tests/safety/test_honda.py | 4 ++-- tests/safety_replay/helpers.py | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/python/__init__.py b/python/__init__.py index e491f310..87c811fe 100644 --- a/python/__init__.py +++ b/python/__init__.py @@ -193,7 +193,7 @@ class Panda(object): SAFETY_ALLOUTPUT = 17 SAFETY_GM_ASCM = 18 SAFETY_NOOUTPUT = 19 - SAFETY_HONDA_BOSCH_HARNESS = 20 + SAFETY_HONDA_BOSCH = 20 SAFETY_VOLKSWAGEN_PQ = 21 SAFETY_SUBARU_LEGACY = 22 SAFETY_HYUNDAI_LEGACY = 23 diff --git a/tests/safety/test_honda.py b/tests/safety/test_honda.py index 427105b2..a0799c49 100755 --- a/tests/safety/test_honda.py +++ b/tests/safety/test_honda.py @@ -354,7 +354,7 @@ class TestHondaBoschSafetyBase(TestHondaSafetyBase): class TestHondaBosch(TestHondaBoschSafetyBase): def setUp(self): super().setUp() - self.safety.set_safety_hooks(Panda.SAFETY_HONDA_BOSCH_HARNESS, 0) + self.safety.set_safety_hooks(Panda.SAFETY_HONDA_BOSCH, 0) self.safety.init_tests_honda() def test_spam_cancel_safety_check(self): @@ -378,7 +378,7 @@ class TestHondaBoschLongSafety(TestHondaBoschSafetyBase): def setUp(self): super().setUp() - self.safety.set_safety_hooks(Panda.SAFETY_HONDA_BOSCH_HARNESS, Panda.FLAG_HONDA_BOSCH_LONG) + self.safety.set_safety_hooks(Panda.SAFETY_HONDA_BOSCH, Panda.FLAG_HONDA_BOSCH_LONG) self.safety.init_tests_honda() def _send_gas_brake_msg(self, gas, accel): diff --git a/tests/safety_replay/helpers.py b/tests/safety_replay/helpers.py index 0be54300..02567459 100644 --- a/tests/safety_replay/helpers.py +++ b/tests/safety_replay/helpers.py @@ -10,7 +10,7 @@ def to_signed(d, bits): def is_steering_msg(mode, addr): ret = False - if mode in [Panda.SAFETY_HONDA_NIDEC, Panda.SAFETY_HONDA_BOSCH_HARNESS]: + if mode in [Panda.SAFETY_HONDA_NIDEC, Panda.SAFETY_HONDA_BOSCH]: ret = (addr == 0xE4) or (addr == 0x194) or (addr == 0x33D) elif mode == Panda.SAFETY_TOYOTA: ret = addr == 0x2E4 @@ -26,7 +26,7 @@ def is_steering_msg(mode, addr): def get_steer_torque(mode, to_send): ret = 0 - if mode in [Panda.SAFETY_HONDA_NIDEC, Panda.SAFETY_HONDA_BOSCH_HARNESS]: + if mode in [Panda.SAFETY_HONDA_NIDEC, Panda.SAFETY_HONDA_BOSCH]: ret = to_send.RDLR & 0xFFFF0000 elif mode == Panda.SAFETY_TOYOTA: ret = (to_send.RDLR & 0xFF00) | ((to_send.RDLR >> 16) & 0xFF) @@ -44,7 +44,7 @@ def get_steer_torque(mode, to_send): return ret def set_desired_torque_last(safety, mode, torque): - if mode in [Panda.SAFETY_HONDA_NIDEC, Panda.SAFETY_HONDA_BOSCH_HARNESS]: + if mode in [Panda.SAFETY_HONDA_NIDEC, Panda.SAFETY_HONDA_BOSCH]: pass # honda safety mode doesn't enforce a rate on steering msgs elif mode == Panda.SAFETY_TOYOTA: safety.set_toyota_desired_torque_last(torque)