mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-06-23 23:12:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Nissan FPv2: use default diagnostic session (#28634)

Browse Source 
* Revert "Nissan FPv2: log different diagnostic session types (#28585)"

This reverts commit 2f2b94758b.

* switch to standard KWP2000 diagnostic session type

* we're speedy again
This commit is contained in:
Shane Smiskol
2023-07-17 18:21:18 -07:00
committed by GitHub
parent 2d6ff7b7b1
commit 35aaf90587
2 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/car/nissan/values.py
+11 -21
View File
@@ -79,35 +79,25 @@ FINGERPRINTS = {
]
}
NISSAN_DIAGNOSTIC_REQUEST_KWP = bytes([uds.SERVICE_TYPE.DIAGNOSTIC_SESSION_CONTROL])
NISSAN_DIAGNOSTIC_RESPONSE_KWP = bytes([uds.SERVICE_TYPE.DIAGNOSTIC_SESSION_CONTROL + 0x40])
NISSAN_DIAGNOSTIC_REQUEST_KWP = bytes([uds.SERVICE_TYPE.DIAGNOSTIC_SESSION_CONTROL, 0x81])
NISSAN_DIAGNOSTIC_RESPONSE_KWP = bytes([uds.SERVICE_TYPE.DIAGNOSTIC_SESSION_CONTROL + 0x40, 0x81])
NISSAN_VERSION_REQUEST_KWP = b'\x21\x83'
NISSAN_VERSION_RESPONSE_KWP = b'\x61\x83'
NISSAN_RX_OFFSET = 0x20
# Try diagnostic sessions: default, standby, extended, Nissan-specific
NISSAN_DIAGNOSTIC_SESSION_TYPES = (0x81, 0x89, 0x92, 0xc0)
NISSAN_DEFAULT_DIAGNOSTIC_SESSION_TYPE = 0xc0
FW_QUERY_CONFIG = FwQueryConfig(
requests=[
*[
Request(
[NISSAN_DIAGNOSTIC_REQUEST_KWP + bytes([subfunction]), NISSAN_VERSION_REQUEST_KWP],
[NISSAN_DIAGNOSTIC_RESPONSE_KWP + bytes([subfunction]), NISSAN_VERSION_RESPONSE_KWP],
logging=subfunction != NISSAN_DEFAULT_DIAGNOSTIC_SESSION_TYPE,
) for subfunction in NISSAN_DIAGNOSTIC_SESSION_TYPES
],
*[
Request(
[NISSAN_DIAGNOSTIC_REQUEST_KWP + bytes([subfunction]), NISSAN_VERSION_REQUEST_KWP],
[NISSAN_DIAGNOSTIC_RESPONSE_KWP + bytes([subfunction]), NISSAN_VERSION_RESPONSE_KWP],
rx_offset=NISSAN_RX_OFFSET,
logging=subfunction != NISSAN_DEFAULT_DIAGNOSTIC_SESSION_TYPE,
) for subfunction in NISSAN_DIAGNOSTIC_SESSION_TYPES
],
Request(
[NISSAN_DIAGNOSTIC_REQUEST_KWP, NISSAN_VERSION_REQUEST_KWP],
[NISSAN_DIAGNOSTIC_RESPONSE_KWP, NISSAN_VERSION_RESPONSE_KWP],
),
Request(
[NISSAN_DIAGNOSTIC_REQUEST_KWP, NISSAN_VERSION_REQUEST_KWP],
[NISSAN_DIAGNOSTIC_RESPONSE_KWP, NISSAN_VERSION_RESPONSE_KWP],
rx_offset=NISSAN_RX_OFFSET,
),
Request(
[StdQueries.MANUFACTURER_SOFTWARE_VERSION_REQUEST],
[StdQueries.MANUFACTURER_SOFTWARE_VERSION_RESPONSE],
selfdrive/car/tests/test_fw_fingerprint.py
+2 -2
View File
@@ -220,7 +220,7 @@ class TestFwFingerprintTiming(unittest.TestCase):
print(f'get_vin, query time={vin_time / self.N} seconds')
def test_fw_query_timing(self):
total_ref_time = 6.6
total_ref_time = 6.0
brand_ref_times = {
1: {
'body': 0.1,
@@ -229,7 +229,7 @@ class TestFwFingerprintTiming(unittest.TestCase):
'honda': 0.5,
'hyundai': 0.7,
'mazda': 0.2,
'nissan': 0.9,
'nissan': 0.3,
'subaru': 0.1,
'tesla': 0.2,
'toyota': 1.6,