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

fix BT for modified sl4a #2

Browse Source
This commit is contained in:
shrlnm 2022-09-01 23:13:35 +03:00
parent 533d4c4f17
commit 2301a2d071
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pyren3/cmdr_chkelm.py
View File

@ -145,7 +145,7 @@ from mod_elm import ELM
def main():
pyren.optParser()
pyren3.optParser()
good = 0
total= 0

29
pyren3/mod_elm.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python3
"""
module contains class for working with ELM327
version: 180408
version: 010922
"""
import mod_globals
@ -170,7 +170,7 @@ class Port:
self.hdr.connect ((self.macaddr, self.channel))
self.hdr.setblocking (True)
except Exception as e:
print(" \n\nERROR: Can not connect to Bluetooth ELM\n\n", e)
print(" \n\nERROR: Can't connect to BT adapter\n\n", e)
mod_globals.opt_demo = True
sys.exit()
elif re.match (r"^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d{1,5}$", portName):
@ -184,22 +184,27 @@ class Port:
self.hdr.connect ((self.ipaddr, self.tcpprt))
self.hdr.setblocking (True)
except:
print(" \n\nERROR: Can not connect to WiFi ELM\n\n")
print(" \n\nERROR: Can't connect to WiFi ELM\n\n")
mod_globals.opt_demo = True
sys.exit()
elif mod_globals.os == 'android' and portName == 'bt':
self.portType = 2
self.droid = android.Android ()
self.droid.toggleBluetoothState (True)
try:
self.btcid = self.droid.bluetoothConnect ('00001101-0000-1000-8000-00805F9B34FB').result
except:
pass
#if len (self.droid.bluetoothActiveConnections ().result) != 0:
# self.btcid = list (self.droid.bluetoothActiveConnections ().result.keys ())[0]
retry = 0
while 1:
time.sleep(1)
retry = retry + 1
try:
self.btcid = self.droid.bluetoothConnect ('00001101-0000-1000-8000-00805F9B34FB').result
except:
pass
print( 'Try ',retry, ":", self.btcid )
if self.btcid != None and len(self.btcid) > 10: #uuid length greater then 10
break
if retry > 5:
print( " \n\nERROR: Can't connect to BT adapter" )
exit()
else:
self.portName = portName
self.portType = 0