Merge pull request #120 from pylessard/110-support-dtc-user-defined-memory

110 support dtc user defined memory

Author: pylessard

doc/source/udsoncan/client.rst

@@ -379,6 +379,7 @@ Methods by services
 
 
 .. automethod:: udsoncan.client.Client.get_dtc_by_status_mask
+.. automethod:: udsoncan.client.Client.get_user_defined_memory_dtc_by_status_mask
 .. automethod:: udsoncan.client.Client.get_emission_dtc_by_status_mask
 .. automethod:: udsoncan.client.Client.get_mirrormemory_dtc_by_status_mask
 .. automethod:: udsoncan.client.Client.get_dtc_by_status_severity_mask
@@ -396,8 +397,11 @@ Methods by services
 .. automethod:: udsoncan.client.Client.get_dtc_fault_counter
 .. automethod:: udsoncan.client.Client.get_dtc_snapshot_identification
 .. automethod:: udsoncan.client.Client.get_dtc_snapshot_by_dtc_number
+.. automethod:: udsoncan.client.Client.get_user_defined_dtc_snapshot_by_dtc_number
 .. automethod:: udsoncan.client.Client.get_dtc_snapshot_by_record_number
 .. automethod:: udsoncan.client.Client.get_dtc_extended_data_by_dtc_number
+.. automethod:: udsoncan.client.Client.get_dtc_extended_data_by_record_number
+.. automethod:: udsoncan.client.Client.get_user_defined_dtc_extended_data_by_dtc_number
 .. automethod:: udsoncan.client.Client.get_mirrormemory_dtc_extended_data_by_dtc_number
 
 

test/client/test_clear_dtc.py

@@ -1,8 +1,7 @@
-from udsoncan.client import Client
-from udsoncan import services
 from udsoncan.exceptions import *
 
 from test.ClientServerTest import ClientServerTest
+from udsoncan.configs import latest_standard
 
 class TestClearDtc(ClientServerTest):
     def __init__(self, *args, **kwargs):
@@ -32,18 +31,28 @@ def _test_clear_dtc_spr_no_effect(self):
     def test_clear_dtc_all(self):
         request = self.conn.touserqueue.get(timeout=0.2)
         self.assertEqual(request, b"\x14\xFF\xFF\xFF")
-        self.conn.fromuserqueue.put(b"\x54")	# Positive response
+        self.conn.fromuserqueue.put(b"\x54")    # Positive response
 
     def _test_clear_dtc_all(self):
         response = self.udsclient.clear_dtc()
         self.assertTrue(response.valid)
         self.assertTrue(response.positive)
 
+    def test_clear_dtc_with_memory_selection(self):
+        request = self.conn.touserqueue.get(timeout=0.2)
+        self.assertEqual(request, b"\x14\x12\x34\x56\x99")
+        self.conn.fromuserqueue.put(b"\x54")    # Positive response
+
+    def _test_clear_dtc_with_memory_selection(self):
+        response = self.udsclient.clear_dtc(group = 0x123456, memory_selection = 0x99)
+        self.assertTrue(response.valid)
+        self.assertTrue(response.positive)        
+
     def test_clear_dtc_denied_exception(self):
         self.wait_request_and_respond(b"\x7F\x14\x31") #Request Out Of Range
 
     def _test_clear_dtc_denied_exception(self):
-        with self.assertRaises(NegativeResponseException) as handle:
+        with self.assertRaises(NegativeResponseException):
             self.udsclient.clear_dtc(0x123456)
 
     def test_clear_dtc_denied_no_exception(self):
@@ -60,7 +69,7 @@ def test_clear_dtc_invalidservice_exception(self):
         self.wait_request_and_respond(b"\x00") #Inexistent Service
 
     def _test_clear_dtc_invalidservice_exception(self):
-        with self.assertRaises(InvalidResponseException) as handle:
+        with self.assertRaises(InvalidResponseException):
             self.udsclient.clear_dtc(0x123456)
 
     def test_clear_dtc_invalidservice_no_exception(self):
@@ -75,7 +84,7 @@ def test_clear_dtc_wrongservice_exception(self):
         self.wait_request_and_respond(b"\x7E\x00") # Valid but wrong service (Tester Present)
 
     def _test_clear_dtc_wrongservice_exception(self):
-        with self.assertRaises(UnexpectedResponseException) as handle:
+        with self.assertRaises(UnexpectedResponseException):
             self.udsclient.clear_dtc(0x123456)
 
     def test_clear_dtc_wrongservice_no_exception(self):
@@ -96,3 +105,14 @@ def _test_bad_param(self):
 
         with self.assertRaises(ValueError):
             self.udsclient.clear_dtc(-1)
+
+        with self.assertRaises(ValueError):
+            self.udsclient.clear_dtc(1, memory_selection=-1)
+
+        with self.assertRaises(ValueError):
+            self.udsclient.clear_dtc(1, memory_selection=0x100)
+
+        with self.assertRaises(NotImplementedError):
+            self.udsclient.set_config('standard_version', 2013)
+            self.udsclient.clear_dtc(1, memory_selection=0x100)
+        self.udsclient.set_config('standard_version', latest_standard)