tza/pyren
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'stpx' into master

Browse Source
This commit is contained in:
Marianpol 2021-02-17 22:15:41 +01:00
commit f948fc8ad0
5 changed files with 142 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

191
pyren/mod_ecu.py
View File

@ -24,6 +24,7 @@ import mod_db_manager
from xml.dom.minidom import parse from xml.dom.minidom import parse
from datetime import datetime from datetime import datetime
from collections import OrderedDict
from mod_utils import show_doc from mod_utils import show_doc
import xml.dom.minidom import xml.dom.minidom
#import xml.etree.ElementTree as et #import xml.etree.ElementTree as et
@ -397,11 +398,10 @@ class ECU:
nparams = 0 nparams = 0
for dr in datarefs: for dr in datarefs:
if dr.type=='State': if dr.type=='State':
csvline += ";" + self.States[dr.name].codeMR + (":" + self.States[dr.name].label if mod_globals.opt_csv_human else "") csvline += ";" + self.States[dr.name].codeMR + ":" + self.States[dr.name].label
nparams += 1 nparams += 1
if dr.type=='Parameter': if dr.type=='Parameter':
csvline += (";" + self.Parameters[dr.name].codeMR + (":" +self.Parameters[dr.name].label if mod_globals.opt_csv_human else "") + csvline += (";" + self.Parameters[dr.name].codeMR + ":" +self.Parameters[dr.name].label + " [" + self.Parameters[dr.name].unit + "]")
" [" + self.Parameters[dr.name].unit + "]")
nparams += 1 nparams += 1
if mod_globals.opt_usrkey: csvline += ";User events" if mod_globals.opt_usrkey: csvline += ";User events"
csvline = pyren_encode(csvline) csvline = pyren_encode(csvline)
@ -432,74 +432,96 @@ class ECU:
tb = time.time() #time of begining tb = time.time() #time of begining
if len(datarefs)==0 and 'DE' not in path: return if len(datarefs)==0 and 'DE' not in path: return
self.elm.clear_cache()
#csv_only mode workflow in performance mode
#1. Read all parameters from the current screen using defalut mode
#2. Get all dataIds from the 22 service requests and create a list from them according to a module performance level
#3. Collect all 21 service requests and push them into requests list
#4. Create a complex requests from the all dataIds list and push them into requests list
#5. Send reqests from the requests list and save the responses in a responseHistory list
#6. On exit generate csv log file from the responseHistory
if mod_globals.opt_csv and mod_globals.opt_csv_only: if mod_globals.opt_csv_only:
print "Data is sending directly to csv-file" print "Data is sending directly to csv-file"
print "" print ""
print "Press any key to exit" print "Press any key to exit"
page = 0 page = 0
displayedDataIds = [] #Current screen dataIds list for csv_only mode
responseHistory = OrderedDict()
requests = OrderedDict() #list of requests to send in csv_only mode
while(True): while(True):
strlst = [] strlst = []
datarefsRequestTime = int(round(time.time() * 1000))
if mod_globals.opt_csv and csvf!=0: if mod_globals.opt_csv_human and csvf!=0:
csvline = csvline + "\n" csvline = csvline + "\n"
#csvline = csvline.replace('.',',') #csvline = csvline.replace('.',',')
#csvline = csvline.replace(',','.') #csvline = csvline.replace(',','.')
csvline = csvline.replace(';','\t') csvline = csvline.replace(';','\t')
csvf.write(pyren_decode(csvline).encode('utf8') if mod_globals.opt_csv_human else csvline) csvf.write(pyren_decode(csvline).encode('utf8'))
#if mod_globals.os == 'nt' or mod_globals.os == 'android': #if mod_globals.os == 'nt' or mod_globals.os == 'android':
# csvf.write(pyren_decode(csvline).encode('cp1251') if mod_globals.opt_csv_human else csvline) # csvf.write(pyren_decode(csvline).encode('cp1251') if mod_globals.opt_csv_human else csvline)
#else: #else:
# csvf.write(pyren_decode(csvline).encode('utf8') if mod_globals.opt_csv_human else csvline) # csvf.write(pyren_decode(csvline).encode('utf8') if mod_globals.opt_csv_human else csvline)
csvf.flush() csvf.flush()
csvline = datetime.now().strftime("%H:%M:%S.%f") csvline = datetime.now().strftime("%H:%M:%S.%f")
#Collect all the requests from the current screen
if mod_globals.opt_perform and self.elm.performanceModeLevel > 1 and mod_globals.opt_csv_only:
if self.elm.rsp_cache:
if not requests:
requests = self.generateRequestsList()
self.elm.clear_cache() self.elm.clear_cache()
if not (mod_globals.opt_csv_only and requests):
for dr in datarefs: for dr in datarefs:
datastr = dr.name
help = dr.type
if dr.type=='State':
if self.DataIds and "DTC" in path and dr in self.Defaults[mod_globals.ext_cur_DTC[:4]].memDatarefs:
datastr, help, csvd = get_state( self.States[dr.name], self.Mnemonics, self.Services, self.elm, self.calc, self.DataIds )
else:
datastr, help, csvd = get_state( self.States[dr.name], self.Mnemonics, self.Services, self.elm, self.calc )
if dr.type=='Parameter':
if self.DataIds and "DTC" in path and dr in self.Defaults[mod_globals.ext_cur_DTC[:4]].memDatarefs:
datastr, help, csvd = get_parameter( self.Parameters[dr.name], self.Mnemonics, self.Services, self.elm, self.calc, self.DataIds )
else:
datastr, help, csvd = get_parameter( self.Parameters[dr.name], self.Mnemonics, self.Services, self.elm, self.calc )
if dr.type=='Identification':
datastr, help, csvd = get_identification( self.Identifications[dr.name], self.Mnemonics, self.Services, self.elm, self.calc )
if dr.type=='Command':
datastr = dr.name + " [Command] " + self.Commands[dr.name].label
if dr.type=="Text":
datastr = dr.name datastr = dr.name
help = "" help = dr.type
if mod_globals.opt_csv and csvf!=0 and (dr.type=='State' or dr.type=='Parameter'): if dr.type=='State':
csvline += ";" + (pyren_encode(csvd) if mod_globals.opt_csv_human else str(csvd)) if self.DataIds and "DTC" in path and dr in self.Defaults[mod_globals.ext_cur_DTC[:4]].memDatarefs:
datastr, help, csvd = get_state( self.States[dr.name], self.Mnemonics, self.Services, self.elm, self.calc, self.DataIds )
else:
datastr, help, csvd = get_state( self.States[dr.name], self.Mnemonics, self.Services, self.elm, self.calc )
if dr.type=='Parameter':
if self.DataIds and "DTC" in path and dr in self.Defaults[mod_globals.ext_cur_DTC[:4]].memDatarefs:
datastr, help, csvd = get_parameter( self.Parameters[dr.name], self.Mnemonics, self.Services, self.elm, self.calc, self.DataIds )
else:
datastr, help, csvd = get_parameter( self.Parameters[dr.name], self.Mnemonics, self.Services, self.elm, self.calc )
if dr.type=='Identification':
datastr, help, csvd = get_identification( self.Identifications[dr.name], self.Mnemonics, self.Services, self.elm, self.calc )
if dr.type=='Command':
datastr = dr.name + " [Command] " + self.Commands[dr.name].label
if dr.type=="Text":
datastr = dr.name
help = ""
if mod_globals.opt_csv_human and csvf!=0 and (dr.type=='State' or dr.type=='Parameter'):
csvline += ";" + pyren_encode(csvd)
if not (mod_globals.opt_csv and mod_globals.opt_csv_only): if not (mod_globals.opt_csv and mod_globals.opt_csv_only):
strlst.append(datastr) strlst.append(datastr)
if mod_globals.opt_verbose and len(help)>0: if mod_globals.opt_verbose and len(help)>0:
tmp_str = '' tmp_str = ''
for s in help: for s in help:
#s = s.replace('\n','\n\t') #s = s.replace('\n','\n\t')
s = s.replace('\r','\n') s = s.replace('\r','\n')
s = s.replace('>','>') s = s.replace('>','>')
s = s.replace('&le;','<') s = s.replace('&le;','<')
tmp_str = tmp_str + s + '\n\n' tmp_str = tmp_str + s + '\n\n'
W = 50 W = 50
for line in tmp_str.split('\n'): for line in tmp_str.split('\n'):
i = 0 i = 0
while i*W<len(line): while i*W<len(line):
strlst.append('\t'+line[i*W:(i+1)*W]) strlst.append('\t'+line[i*W:(i+1)*W])
i=i+1 i=i+1
strlst.append('') strlst.append('')
else: #Send requests, do not calculate data
for req in requests:
self.elm.request(req)
if not (mod_globals.opt_csv and mod_globals.opt_csv_only): if not (mod_globals.opt_csv and mod_globals.opt_csv_only):
newScreen = initScreen newScreen = initScreen
@ -535,8 +557,13 @@ class ECU:
time.sleep(tb + self.minimumrefreshrate - tc) time.sleep(tb + self.minimumrefreshrate - tc)
tb = tc tb = tc
if mod_globals.opt_perform: if mod_globals.opt_csv_only:
self.elm.currentScreenDataIds = self.getDataIds(self.elm.rsp_cache.keys(), self.DataIds) responseHistory[datarefsRequestTime] = self.elm.rsp_cache #Collect data to generate a file
if mod_globals.opt_perform and self.elm.performanceModeLevel > 1:
self.elm.currentScreenDataIds = self.getDataIds(self.elm.rsp_cache, self.DataIds)
if self.elm.currentScreenDataIds: #DataIds list is generated only at first data read pass in csv_only mode
displayedDataIds = self.elm.currentScreenDataIds #We save it for file generating function
if kb.kbhit(): if kb.kbhit():
c = kb.getch() c = kb.getch()
@ -552,8 +579,11 @@ class ECU:
continue continue
kb.set_normal_term() kb.set_normal_term()
if mod_globals.opt_csv and csvf!=0: if mod_globals.opt_csv and csvf!=0:
csvf.close() self.saveFavList()
self.saveFavList() if mod_globals.opt_csv_human:
csvf.close()
return
self.createFile(responseHistory, displayedDataIds, csvline, csvf, datarefs)
return return
else: else:
n = ord(c)-ord('0') n = ord(c)-ord('0')
@ -579,10 +609,58 @@ class ECU:
continue continue
kb.set_normal_term() kb.set_normal_term()
if mod_globals.opt_csv and csvf!=0: if mod_globals.opt_csv and csvf!=0:
csvf.close() if mod_globals.opt_csv_human:
csvf.close()
return
self.createFile(responseHistory, displayedDataIds, csvline, csvf, datarefs)
if "DTC" in path: if "DTC" in path:
mod_globals.ext_cur_DTC = "000000" mod_globals.ext_cur_DTC = "000000"
return return
def generateRequestsList(self):
requests = OrderedDict()
currentScreenDataIdsLength = len(self.elm.currentScreenDataIds)
for reqDidsIndex in range(currentScreenDataIdsLength): #Create complex requests from all 22 requests
firstRequest = '22' + self.elm.currentScreenDataIds[0][0].id
complexRequest, sentDataIdentifires = prepareComplexRequest(firstRequest, self.elm.currentScreenDataIds)
requests[complexRequest] = complexRequest
for req in self.elm.rsp_cache.keys(): #Get all the 21 requests
if req.startswith('21'):
requests[req] = req
return requests
def createFile(self, responseHistory, displayedDataIds, csvline, csvf, datarefs):
clearScreen()
print 'Generating a file. Please wait...'
for reqTime, reqCache in responseHistory.iteritems():
for req, rsp in reqCache.iteritems():
if req.startswith('22') and len(req) > 6:
for reqDids in displayedDataIds:
if reqDids[0].id == req[2:6]:
parseComplexResponse(self.elm, '62', rsp.replace(' ', ''), reqDids)
else:
self.elm.rsp_cache[req] = rsp
csvline = csvline + "\n"
csvline = csvline.replace(';','\t')
csvf.write(pyren_decode(csvline).encode('utf8'))
csvf.flush()
csvline = datetime.fromtimestamp(reqTime/1000.0).strftime("%H:%M:%S.%f")[:-3]
for dr in datarefs:
datastr = dr.name
help = dr.type
if dr.type=='State':
datastr, help, csvd = get_state( self.States[dr.name], self.Mnemonics, self.Services, self.elm, self.calc )
if dr.type=='Parameter':
datastr, help, csvd = get_parameter( self.Parameters[dr.name], self.Mnemonics, self.Services, self.elm, self.calc )
if csvf!=0 and (dr.type=='State' or dr.type=='Parameter'):
csvline += ";" + pyren_encode(csvd)
csvf.close()
def add_favourite(self): def add_favourite(self):
H = 25 H = 25
@ -1044,13 +1122,14 @@ class ECU:
if self.elm.performanceModeLevel == 1: if self.elm.performanceModeLevel == 1:
return dataIdsList return dataIdsList
for key in cache: for req in cache:
if key.startswith('22'): if req.startswith('22'):
if key[2:] in dataids.keys(): if req[2:] in dataids.keys():
dataIdsList.append(dataids[key[2:]]) if req not in self.elm.notSupportedCommands:
dataIdsList.append(dataids[req[2:]])
chunk_size = self.elm.performanceModeLevel chunk_size = self.elm.performanceModeLevel
if dataIdsList: if dataIdsList:
# split dataIdsList into chunks based on the performace level # split dataIdsList into chunks based on the performace level
return [dataIdsList[offset:offset+chunk_size] for offset in range(0, len(dataIdsList), chunk_size)] return [dataIdsList[offset:offset+chunk_size] for offset in range(0, len(dataIdsList), chunk_size)]

