started tweaking get_DTC functions

Brendan Whitfield · Brendan Whitfield · commit 5bbf2a21b051 · 2015-02-07T11:47:17.000-05:00
diff --git a/obd/commands.py b/obd/commands.py
@@ -252,7 +252,7 @@ def __eq__(self, other):
 
 __mode3__ = [
 	#                  sensor name                          description                   mode  cmd bytes       decoder
-	OBDCommand("GET_DTC"                    , "Get DTCs"                                , "03", "" , 0, noop                   ),
+	OBDCommand("GET_DTC"                    , "Get DTCs"                                , "03", "" , 6, noop                   ),
 ]
 
 __mode4__ = [
diff --git a/obd/decoders.py b/obd/decoders.py
@@ -355,13 +355,11 @@ def dtc(_hex):
 
 # converts a frame of 2-byte DTCs into a list of DTCs
 def dtc_frame(_hex):
-	code_length = 4 # number of hex chars consumed by one code
-	size = len(_hex) / code_length # number of codes defined in THIS FRAME (not total)
 	codes = []
-	for n in range(size):
+	for n in range(3):
 
-		start = code_length * n
-		end = start + code_length
+		start = 4 * n
+		end = start + 4
 		
 		codes.append(dtc(_hex[start:end]))
 
diff --git a/obd/obd.py b/obd/obd.py
@@ -167,20 +167,17 @@ def query(self, c, force=False):
 			return self.send(c)
 
 
-	'''
 	def query_DTC(self):
 		""" read all DTCs """
 
 		n = self.query(commands.STATUS).value['DTC Count'];
+		n = n if (n < 128) else 0  # if this number is over 128, it's invalid
 
 		codes = [];
 
-		# poll until the number of commands received equals that returned from STATUS
-		# or until this has looped 128 times (the max number of DTCs that STATUS reports)
-		i = 0
-		while (len(codes) < n) and (i < 128):
-			codes += self.query(commands.GET_DTC).value
-			i += 1
+		while n > 0:
+			current_codes = self.query(commands.GET_DTC).value
+			codes += current_codes
+			n -= len(current_codes)
 
 		return codes
-	'''

Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ def __eq__(self, other):`
`252`	`252`
`253`	`253`	`__mode3__ = [`
`254`	`254`	`# sensor name description mode cmd bytes decoder`
`255`		`- OBDCommand("GET_DTC" , "Get DTCs" , "03", "" , 0, noop ),`
	`255`	`+ OBDCommand("GET_DTC" , "Get DTCs" , "03", "" , 6, noop ),`
`256`	`256`	`]`
`257`	`257`
`258`	`258`	`__mode4__ = [`