Minor fixes.

RedBearLab · Apr 17, 2014 · 67ba6b9 · 67ba6b9
1 parent 50867bc
commit 67ba6b9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/Examples/BLEChat_Central_OSX/BLEChat_Central_OSX/BLE/BLE.m b/Examples/BLEChat_Central_OSX/BLEChat_Central_OSX/BLE/BLE.m
@@ -203,8 +203,6 @@ - (int) findBLEPeripherals:(int) timeout
 
 - (void)centralManager:(CBCentralManager *)central didDisconnectPeripheral:(CBPeripheral *)peripheral error:(NSError *)error;
 {
-    done = false;
-
     [[self delegate] bleDidDisconnect];
 
     isConnected = false;
@@ -458,11 +456,8 @@ - (void)centralManager:(CBCentralManager *)central didConnectPeripheral:(CBPerip
 
     self.activePeripheral = peripheral;
     [self.activePeripheral discoverServices:nil];
-    [self getAllServicesFromPeripheral:peripheral];
 }
 
-static bool done = false;
-
 - (void)peripheral:(CBPeripheral *)peripheral didDiscoverCharacteristicsForService:(CBService *)service error:(NSError *)error
 {
     if (!error)
@@ -477,13 +472,9 @@ - (void)peripheral:(CBPeripheral *)peripheral didDiscoverCharacteristicsForServi
 
             if ([service.UUID isEqual:s.UUID])
             {
-                if (!done)
-                {
-                    [self enableReadNotification:activePeripheral];
-                    [[self delegate] bleDidConnect];
-                    isConnected = true;
-                    done = true;
-                }
+                [self enableReadNotification:activePeripheral];
+                [[self delegate] bleDidConnect];
+                isConnected = true;
 
                 break;
             }

diff --git a/Examples/BLEChat_Central_OSX/BLEChat_Central_OSX/Base.lproj/MainMenu.xib b/Examples/BLEChat_Central_OSX/BLEChat_Central_OSX/Base.lproj/MainMenu.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -743,4 +743,4 @@
         </customObject>
         <customObject id="420" customClass="NSFontManager"/>
     </objects>
-</document>
+</document>
diff --git a/Examples/BLEChat_Central_OSX/BLEChat_Central_OSX/RBLAppDelegate.m b/Examples/BLEChat_Central_OSX/BLEChat_Central_OSX/RBLAppDelegate.m
@@ -38,6 +38,8 @@ -(void) bleDidConnect
 
     btnConnect.title = @"Disconnect";
     [indConnect stopAnimation:self];
+
+    [ble readRSSI];
 }
 
 - (void)bleDidDisconnect