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

9p fix#21

Browse Source
This commit is contained in:
shrlnm 2019-06-02 10:13:51 +03:00
parent e7c41472cd
commit 8069bd13a8
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pyren/mod_elm.py
View File

@ -207,8 +207,6 @@ class Port:
def reinit(self): def reinit(self):
''' '''
Need for wifi adapters with short connection timeout Need for wifi adapters with short connection timeout
:return:
''' '''
if self.portType != 1: return if self.portType != 1: return
@ -218,6 +216,9 @@ class Port:
self.hdr.connect ((self.ipaddr, self.tcpprt)) self.hdr.connect ((self.ipaddr, self.tcpprt))
self.hdr.setblocking (True) self.hdr.setblocking (True)
self.write("AT\r")
self.expect(">",1)
''' '''
def elm_at_KeepAlive(self): def elm_at_KeepAlive(self):
@ -296,7 +297,12 @@ class Port:
try: try:
if self.portType == 1: if self.portType == 1:
return self.hdr.sendall (data) try:
rcv_bytes = self.hdr.sendall(data)
except:
self.reinit()
rcv_bytes = self.hdr.sendall(data)
return rcv_bytes
elif self.portType == 2: elif self.portType == 2:
# return self.droid.bluetoothWrite(data , self.btcid) # return self.droid.bluetoothWrite(data , self.btcid)
return self.droid.bluetoothWrite (data) return self.droid.bluetoothWrite (data)
@ -1033,8 +1039,8 @@ class ELM:
self.lf.flush () self.lf.flush ()
# send keepalive # send keepalive
if not mod_globals.opt_demo: #if not mod_globals.opt_demo:
self.port.reinit() #experimental # self.port.reinit() #experimental
self.send_cmd (self.startSession) self.send_cmd (self.startSession)
self.lastCMDtime = time.time () # for not to get into infinite loop self.lastCMDtime = time.time () # for not to get into infinite loop
@ -1045,21 +1051,9 @@ class ELM:
rep_count = rep_count - 1 rep_count = rep_count - 1
no_negative_wait_response = True no_negative_wait_response = True
# debug
# print 'serviceDelay:', serviceDelay
# servDelay = int (serviceDelay)
# if servDelay >= 200:
# ST = servDelay / 4
# if ST > 255: ST = 255
# self.send_raw ('at at 0')
# self.send_raw ('at st ' + hex (ST)[2:])
# cmdrsp = self.send_cmd (command)
# self.send_raw ('at at 1')
# else:
# cmdrsp = self.send_cmd (command)
cmdrsp = self.send_cmd (command)
self.lastCMDtime = tc = time.time () self.lastCMDtime = tc = time.time ()
cmdrsp = self.send_cmd (command)
# if command[0:2] not in AllowedList: # if command[0:2] not in AllowedList:
# break # break
@ -1078,8 +1072,8 @@ class ELM:
elif nr in ['78']: elif nr in ['78']:
self.send_raw ('at at 0') self.send_raw ('at at 0')
self.send_raw ('at st ff') self.send_raw ('at st ff')
cmdrsp = self.send_cmd (command)
self.lastCMDtime = tc = time.time () self.lastCMDtime = tc = time.time ()
cmdrsp = self.send_cmd (command)
self.send_raw ('at at 1') self.send_raw ('at at 1')
break break

8
pyren/mod_utils.py
View File

@ -407,8 +407,14 @@ def getVIN( de, elm ):
else: else:
rsp = elm.request( req = '2181', positive = '61', cache = False )[6:56] rsp = elm.request( req = '2181', positive = '61', cache = False )[6:56]
vin = rsp.replace(' ','').decode('HEX') try:
vin = rsp.replace(' ','').decode('HEX')
except:
continue
#debug
print e['dst'],' : ', vin
if len(vin)==17: if len(vin)==17:
m_vin[vin] = '' m_vin[vin] = ''