Release 2.4.2

SiliconLabs · Feb 10, 2022 · 1d31702 · 1d31702
1 parent 3b1eefd
commit 1d31702
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 19 deletions.
diff --git a/SiliconLabsApp.xcodeproj/project.pbxproj b/SiliconLabsApp.xcodeproj/project.pbxproj
@@ -6624,7 +6624,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_RESOURCE_RULES_PATH = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 45;
+				CURRENT_PROJECT_VERSION = 46;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 52444FG85C;
 				DISPLAY_NAME = "EFR Connect";
@@ -6634,7 +6634,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.4.1;
+				MARKETING_VERSION = 2.4.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.silabs.BlueGeckoDemoApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -6658,7 +6658,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_RESOURCE_RULES_PATH = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 45;
+				CURRENT_PROJECT_VERSION = 46;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 52444FG85C;
 				DISPLAY_NAME = "EFR Connect";
@@ -6667,7 +6667,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.4.1;
+				MARKETING_VERSION = 2.4.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.silabs.BlueGeckoDemoApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/SiliconLabsApp/Models/Browser/SILBrowserDescriptorValueParser.swift b/SiliconLabsApp/Models/Browser/SILBrowserDescriptorValueParser.swift
@@ -75,26 +75,26 @@ class SILBrowserDescriptorValueParser: NSObject {
     }
 
     private func getEnvironmentalSensingConfiguration(bytes: [UInt8]) -> String {
-        let firstByte = uint8ToInt(bytes[0])
+        let lastByte = uint8ToInt(bytes.last!)
 
-        switch (firstByte) {
+        switch (lastByte) {
         case 0: return "Boolean AND"
         case 1: return "Boolean OR"
         default: return "Unknown value: 0x\(bytesToHexString(bytes))"
         }
     }
 
     private func getCharacteristicExtendedProperties(bytes: [UInt8]) -> String {
-        let firstByte = bytes[0]
+        let lastByte = bytes.last!
         var result = ""
 
-        if firstByte & 0b0000_0001 == 1 {
+        if lastByte & 0b0000_0001 == 1 {
             result.append("Reliable Write enabled, ")
         } else {
             result.append("Reliable Write disabled, ")
         }
 
-        if firstByte & 0b0000_0010 == 2 {
+        if lastByte & 0b0000_0010 == 2 {
             result.append("Writable Auxiliaries enabled, ")
         } else {
             result.append("Writable Auxiliaries disabled, ")
@@ -112,16 +112,16 @@ class SILBrowserDescriptorValueParser: NSObject {
     }
 
     private func getClientCharacteristicConfiguration(bytes: [UInt8]) -> String {
-        let firstByte = bytes[0]
+        let lastByte = bytes[bytes.count - 1]
         var result = ""
 
-        if firstByte & 0b0000_0001 == 1 {
+        if lastByte & 0b0000_0001 == 1 {
             result.append("Notifications enabled, ")
         } else {
             result.append("Notifications disabled, ")
         }
 
-        if firstByte & 0b0000_0010 == 2 {
+        if lastByte & 0b0000_0010 == 2 {
             result.append("Indications enabled, ")
         } else {
             result.append("Indications disabled, ")
@@ -135,13 +135,13 @@ class SILBrowserDescriptorValueParser: NSObject {
     }
 
     private func getServerCharacteristicConfiguration(bytes: [UInt8]) -> String {
-        let firstByte = bytes[0]
+        let lastByte = bytes.last!
 
-        return firstByte & 0b0000_0001 == 1 ? "Broadcasts enabled" : "Broadcasts disabled"
+        return lastByte & 0b0000_0001 == 1 ? "Broadcasts enabled" : "Broadcasts disabled"
     }
 
     private func getNumberOfDigitals(bytes: [UInt8]) -> String {
-        let intValue = uint8ToInt(bytes[0])
+        let intValue = uint8ToInt(bytes.last!)
         return String(intValue)
     }
 

diff --git a/SiliconLabsApp/SupportingFiles/BlueGecko/Info.plist b/SiliconLabsApp/SupportingFiles/BlueGecko/Info.plist
@@ -80,7 +80,7 @@
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>Location required for use of Retail Beacons.</string>
 	<key>NSPhotoLibraryUsageDescription</key>
-	<string>Apple thinks the app accesses the user&apos;s photos but we don&apos;t know why.</string>
+	<string>Apple thinks the app accesses the user's photos but we don't know why.</string>
 	<key>UIAppFonts</key>
 	<array>
 		<string>Roboto-Black.ttf</string>

diff --git a/SiliconLabsApp/ThunderBoard/DeviceSupport/BLE Module/BleManager.swift b/SiliconLabsApp/ThunderBoard/DeviceSupport/BLE Module/BleManager.swift
@@ -220,16 +220,17 @@ class BleManager: NSObject, CBCentralManagerDelegate, DeviceScanner, DeviceConne
     func centralManager(_ central: CBCentralManager, didDiscover peripheral: CBPeripheral, advertisementData: [String : Any], rssi RSSI: NSNumber) {
         // RSSI value 127 is Apple-reserved and indicates the RSSI value could not be read.
         guard RSSI.intValue != 127,
-            let peripheralName = advertisementData[CBAdvertisementDataLocalNameKey] as? String,
-            let manufacturerData = advertisementData[CBAdvertisementDataManufacturerDataKey] as? Data else {
+              let peripheralName = advertisementData[CBAdvertisementDataLocalNameKey] as? String else {
             return
         }
 
         let device = bleDeviceForPeripheral(peripheral)
 
         device.name = peripheralName
         device.RSSI = RSSI.intValue
-        device.manufacturerData = manufacturerData
+        if let manufacturerData = advertisementData[CBAdvertisementDataManufacturerDataKey] as? Data {
+            device.manufacturerData = manufacturerData
+        }
 
         if device.advertisementDataLocalName == nil {
             device.advertisementDataLocalName = peripheralName

diff --git a/SiliconLabsApp/ViewControllers/DebugApp/ServicesTable/SILDebugCharacteristicTableViewCell.m b/SiliconLabsApp/ViewControllers/DebugApp/ServicesTable/SILDebugCharacteristicTableViewCell.m
@@ -199,6 +199,7 @@ - (IBAction)handleIndicateViewTap:(id)sender {
         [self.characteristicTableModel expandFieldIfNeeded];
     }
     [self.delegate cell:self didRequestIndicateForCharacteristic:self.characteristic withValue:newNotifyingValue];
+    [self prepareClientCharacteristicConfigurationDescriptorModelToUpdateCell];
 }
 
 - (IBAction)handleNotifyViewTap:(id)sender {
@@ -208,6 +209,7 @@ - (IBAction)handleNotifyViewTap:(id)sender {
         [self.characteristicTableModel expandFieldIfNeeded];
     }
     [self.delegate cell:self didRequestNotifyForCharacteristic:self.characteristic withValue:newNotifyingValue];
+    [self prepareClientCharacteristicConfigurationDescriptorModelToUpdateCell];
 }
 
 - (IBAction)editName:(UIButton *)sender {
@@ -216,6 +218,15 @@ - (IBAction)editName:(UIButton *)sender {
     }
 }
 
+- (void)prepareClientCharacteristicConfigurationDescriptorModelToUpdateCell {
+    for (SILDescriptorTableModel* descriptorModel in self.descriptorModels) {
+        if ([descriptorModel.uuidString isEqual:CBUUIDClientCharacteristicConfigurationString]) {
+            descriptorModel.shouldReadValue = YES;
+            break;
+        }
+    }
+}
+
 // MARK: UITableViewDataSource
 
 - (NSInteger)tableView:(nonnull UITableView *)tableView numberOfRowsInSection:(NSInteger)section {

diff --git a/SiliconLabsApp/ViewControllers/DebugApp/ServicesTable/SILDebugServicesViewController.m b/SiliconLabsApp/ViewControllers/DebugApp/ServicesTable/SILDebugServicesViewController.m
@@ -770,10 +770,22 @@ - (void)cell:(SILDebugCharacteristicTableViewCell *)cell didRequestWriteForChara
 
 - (void)cell:(SILDebugCharacteristicTableViewCell *)cell didRequestNotifyForCharacteristic:(CBCharacteristic *)characteristic withValue:(BOOL)value {
     [self.peripheral setNotifyValue:value forCharacteristic:characteristic];
+    [self updateClientCharacteristicConfigurationDescriptorValueForCharacteristic:characteristic];
 }
 
 - (void)cell:(SILDebugCharacteristicTableViewCell *)cell didRequestIndicateForCharacteristic:(CBCharacteristic *)characteristic withValue:(BOOL)value {
     [self.peripheral setNotifyValue:value forCharacteristic:characteristic];
+    [self updateClientCharacteristicConfigurationDescriptorValueForCharacteristic:characteristic];
+}
+
+- (void)updateClientCharacteristicConfigurationDescriptorValueForCharacteristic:(CBCharacteristic *)characteristic {
+    for (CBDescriptor *descriptor in characteristic.descriptors) {
+        if ([descriptor.UUID.UUIDString isEqual:CBUUIDClientCharacteristicConfigurationString]) {
+            [self.peripheral readValueForDescriptor:descriptor];
+            break;
+        }
+    }
+    [self refreshTable];
 }
 
 #pragma mark = SILDescriptorsTableViewCellDelegate