Remove unused offsets

selfdrive/car/fw_versions.py

@@ -77,15 +77,7 @@ NISSAN_DIAGNOSTIC_RESPONSE = b'\x50\xc0'
 NISSAN_VERSION_REQUEST = b'\x21\x83'
 NISSAN_VERSION_RESPONSE = b'\x61\x83'
 
-#NISSAN_VERSION_REQUEST = b'\x21\x84'
-#NISSAN_VERSION_RESPONSE = b'\x61\x84'
-
-NISSAN_RX_OFFSET1 = 0x1
-NISSAN_RX_OFFSET2 = 0x3
-NISSAN_RX_OFFSET3 = 0x8
-NISSAN_RX_OFFSET4 = 0x20
-NISSAN_RX_OFFSET5 = 0x22
-NISSAN_RX_OFFSET6 = 0x37
+NISSAN_RX_OFFSET = 0x20
 
 # brand, request, response, response offset
 REQUESTS = [
@@ -153,47 +145,8 @@ REQUESTS = [
     "nissan",
     [NISSAN_DIAGNOSTIC_REQUEST, NISSAN_VERSION_REQUEST],
     [NISSAN_DIAGNOSTIC_RESPONSE, NISSAN_VERSION_RESPONSE],
-    NISSAN_RX_OFFSET1,
-  ),
-  (
-    "nissan",
-    [NISSAN_DIAGNOSTIC_REQUEST, NISSAN_VERSION_REQUEST],
-    [NISSAN_DIAGNOSTIC_RESPONSE, NISSAN_VERSION_RESPONSE],
-    NISSAN_RX_OFFSET2,
-  ),
-  (
-    "nissan",
-    [NISSAN_DIAGNOSTIC_REQUEST, NISSAN_VERSION_REQUEST],
-    [NISSAN_DIAGNOSTIC_RESPONSE, NISSAN_VERSION_RESPONSE],
-    NISSAN_RX_OFFSET3,
-  ),
-  (
-    "nissan",
-    [NISSAN_DIAGNOSTIC_REQUEST, NISSAN_VERSION_REQUEST],
-    [NISSAN_DIAGNOSTIC_RESPONSE, NISSAN_VERSION_RESPONSE],
-    NISSAN_RX_OFFSET4,
+    NISSAN_RX_OFFSET,
   ),
-  (
-    "nissan",
-    [NISSAN_DIAGNOSTIC_REQUEST, NISSAN_VERSION_REQUEST],
-    [NISSAN_DIAGNOSTIC_RESPONSE, NISSAN_VERSION_RESPONSE],
-    NISSAN_RX_OFFSET5,
-  ),
-  (
-    "nissan",
-    [NISSAN_DIAGNOSTIC_REQUEST, NISSAN_VERSION_REQUEST],
-    [NISSAN_DIAGNOSTIC_RESPONSE, NISSAN_VERSION_RESPONSE],
-    NISSAN_RX_OFFSET6,
-  ),
-  # RX offset 0x20 without diagnostic request
-  (
-    "nissan",
-    [NISSAN_VERSION_REQUEST],
-    [NISSAN_VERSION_RESPONSE],
-    NISSAN_RX_OFFSET4,
-  ),
-
-
 ]