3
pyren/mod_ecu_parameter.py
View File

@ -31,9 +31,10 @@ def get_parameter( pr, mn, se, elm, calc, dataids = {} ):
comp = comp.replace(m, val) comp = comp.replace(m, val)
pr.value = calc.calculate(comp) pr.value = calc.calculate(comp)
csv_data = unicode(pr.value) if mod_globals.opt_csv_human else pr.value
if '.' in str(pr.value): if '.' in str(pr.value):
pr.value = "%10.2f"%float(pr.value) pr.value = "%10.2f"%float(pr.value)
csv_data = unicode(pr.value)
tmpmin = str(pr.min) tmpmin = str(pr.min)
tmpmax = str(pr.max) tmpmax = str(pr.max)

2
pyren/mod_ecu_state.py
View File

@ -23,7 +23,7 @@ def get_state( st, mn, se, elm, calc, dataids = {} ):
else: else:
st.value = str(tmp_val).encode("utf-8") st.value = str(tmp_val).encode("utf-8")
csv_val = unicode(st.value) if mod_globals.opt_csv_human else tmp_val csv_val = unicode(st.value)
if mod_globals.os=='android': if mod_globals.os=='android':
st.value = " "*(8-len(st.value)/2) + st.value st.value = " "*(8-len(st.value)/2) + st.value
return "%-6s %-41s %-16s"%(st.codeMR,st.label,st.value), st.helps, csv_val return "%-6s %-41s %-16s"%(st.codeMR,st.label,st.value), st.helps, csv_val

