diff --git a/selfdrive/car/ford/tests/ford_fuzzy_fingerprint.ipynb b/selfdrive/car/ford/tests/ford_fuzzy_fingerprint.ipynb
index 46ae67825d..4ef7a752da 100644
--- a/selfdrive/car/ford/tests/ford_fuzzy_fingerprint.ipynb
+++ b/selfdrive/car/ford/tests/ford_fuzzy_fingerprint.ipynb
@@ -30,7 +30,7 @@
{
"data": {
"application/vnd.jupyter.widget-view+json": {
- "model_id": "1f0a7e43c6374bafa78941befed85958",
+ "model_id": "9ddb0675cd4a4f46a23b608252324ed4",
"version_major": 2,
"version_minor": 0
},
@@ -86,23 +86,7 @@
" engine b'PZ6A-14C204-JE'\n",
" eps b'NZ6C-14D003-AL'\n",
" fwdCamera b'NZ6T-14F397-AC'\n",
- "vin: 3FTTW8E3XPRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n",
- " source: fw\n",
- " fuzzy: True\n",
- " car_fw:\n",
- " abs b'PZ6C-2D053-ED'\n",
- " engine b'PZ6A-14C204-JE'\n",
- " eps b'NZ6C-14D003-AL'\n",
- " fwdCamera b'NZ6T-14F397-AC'\n",
"Skipping vin: 00000000000XXXXXX platform: FORD F-150 14TH GEN, no car fw\n",
- "vin: 3FTTW8E3XPRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n",
- " source: fw\n",
- " fuzzy: True\n",
- " car_fw:\n",
- " abs b'PZ6C-2D053-ED'\n",
- " engine b'PZ6A-14C204-JE'\n",
- " eps b'NZ6C-14D003-AL'\n",
- " fwdCamera b'NZ6T-14F397-AC'\n",
"Skipping vin: 00000000000XXXXXX platform: FORD F-150 14TH GEN, no car fw\n",
"vin: 3FTTW8E3XPRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n",
" source: fw\n",
@@ -145,38 +129,6 @@
" engine b'PZ6A-14C204-JE'\n",
" eps b'NZ6C-14D003-AL'\n",
" fwdCamera b'NZ6T-14F397-AC'\n",
- "Skipping vin: 00000000000XXXXXX platform: FORD F-150 14TH GEN, no car fw\n",
- "vin: 3FTTW8E3XPRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n",
- " source: fw\n",
- " fuzzy: True\n",
- " car_fw:\n",
- " abs b'PZ6C-2D053-ED'\n",
- " engine b'PZ6A-14C204-JE'\n",
- " eps b'NZ6C-14D003-AL'\n",
- " fwdCamera b'NZ6T-14F397-AC'\n",
- "vin: 3FTTW8E34PRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n",
- " source: fw\n",
- " fuzzy: True\n",
- " car_fw:\n",
- " abs b'PZ6C-2D053-ED'\n",
- " engine b'PZ6A-14C204-JE'\n",
- " eps b'NZ6C-14D003-AL'\n",
- "vin: 3FTTW8E3XPRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n",
- " source: fw\n",
- " fuzzy: True\n",
- " car_fw:\n",
- " abs b'PZ6C-2D053-ED'\n",
- " engine b'PZ6A-14C204-JE'\n",
- " eps b'NZ6C-14D003-AL'\n",
- " fwdCamera b'NZ6T-14F397-AC'\n",
- "vin: 3FTTW8E3XPRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n",
- " source: fw\n",
- " fuzzy: True\n",
- " car_fw:\n",
- " abs b'PZ6C-2D053-ED'\n",
- " engine b'PZ6A-14C204-JE'\n",
- " eps b'NZ6C-14D003-AL'\n",
- " fwdCamera b'NZ6T-14F397-AC'\n",
"vin: 3FTTW8E3XPRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n",
" source: fw\n",
" fuzzy: True\n",
@@ -186,6 +138,7 @@
" eps b'NZ6C-14D003-AL'\n",
" fwdCamera b'NZ6T-14F397-AC'\n",
"Skipping vin: 00000000000XXXXXX platform: FORD F-150 14TH GEN, no car fw\n",
+ "Skipping vin: 00000000000XXXXXX platform: FORD F-150 14TH GEN, no car fw\n",
"vin: 3FTTW8E3XPRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n",
" source: fw\n",
" fuzzy: True\n",
@@ -210,23 +163,7 @@
" engine b'PZ6A-14C204-JE'\n",
" eps b'NZ6C-14D003-AL'\n",
" fwdCamera b'NZ6T-14F397-AC'\n",
- "vin: 3FTTW8E3XPRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n",
- " source: fw\n",
- " fuzzy: True\n",
- " car_fw:\n",
- " abs b'PZ6C-2D053-ED'\n",
- " engine b'PZ6A-14C204-JE'\n",
- " eps b'NZ6C-14D003-AL'\n",
- " fwdCamera b'NZ6T-14F397-AC'\n",
- "vin: 3FTTW8E3XPRXXXXXX expected: FORD MAVERICK 1ST GEN fuzzy: mock correct: False\n",
- " source: fw\n",
- " fuzzy: True\n",
- " car_fw:\n",
- " abs b'PZ6C-2D053-ED'\n",
- " engine b'PZ6A-14C204-JE'\n",
- " eps b'NZ6C-14D003-AL'\n",
- " fwdCamera b'NZ6T-14F397-AC'\n",
- "Success rate: 92.58%\n"
+ "Success rate: 95.70%\n"
]
},
{
@@ -267,61 +204,61 @@
" \n",
" | 1 | \n",
" fw | \n",
- " FORD MAVERICK 1ST GEN | \n",
- " mock | \n",
- " False | \n",
- "
\n",
- " \n",
- " | 4 | \n",
- " fw | \n",
" FORD ESCAPE 4TH GEN | \n",
" FORD ESCAPE 4TH GEN | \n",
" True | \n",
"
\n",
" \n",
- " | 6 | \n",
- " fw | \n",
- " FORD FOCUS 4TH GEN | \n",
- " FORD FOCUS 4TH GEN | \n",
- " True | \n",
- "
\n",
- " \n",
- " | 7 | \n",
+ " 5 | \n",
" fixed | \n",
" FORD EXPLORER 6TH GEN | \n",
" FORD EXPLORER 6TH GEN | \n",
" True | \n",
"
\n",
" \n",
- " | 10 | \n",
+ " 8 | \n",
" fw | \n",
" FORD EXPLORER 6TH GEN | \n",
" FORD EXPLORER 6TH GEN | \n",
" True | \n",
"
\n",
" \n",
- " | 19 | \n",
+ " 11 | \n",
" fw | \n",
" FORD MAVERICK 1ST GEN | \n",
" FORD MAVERICK 1ST GEN | \n",
" True | \n",
"
\n",
" \n",
- " | 41 | \n",
+ " 12 | \n",
" fw | \n",
- " FORD F-150 LIGHTNING 1ST GEN | \n",
- " FORD F-150 LIGHTNING 1ST GEN | \n",
+ " FORD MAVERICK 1ST GEN | \n",
+ " mock | \n",
+ " False | \n",
+ "
\n",
+ " \n",
+ " | 17 | \n",
+ " fw | \n",
+ " FORD FOCUS 4TH GEN | \n",
+ " FORD FOCUS 4TH GEN | \n",
" True | \n",
"
\n",
" \n",
- " | 52 | \n",
+ " 103 | \n",
" fixed | \n",
" FORD MAVERICK 1ST GEN | \n",
" FORD MAVERICK 1ST GEN | \n",
" True | \n",
"
\n",
" \n",
- " | 113 | \n",
+ " 119 | \n",
+ " fw | \n",
+ " FORD F-150 LIGHTNING 1ST GEN | \n",
+ " FORD F-150 LIGHTNING 1ST GEN | \n",
+ " True | \n",
+ "
\n",
+ " \n",
+ " | 149 | \n",
" fw | \n",
" FORD MUSTANG MACH-E 1ST GEN | \n",
" FORD MUSTANG MACH-E 1ST GEN | \n",
@@ -334,27 +271,27 @@
"text/plain": [
" source expected fuzzy \\\n",
"0 fw FORD BRONCO SPORT 1ST GEN FORD BRONCO SPORT 1ST GEN \n",
- "1 fw FORD MAVERICK 1ST GEN mock \n",
- "4 fw FORD ESCAPE 4TH GEN FORD ESCAPE 4TH GEN \n",
- "6 fw FORD FOCUS 4TH GEN FORD FOCUS 4TH GEN \n",
- "7 fixed FORD EXPLORER 6TH GEN FORD EXPLORER 6TH GEN \n",
- "10 fw FORD EXPLORER 6TH GEN FORD EXPLORER 6TH GEN \n",
- "19 fw FORD MAVERICK 1ST GEN FORD MAVERICK 1ST GEN \n",
- "41 fw FORD F-150 LIGHTNING 1ST GEN FORD F-150 LIGHTNING 1ST GEN \n",
- "52 fixed FORD MAVERICK 1ST GEN FORD MAVERICK 1ST GEN \n",
- "113 fw FORD MUSTANG MACH-E 1ST GEN FORD MUSTANG MACH-E 1ST GEN \n",
+ "1 fw FORD ESCAPE 4TH GEN FORD ESCAPE 4TH GEN \n",
+ "5 fixed FORD EXPLORER 6TH GEN FORD EXPLORER 6TH GEN \n",
+ "8 fw FORD EXPLORER 6TH GEN FORD EXPLORER 6TH GEN \n",
+ "11 fw FORD MAVERICK 1ST GEN FORD MAVERICK 1ST GEN \n",
+ "12 fw FORD MAVERICK 1ST GEN mock \n",
+ "17 fw FORD FOCUS 4TH GEN FORD FOCUS 4TH GEN \n",
+ "103 fixed FORD MAVERICK 1ST GEN FORD MAVERICK 1ST GEN \n",
+ "119 fw FORD F-150 LIGHTNING 1ST GEN FORD F-150 LIGHTNING 1ST GEN \n",
+ "149 fw FORD MUSTANG MACH-E 1ST GEN FORD MUSTANG MACH-E 1ST GEN \n",
"\n",
" correct \n",
"0 True \n",
- "1 False \n",
- "4 True \n",
- "6 True \n",
- "7 True \n",
- "10 True \n",
- "19 True \n",
- "41 True \n",
- "52 True \n",
- "113 True "
+ "1 True \n",
+ "5 True \n",
+ "8 True \n",
+ "11 True \n",
+ "12 False \n",
+ "17 True \n",
+ "103 True \n",
+ "119 True \n",
+ "149 True "
]
},
"execution_count": 3,
diff --git a/selfdrive/car/ford/tests/test_match.ipynb b/selfdrive/car/ford/tests/test_match.ipynb
deleted file mode 100644
index 598f61b86b..0000000000
--- a/selfdrive/car/ford/tests/test_match.ipynb
+++ /dev/null
@@ -1,90 +0,0 @@
-{
- "cells": [
- {
- "cell_type": "code",
- "execution_count": 1,
- "metadata": {},
- "outputs": [
- {
- "name": "stderr",
- "output_type": "stream",
- "text": [
- "kj/filesystem-disk-unix.c++:1703: warning: PWD environment variable doesn't match current directory; pwd = /mnt/c/Users/camer/AppData/Local/Programs/Microsoft VS Code\n"
- ]
- },
- {
- "data": {
- "text/plain": [
- "(False, {})"
- ]
- },
- "execution_count": 1,
- "metadata": {},
- "output_type": "execute_result"
- }
- ],
- "source": [
- "from cereal import car\n",
- "from openpilot.selfdrive.car.fw_versions import match_fw_to_car\n",
- "\n",
- "Ecu = car.CarParams.Ecu\n",
- "\n",
- "\n",
- "def dict_to_cereal(d):\n",
- " car_fw = []\n",
- " for (ecu, addr), fws in d.items():\n",
- " for fw in fws:\n",
- " f = car.CarParams.CarFw.new_message()\n",
- " f.ecu = ecu\n",
- " f.fwVersion = fw\n",
- " f.address = addr\n",
- " f.brand = 'ford'\n",
- " f.logging = False\n",
- " car_fw.append(f)\n",
- " return car_fw\n",
- "\n",
- "\n",
- "fw_dict = {\n",
- " # (Ecu.debug, 2000): {b'1U5T-14G374-EM\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'},\n",
- " # (Ecu.engine, 2016): {b'P1PA-14C204-AE\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'},\n",
- " # (Ecu.shiftByWire, 1842): {b'PZ1P-14G395-AC\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'},\n",
- " (Ecu.eps, 1840): {b'LX6C-14D003-AL\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'},\n",
- " (Ecu.abs, 1888): {b'LX6C-2D053-RF\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'},\n",
- " (Ecu.fwdCamera, 1798): {b'M1PT-14F397-AD\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'},\n",
- " (Ecu.fwdRadar, 1892): {b'LB5T-14D049-AB\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'},\n",
- "}\n",
- "\n",
- "\n",
- "match_fw_to_car(dict_to_cereal(fw_dict))"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": []
- }
- ],
- "metadata": {
- "kernelspec": {
- "display_name": ".venv",
- "language": "python",
- "name": "python3"
- },
- "language_info": {
- "codemirror_mode": {
- "name": "ipython",
- "version": 3
- },
- "file_extension": ".py",
- "mimetype": "text/x-python",
- "name": "python",
- "nbconvert_exporter": "python",
- "pygments_lexer": "ipython3",
- "version": "3.11.4"
- }
- },
- "nbformat": 4,
- "nbformat_minor": 2
-}