From 06d32f65c53f06a3cc5f29f442f916d267a07341 Mon Sep 17 00:00:00 2001
From: Dmitry Ketov <dketov@gmail.com>
Date: Mon, 9 Aug 2021 01:11:45 +0300
Subject: [PATCH] Linux bluetooth rfcomm support without attaching to a
 /dev/rfcommN device file

One can now pair with a bluetooth elm327 adaptor as usual
and then specifiy its MAC address in the Port field of the
_pyren_launcher.py or as the -p command line option value, e.g.
./bus_monitor.py -p 24:42:16:08:00:00
---
 pyren/mod_elm.py | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/pyren/mod_elm.py b/pyren/mod_elm.py
index 4b8eb29..033b45c 100644
--- a/pyren/mod_elm.py
+++ b/pyren/mod_elm.py
@@ -136,7 +136,7 @@ class Port:
     else try to open serial port
     """
     
-    portType = 0  # 0-serial 1-tcp 2-androidBlueTooth
+    portType = 0  # 0-serial 1-tcp/bt 2-androidBlueTooth
     ipaddr = '192.168.0.10'
     tcpprt = 35000
     portName = ""
@@ -160,7 +160,20 @@ class Port:
         
         portName = portName.strip ()
 
-        if re.match (r"^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d{1,5}$", portName):
+        if re.match (r"^[0-9a-fA-F]{2}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2}$", portName):
+            try:
+                self.macaddr = portName
+                self.channel = 1
+                self.portType = 1
+                self.hdr = socket.socket (socket.AF_BLUETOOTH, socket.SOCK_STREAM, socket.BTPROTO_RFCOMM)
+                self.hdr.settimeout(10)
+                self.hdr.connect ((self.macaddr, self.channel))
+                self.hdr.setblocking (True)
+            except Exception, e:
+                print " \n\nERROR: Can not connect to Bluetooth ELM\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):
             try:
                 self.ipaddr, self.tcpprt = portName.split (':')
                 self.tcpprt = int (self.tcpprt)
@@ -217,11 +230,12 @@ class Port:
         '''
         if self.portType != 1: return
 
-        self.hdr.close()
-        self.hdr = socket.socket (socket.AF_INET, socket.SOCK_STREAM)
-        self.hdr.setsockopt (socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
-        self.hdr.connect ((self.ipaddr, self.tcpprt))
-        self.hdr.setblocking (True)
+        if not hasattr(self, 'macaddr'):
+          self.hdr.close()
+          self.hdr = socket.socket (socket.AF_INET, socket.SOCK_STREAM)
+          self.hdr.setsockopt (socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
+          self.hdr.connect ((self.ipaddr, self.tcpprt))
+          self.hdr.setblocking (True)
 
         self.write("AT\r")
         self.expect(">",1)
@@ -392,7 +406,7 @@ class Port:
             return
         
         if self.portType == 1:  # wifi is not supported
-            print "ERROR - wifi do not support changing boud rate"
+            print "ERROR - wifi/bluetooth do not support changing boud rate"
             return
         
         # stop any read/write