Clean up.

Author: Cheong2K

.gitignore

@@ -0,0 +1,4 @@
+contents.xcworkspacedata
+Examples/BLE RGB/BLE RGB.xcodeproj/project.xcworkspace/xcuserdata
+xcuserdata
+project.xcworkspace

Examples/BLE Select/BLE/BLE.m

@@ -201,8 +201,6 @@ - (int) findBLEPeripherals:(int) timeout
 
 - (void)centralManager:(CBCentralManager *)central didDisconnectPeripheral:(CBPeripheral *)peripheral error:(NSError *)error;
 {
-    done = false;
-
     [[self delegate] bleDidDisconnect];
 
     isConnected = false;
@@ -456,11 +454,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)
@@ -475,13 +470,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;
             }

Examples/BLEChat_Central_iOS/BLE/BLE.m

@@ -1,7 +1,7 @@
 
 /*
  
- Copyright (c) 2013 RedBearLab
+ Copyright (c) 2013-2014 RedBearLab
  
  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
  
@@ -204,8 +204,6 @@ - (int) findBLEPeripherals:(int) timeout
 
 - (void)centralManager:(CBCentralManager *)central didDisconnectPeripheral:(CBPeripheral *)peripheral error:(NSError *)error;
 {
-    done = false;
-
     [[self delegate] bleDidDisconnect];
 
     isConnected = false;
@@ -462,11 +460,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)
@@ -481,13 +476,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;
             }

Examples/BLEChat_Central_iOS/SimpleChat/RBLViewController.m

@@ -114,6 +114,8 @@ -(void) bleDidConnect
     [activityIndicator stopAnimating];
     self.navigationItem.leftBarButtonItem.enabled = YES;
     [self.navigationItem.leftBarButtonItem setTitle:@"Disconnect"];
+    
+    NSLog(@"bleDidConnect");
 }
 
 - (void)didReceiveMemoryWarning

Examples/SimpleControls_iOS/SimpleControls/BLE/BLE.m

@@ -201,8 +201,6 @@ - (int) findBLEPeripherals:(int) timeout
 
 - (void)centralManager:(CBCentralManager *)central didDisconnectPeripheral:(CBPeripheral *)peripheral error:(NSError *)error;
 {
-    done = false;
-
     [[self delegate] bleDidDisconnect];
 
     isConnected = false;
@@ -456,11 +454,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)
@@ -475,13 +470,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;
             }