From 808d6f1562e9a6cb57ea365d184b74d51f6da017 Mon Sep 17 00:00:00 2001 From: robin-reckmann Date: Fri, 5 Nov 2021 12:43:06 +0900 Subject: [PATCH] Remove NISSAN_KWP_DIAGNOSTIC_REQUEST and cleanup --- selfdrive/car/fw_versions.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/selfdrive/car/fw_versions.py b/selfdrive/car/fw_versions.py index 795145d9e0..8263a279df 100755 --- a/selfdrive/car/fw_versions.py +++ b/selfdrive/car/fw_versions.py @@ -71,11 +71,8 @@ MAZDA_VERSION_REQUEST = bytes([uds.SERVICE_TYPE.READ_DATA_BY_IDENTIFIER]) + \ MAZDA_VERSION_RESPONSE = bytes([uds.SERVICE_TYPE.READ_DATA_BY_IDENTIFIER + 0x40]) + \ p16(uds.DATA_IDENTIFIER_TYPE.VEHICLE_MANUFACTURER_ECU_SOFTWARE_NUMBER) -NISSAN_KWP_DIAGNOSTIC_REQUEST = bytes([uds.SERVICE_TYPE.DIAGNOSTIC_SESSION_CONTROL, 0xc0]) -NISSAN_KWP_DIAGNOSTIC_RESPONSE = bytes([uds.SERVICE_TYPE.DIAGNOSTIC_SESSION_CONTROL + 0x40, 0xc0]) - -NISSAN_KWP_VERSION_REQUEST = b'\x21\x83' -NISSAN_KWP_VERSION_RESPONSE = b'\x61\x83' +NISSAN_VERSION_REQUEST_KWP = b'\x21\x83' +NISSAN_VERSION_RESPONSE_KWP = b'\x61\x83' NISSAN_VERSION_REQUEST_STANDARD = bytes([uds.SERVICE_TYPE.READ_DATA_BY_IDENTIFIER]) + \ p16(uds.DATA_IDENTIFIER_TYPE.VEHICLE_MANUFACTURER_ECU_SOFTWARE_NUMBER) @@ -148,21 +145,21 @@ REQUESTS = [ # Nissan ( "nissan", - [NISSAN_KWP_DIAGNOSTIC_REQUEST, NISSAN_KWP_VERSION_REQUEST], - [NISSAN_KWP_DIAGNOSTIC_RESPONSE, NISSAN_KWP_VERSION_RESPONSE], - NISSAN_RX_OFFSET, + [NISSAN_VERSION_REQUEST_KWP], + [NISSAN_VERSION_RESPONSE_KWP], + DEFAULT_RX_OFFSET, ), ( "nissan", - [NISSAN_KWP_DIAGNOSTIC_REQUEST, NISSAN_KWP_VERSION_REQUEST], - [NISSAN_KWP_DIAGNOSTIC_RESPONSE, NISSAN_KWP_VERSION_RESPONSE], - DEFAULT_RX_OFFSET, + [NISSAN_VERSION_REQUEST_KWP], + [NISSAN_VERSION_RESPONSE_KWP], + NISSAN_RX_OFFSET, ), ( "nissan", [NISSAN_VERSION_REQUEST_STANDARD], [NISSAN_VERSION_RESPONSE_STANDARD], - NISSAN_RX_OFFSET, + NISSAN_RX_OFFSET, ), ]