Release 2.0.2

SiliconLabs · May 8, 2020 · 3f0a045 · 3f0a045
1 parent 9ffaa10
commit 3f0a045
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ The app is divided into two main functional areas, the demo and the develop view
 
 The demo view lists a number of demos that are meant for quickly testing some of the sample apps in the Silicon Labs Bluetooth SDK. The currently supported demos are:
 
-- **Health Thermometer demo:** Connects to an EFR32/BGM device running the soc-thermometer sample application from the Bluetooth SDK and displays the temperature read from the SI7021 sensor on the WSTK mainboard.
+- **Health Thermometer demo:** Connects to an EFR32/BGM device running the soc-thermometer sample application from the Bluetooth SDK and displays the temperature read from the SI7021 sensor on the WSTK mainboard. 
 
 The develop view contains functionalities focused on helping developers create and troubleshoot their Bluetooth applications based on EFR32/BGM devices. The currently supported functionalities are:
 
@@ -27,7 +27,7 @@ The develop view contains functionalities focused on helping developers create a
     - Device name
     - Raw advertisement data
     - RSSI
-    - Beacon type (iBeacon, Eddystone, AtlBeacon)
+    - Beacon type (iBeacon, Eddystone, AltBeacon)
     - Favorites only
     - Connectable only
   - Option to save filters for later use

diff --git a/SiliconLabsApp.xcodeproj/project.pbxproj b/SiliconLabsApp.xcodeproj/project.pbxproj
@@ -3489,7 +3489,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_RESOURCE_RULES_PATH = "";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 23;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 52444FG85C;
 				DISPLAY_NAME = "EFR Connect";
@@ -3499,7 +3499,7 @@
 				INFOPLIST_FILE = "$(SRCROOT)/SiliconLabsApp/SupportingFiles/BlueGecko/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.0.1;
+				MARKETING_VERSION = 2.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.silabs.BlueGeckoDemoApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "Blue Gecko Development";
@@ -3523,7 +3523,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_RESOURCE_RULES_PATH = "";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 23;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 52444FG85C;
 				DISPLAY_NAME = "EFR Connect";
@@ -3532,7 +3532,7 @@
 				INFOPLIST_FILE = "$(SRCROOT)/SiliconLabsApp/SupportingFiles/BlueGecko/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.0.1;
+				MARKETING_VERSION = 2.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.silabs.BlueGeckoDemoApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "Blue Gecko Development";

diff --git a/SiliconLabsApp/BluetoothControllers/SILCentralManager.m b/SiliconLabsApp/BluetoothControllers/SILCentralManager.m
@@ -326,14 +326,25 @@ - (void)centralManager:(CBCentralManager *)central didDiscoverPeripheral:(CBPeri
 }
 
 - (BOOL)isProbablyIBeacon:(NSDictionary*)advertisementData {
-    if ([advertisementData.allKeys containsObject:CBAdvertisementDataManufacturerDataKey]) {
-        return NO;
-    } else {
-        if ([advertisementData[CBAdvertisementDataIsConnectable] boolValue] == YES) {
+    const NSArray* nonIBeaconKeys = @[CBAdvertisementDataManufacturerDataKey,
+                                      CBAdvertisementDataLocalNameKey,
+                                      CBAdvertisementDataServiceDataKey,
+                                      CBAdvertisementDataServiceUUIDsKey,
+                                      CBAdvertisementDataOverflowServiceUUIDsKey,
+                                      CBAdvertisementDataTxPowerLevelKey,
+                                      CBAdvertisementDataSolicitedServiceUUIDsKey];
+
+    for (int i = 0; i < nonIBeaconKeys.count; i++) {
+        if ([advertisementData.allKeys containsObject:nonIBeaconKeys[i]]) {
             return NO;
         }
-        return YES;
     }
+
+    if ([advertisementData[CBAdvertisementDataIsConnectable] boolValue] == YES) {
+        return NO;
+    }
+
+    return YES;
 }
 
 - (double)getTimestampWithAdvertisementData:(NSDictionary *)advertisementData {