9
pyren/mod_elm.py
View File

@ -1223,15 +1223,12 @@ class ELM:
# add response frames number to each frame to increase polling # add response frames number to each frame to increase polling
if mod_globals.opt_obdlink and mod_globals.opt_perform: if mod_globals.opt_obdlink and mod_globals.opt_perform:
if commandString[:2] in AllowedList and isCommandInCache: if commandString[:2] in AllowedList and isCommandInCache:
for index in range(len(raw_command) - 1):
raw_command[index] = raw_command[index] + '1'
if int('0x' + self.l1_cache[commandString], 16) < 16: if int('0x' + self.l1_cache[commandString], 16) < 16:
for index in range(len(raw_command) - 1):
raw_command[index] = raw_command[index] + '1'
raw_command[-1] = raw_command[-1] + self.l1_cache[commandString] raw_command[-1] = raw_command[-1] + self.l1_cache[commandString]
else: else:
readyFrame = '' raw_command[-1] = "STPX D:" + raw_command[-1] + ",R:" + self.l1_cache[commandString]
for f in raw_command:
readyFrame += f
raw_command = ["STPX D:" + readyFrame + ",R:" + self.l1_cache[commandString]]
responses = [] responses = []

1
pyren/pyren.py
View File

@ -219,6 +219,7 @@ def optParser():
mod_globals.opt_scan = options.scan mod_globals.opt_scan = options.scan
mod_globals.opt_csv = options.csv mod_globals.opt_csv = options.csv
mod_globals.opt_csv_only = options.csv_only mod_globals.opt_csv_only = options.csv_only
if mod_globals.opt_csv : mod_globals.opt_csv_human = True
if mod_globals.opt_csv_only : mod_globals.opt_csv = True if mod_globals.opt_csv_only : mod_globals.opt_csv = True
mod_globals.opt_csv_human = options.csv_human mod_globals.opt_csv_human = options.csv_human
if mod_globals.opt_csv_human : mod_globals.opt_csv = True if mod_globals.opt_csv_human : mod_globals.opt_csv = True