Skip to content

Commit

Permalink
misc updates from tests with camry and tsx
Browse files Browse the repository at this point in the history
  • Loading branch information
@AustinMurphy
AustinMurphy committed Jul 18, 2012
1 parent ba846f1 commit 3f22afa
Show file tree
Hide file tree
Showing 6 changed files with 371 additions and 55 deletions.
22 changes: 17 additions & 5 deletions decode-trace.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,15 @@

# headers on(1)/off(0)
headers = 0
#headers = 1
#style = can/old
#style = 'old'
style = 'can'

# 0=off,
# 1+ - show raw & decoded records
# 2+ - show record as triaged
debug = 0
debug = 2



Expand Down Expand Up @@ -102,10 +103,12 @@ def main():
reader.open_trace(tracefile)

# manually set since we can't query the tracefile
reader.Style = 'can'
reader.Headers = 1
#reader.Style = 'can'
#reader.Headers = 1
#reader.Style = 'old'
#reader.Headers = 0
reader.Style = style
reader.Headers = headers


vehicle = obd2.OBD2( reader )
Expand Down Expand Up @@ -138,6 +141,9 @@ def main():
print "--"
print "Decoded Record: ",
pprint.pprint( dec_rec )
print " "
print "=================================="
print " "

# do something with the decoded obd2_record
vehicle.store_info( dec_rec )
Expand Down Expand Up @@ -175,8 +181,8 @@ def main():
print ""
print "Vehicle Basic Info:"
print "-------------------"
#pprint.pprint( vehicle.info )
#print ""
pprint.pprint( vehicle.info )
print ""
vehicle.show_basic_info()
print ""
print ""
Expand All @@ -186,6 +192,12 @@ def main():
print ""
print "-----------------------------------"
print ""
print "Vehicle supported PIDs:"
print "-----------------------"
pprint.pprint( vehicle.suppPIDs )
print ""
print "-----------------------------------"
print ""
print "Vehicle Sensor readings:"
print "--------------------"
pprint.pprint( vehicle.sensor_readings )
Expand Down
11 changes: 9 additions & 2 deletions demo-scan.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ def main():
print "Serial port attributes"
print "----------------------"

ser_device = '/dev/pts/7'
#ser_device = '/dev/ttyUSB0'
#ser_device = '/dev/pts/7'
ser_device = '/dev/ttyUSB0'

