Feature mac dev

lib/mac/BTSerialPortBinding.mm

@@ -56,31 +56,22 @@
 
 int BTSerialPortBinding::Connect()
 {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-    NSString *addressString = [NSString stringWithCString:address.c_str() encoding:NSASCIIStringEncoding];
-    BluetoothWorker *worker = [BluetoothWorker getInstance];
-    // create pipe to communicate with delegate
-
-    pipe_t *pipe = pipe_new(sizeof(unsigned char), 0);
-	int status;
+    NSString *nsId = [NSString stringWithCString:address.c_str() encoding:NSASCIIStringEncoding];
 
-    IOReturn result = [worker connectDevice: addressString onChannel:channelID withPipe:pipe];
 
-    if (result == kIOReturnSuccess) {
-        pipe_consumer_t *c = pipe_consumer_new(pipe);
+  IOBluetoothDevice *device = nil;
+  device = [IOBluetoothDevice deviceWithAddressString:nsId];
+    NSArray *recentDevices = [IOBluetoothDevice recentDevices:0];
 
-        // save consumer side of the pipe
-        data->consumer = c;
-        status = 0;
-    } else {
-        status = 1;
+    NSArray *byName = [recentDevices filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"name == %@", nsId]];
+    if (byName.count > 0) {
+      device = byName.firstObject;
     }
+    if ([device openConnection] != kIOReturnSuccess) {
+            return -1;
+          }
 
-    pipe_free(pipe);
-    [pool release];
-
-
-    return status;
+    return 0;
 }
 
 void BTSerialPortBinding::Close()
@@ -97,22 +88,22 @@
         cout << "Socket closed as data consumer is null" << endl;
         throw ExploreIOException("BT socket is closed!");
     }
-    
+
 
 	if (buffer == nullptr)
 	return;
 
     size_buffer = -1;
-    
+
     size_buffer = pipe_pop_eager(data->consumer, buffer, *length);
-    
+
     if (size_buffer == 0) {
         pipe_consumer_free(data->consumer);
         data->consumer = NULL;
         cout << "Possible socket closure, raising IO Exception" << endl;
         throw ExploreIOException("BT socket is closed!");
-        
-        
+
+
     }
     if(size_buffer < *length){
         if(isSocketClosed){
@@ -126,7 +117,7 @@
     }
 
     // when no data is read from rfcomm the connection has been closed.
-    
+
 }
 
 void BTSerialPortBinding::Write(const char *buffer, int length)

setup.py

@@ -78,6 +78,15 @@ def read(*names, **kwargs):
             extra_link_args=["-lbluetooth"],
             swig_opts=['-c++']
         ))
+    else:
+        if sys.version_info >= (3, 7):
+            my_req.append('pyobjc-core>=6')
+            my_req.append('pyobjc-framework-Cocoa>=6')
+        else:
+            my_req.append('pyobjc-core>=3.1,<6')
+            my_req.append('pyobjc-framework-Cocoa>=3.1,<6')
+        os.system('cp  lib/mac/_exploresdk.so  src/explorepy')
+        os.system('cp  lib/mac/exploresdk.py  src/explorepy')
 setup(
     name='explorepy',
     version='2.0.0',

src/explorepy/__init__.py

@@ -23,11 +23,11 @@
 __version__ = '2.0.0'
 
 this = sys.modules[__name__]
+from . import exploresdk
 list_sdk = ['sdk', 'mock', 'pyserial']
 if sys.platform == 'darwin':
     this._bt_interface = 'pyserial'
 else:
-    from . import exploresdk
     this._bt_interface = 'sdk'
 
 if not sys.version_info >= (3, 6):