Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Subaru: remove A/C fw version #24224

Merged
merged 4 commits into from
Apr 25, 2022
Merged

Subaru: remove A/C fw version #24224

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bdc8f7c
Subaru: remove A/C fw version
martinl Apr 16, 2022
b0493c8
add test to ensure the ecu isn't added again
sshane Apr 19, 2022
37f851a
check CP.carName
sshane Apr 25, 2022
6bf8202
clean up
sshane Apr 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions selfdrive/car/subaru/values.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,6 @@ class SubaruCarInfo(CarInfo):
b'\x00\x00c\xf4\x00\x00\x00\x00',
b'\x00\x00d\xdc\x00\x00\x00\x00',
],
(Ecu.fwdCamera, 0x7c4, None): [
b'\xf1\x00\xac\x02\x00',
],
(Ecu.engine, 0x7e0, None): [
b'\xaa\x61\x66\x73\x07',
b'\xbeacr\a',
Expand Down
14 changes: 14 additions & 0 deletions selfdrive/car/tests/test_fw_fingerprint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

ECU_NAME = {v: k for k, v in Ecu.schema.enumerants.items()}


class TestFwFingerprint(unittest.TestCase):
def assertFingerprints(self, candidates, expected):
candidates = list(candidates)
Expand Down Expand Up @@ -42,5 +43,18 @@ def test_no_duplicate_fw_versions(self):

self.assertTrue(passed, "Duplicate FW versions found")

def test_blacklisted_ecus(self):
passed = True
blacklisted_addrs = (0x7c4, 0x7d0) # includes A/C ecu and an unknown ecu
for car_model, ecus in FW_VERSIONS.items():
if car_model.startswith("SUBARU"):
sshane marked this conversation as resolved.
Show resolved Hide resolved
for ecu in ecus.keys():
if ecu[1] in blacklisted_addrs:
print(f'{car_model}: Blacklisted ecu: ({ECU_NAME[ecu[0]]}, {hex(ecu[1])})')
passed = False

self.assertTrue(passed, "Blacklisted FW versions found ")


if __name__ == "__main__":
unittest.main()