merge SensiBots-master

RFduino · RFduino · commit bdf037baff2d · 2015-04-14T17:13:36.000-06:00
diff --git a/iPhone Apps/rfduino/RFduino.h b/iPhone Apps/rfduino/RFduino.h
@@ -55,7 +55,6 @@ extern NSString *customUUID;
 @property(strong, nonatomic) RFduinoManager *rfduinoManager;
 
 @property(strong, nonatomic) NSString *name;
-@property(strong, nonatomic) NSString *UUID;
 @property(strong, nonatomic) NSData *advertisementData;
 @property(strong, nonatomic) NSNumber *advertisementRSSI;
 @property(assign, nonatomic) NSInteger advertisementPackets;
diff --git a/iPhone Apps/rfduino/RFduino.m b/iPhone Apps/rfduino/RFduino.m
@@ -90,7 +90,6 @@ @implementation RFduino
 @synthesize peripheral;
 
 @synthesize name;
-@synthesize UUID;
 @synthesize advertisementData;
 @synthesize advertisementRSSI;
 @synthesize advertisementPackets;
diff --git a/iPhone Apps/rfduino/RfduinoManager.m b/iPhone Apps/rfduino/RfduinoManager.m
@@ -214,14 +214,6 @@ - (void)centralManager:(CBCentralManager *)central didDiscoverPeripheral:(CBPeri
 {
     // NSLog(@"didDiscoverPeripheral");
 
-    NSString *uuid = NULL;
-    if ([peripheral.identifier.UUIDString length] > 0) {
-        // only returned if you have connected to the device before
-        uuid = peripheral.identifier.UUIDString;
-    } else {
-        uuid = @"";
-    }
-    
     bool added = false;
 
     RFduino *rfduino = [self rfduinoForPeripheral:peripheral];
@@ -231,7 +223,6 @@ - (void)centralManager:(CBCentralManager *)central didDiscoverPeripheral:(CBPeri
         rfduino.rfduinoManager = self;
 
         rfduino.name = peripheral.name;
-        rfduino.UUID = uuid;
         
         rfduino.peripheral = peripheral;
         
diff --git a/iPhone Apps/rfduino/ScanViewController.m b/iPhone Apps/rfduino/ScanViewController.m
@@ -132,9 +132,6 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     if (rfduino.outOfRange) {
         start = [UIColor colorWithRed:160/255.0 green:160/255.0 blue:160/255.0 alpha:0.8];
         stop = [UIColor colorWithRed:160/255.0 green:160/255.0 blue:160/255.0 alpha:0.2];
-    } else if (! rfduino.UUID.length) {
-        start = [UIColor colorWithRed:224/255.0 green:242/255.0 blue:224/255.0 alpha: 1.0];
-        stop = [UIColor colorWithRed:224/255.0 green:242/255.0 blue:224/255.0 alpha: 0.7];
     } else {
         start = [UIColor colorWithRed:253/255.0 green:255/255.0 blue:255/255.0 alpha: 1.0];
         stop = [UIColor colorWithRed:253/255.0 green:255/255.0 blue:255/255.0 alpha: 0.7];
@@ -147,8 +144,6 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     
     NSString *text = [[NSString alloc] initWithFormat:@"%@", rfduino.name];
     
-    NSString *uuid = rfduino.UUID;
-    
     int rssi = rfduino.advertisementRSSI.intValue;
 
     NSString *advertising = @"";
@@ -162,7 +157,6 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         [detail appendString:@" "];
     [detail appendFormat:@"Packets: %d\n", rfduino.advertisementPackets];
     [detail appendFormat:@"Advertising: %@\n", advertising];
-    [detail appendFormat:@"%@", uuid];
     
     cell.textLabel.text = text;
     cell.detailTextLabel.text = detail;