ser_settings = {
'baudrate': 38400,
Expand Down Expand Up @@ -214,6 +214,13 @@ def main():
print " RAW Data structure:"
pprint.pprint( vehicle.sensor_readings )


print " "
print " "
print " DTCs:"
vehicle.scan_pid( '03' )
vehicle.show_last_reading( '03' )



print ""
Expand Down
85 changes: 58 additions & 27 deletions obd2.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,11 @@

# Parameters are the same for modes $01 and $02
supported_PIDs = ["0100", "0101", "0104", "0105", "010C", "010D", "0111",
"0200", "0202", "0204", "0205", "020C", "020D", "0211",
"0200",
"0500",
"0600",
"0900"]
#"0200", "0202", "0204", "0205", "020C", "020D", "0211",
# FYI - 0100, 0101, 0104, 0105, 010C, 010D, 0111 are mandatory
# when DTC is set, freeze frame must be set with
# 0202, 0204, 0205, 020C, 020D, 0211
Expand All @@ -89,6 +91,7 @@
# modes 01, 02, 05, 06, 08, 09
# params 00, 20, 40, 60, A0, C0, E0
#
#feature_PIDs = ["0100", "0113", "011D", "0120", "0140", "0160", "0180", "01A0", "01C0", "01E0",
feature_PIDs = ["0100", "0120", "0140", "0160", "0180", "01A0", "01C0", "01E0",
"0200", "0220", "0240", "0260", "0280", "02A0", "02C0", "02E0",
"0500", "0520", "0540", "0560", "0580", "05A0", "05C0", "05E0",
Expand Down Expand Up @@ -521,6 +524,9 @@ def decode_data_by_mode(mode, pid, data):

def decode_feature_pid(PID, data):
""" Decode the supported features indicated."""
# feature pids indicate which of the next 32 pids are supported
# pids 0113 and 011D indicate which of the O2 sensors are supported
# they are useful with mode $05 and maybe mode $06

# a simple list of supported pids to return
feat_pids = []
Expand All @@ -529,16 +535,26 @@ def decode_feature_pid(PID, data):
# integer math seems to work better
P0 = int(PID[2:], 16)

L = len(data)
#print "Fpid length:", L
bits = L*8

feat_bits = ""
for db in data :
# reverse the bit order and append
feat_bits += hex_to_bitstring(db)[::-1]
if L == 4 :
for db in data :
# reverse the bit order and append
feat_bits += hex_to_bitstring(db)[::-1]
else:
for db in data :
# O2 sensor bitmap isn't reversed ?
feat_bits += hex_to_bitstring(db)

for i in range(32):
for i in range(bits):
if feat_bits[i] == '1':
# do math as integers, then convert back to hex
P = str.upper(hex(P0+i+1))[2:].rjust(2, "0")
newpid = M + P
#print "M:", M, " P0:", P0, " i:", i, " P:", P, "Newpid:", newpid
feat_pids.append(newpid)

# not sure we want/need to do this
Expand Down Expand Up @@ -595,6 +611,7 @@ def decode_mode1_pid(PID, data):
values.append( ["Secondary air status", sacode, secondary_air_statuses[sacode]] )
return values

# sort of handled above
elif PID == '0113' or PID == '011D':
[A] = hexbytes_to_bitarrays( data )
values.append( ["O2 Sensor bitmap", A, "Next 8 PIDs"] )
Expand Down Expand Up @@ -644,6 +661,10 @@ def decode_mode9_pid(PID, data):
values.append( [ PIDs[PID][1][0][0], decode_ints( data ), "" ] )
return values

elif PID == '0901' or '0903' or '0905' or '0907' or '0909':
values.append( [ PIDs[PID][1][0][0], decode_ints( data ), "" ] )
return values

# insert new elif sections here

else:
Expand Down Expand Up @@ -717,9 +738,12 @@ def decode_monitors( PID, data ) :
# 0141 looks at the their status only for the current drive cycle
values = []
[A, B, C, D] = hexbytes_to_bitarrays( data )

badtxt = "INCOMPLETE"

# PID 0101 has MIL & DTC count, 0141 does not
if PID == '0101':
badtxt = "NOT READY FOR INSPECTION"
# debug
#print "Monitor status OVERALL"
MIL = "Off"
Expand All @@ -739,31 +763,31 @@ def decode_monitors( PID, data ) :
# TODO: these should just skip unsupported sensors, duh.
# and doneness should be the 2nd field in the 3 tuple
for i in [0, 1, 2]:
done = "NOT READY FOR INSPECTION"
done = badtxt
if B[i] == '1':
if B[i+4] == '0':
done = "OK"
values.append( ['CONTINUOUS MONITOR', continuous_monitors[i], done] )
values.append( ['Continuous Monitor', continuous_monitors[i], done] )

# C lists supported monitors (1 = SUPPORTED)
# D lists their readiness (0 = READY)
if ign == 0 :
for i in [0, 1, 2, 3, 4, 5, 6, 7]:
done = "NOT READY FOR INSPECTION"
done = badtxt
if C[i] == '1':
if D[i] == '0':
done = "OK"
# debug
#print 'MONITOR', non_continuous_monitors[0][i], done
values.append( ['NON-CONTINUOUS MONITOR', non_continuous_monitors[0][i], done] )
#print 'Monitor', non_continuous_monitors[0][i], done
values.append( ['Non-continuous Monitor', non_continuous_monitors[0][i], done] )

if ign == 1 :
for i in [0, 1, 3, 5, 6, 7]:
done = "NOT READY FOR INSPECTION"
done = badtxt
if C[i] == '1':
if D[i] == '0':
done = "OK"
values.append( ['NON-CONTINUOUS MONITOR', non_continuous_monitors[1][i], done] )
values.append( ['Non-continuous Monitor', non_continuous_monitors[1][i], done] )


# debug
Expand Down Expand Up @@ -853,18 +877,8 @@ def scan_features(self):
# scans known feature PIDs, adds PIDs reported as supported to self.suppPIDs
for fpid in feature_PIDs:
if fpid in self.suppPIDs:

supp_pids = decode_obd2_record( self.reader.OBD2_cmd(fpid) )
for ecu in supp_pids['values'].iterkeys():
if supp_pids['values'][ecu] == []:
self.suppPIDs.remove(fpid)
for pid in supp_pids['values'][ecu]:
if pid not in self.suppPIDs :
self.suppPIDs.append(pid)

self.suppPIDs.sort()
#print "Supported PIDs:"
#pprint.pprint(self.suppPIDs)
self.store_info( supp_pids )


def scan_basic_info(self):
Expand Down Expand Up @@ -915,6 +929,23 @@ def store_info(self, rec):
ts = rec['timestamp']

for ecu in rec['values'].iterkeys():
if ecu not in self.info:
#print "New ECU"
self.info[ecu] = {}

if pid in feature_PIDs:
if rec['values'][ecu] == []:
self.suppPIDs.remove(fpid)
for pid in rec['values'][ecu]:
if pid not in self.suppPIDs :
self.suppPIDs.append(pid)
self.suppPIDs.sort()

if ecu not in self.obd2status:
#print "New ECU"
self.obd2status[ecu] = {}
self.obd2status[ecu]['inspmons'] = []
self.obd2status[ecu]['cyclemons'] = []

if pid in info_PIDs:
if 0 in rec['values'][ecu] and len(rec['values'][ecu][0]) == 3:
Expand All @@ -930,18 +961,18 @@ def store_info(self, rec):
self.obd2status[ecu]['MIL'] = v[1]
elif v[0] == 'DTC count':
self.obd2status[ecu]['DTCcount'] = v[1]
elif v[0] == 'CONTINUOUS MONITOR':
elif v[0] == 'Continuous Monitor':
self.obd2status[ecu]['inspmons'].append(v)
elif v[0] == 'NON-CONTINUOUS MONITOR':
elif v[0] == 'Non-continuous Monitor':
self.obd2status[ecu]['inspmons'].append(v)
# 01 41 - lots of info...
elif pid == "0141" :
self.obd2status[ecu]['scantime'] = rec['timestamp']
vals = rec['values'][ecu]
for v in vals:
if v[0] == 'CONTINUOUS MONITOR':
if v[0] == 'Continuous Monitor':
self.obd2status[ecu]['cyclemons'].append(v)
elif v[0] == 'NON-CONTINUOUS MONITOR':
elif v[0] == 'Non-continuous Monitor':
self.obd2status[ecu]['cyclemons'].append(v)
# normalish
else :
Expand Down
Loading

0 comments on commit 3f22afa

Please sign in to comment.