Merge pull request #115 from NordicSemiconductor/release/5.0.4

Fix of the issue in UART where long message wasn't sent.
NordicSemiconductor · Aug 31, 2021 · 253c56a · 253c56a
2 parents ac2d70d + c260ec0
commit 253c56a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 19 deletions.
diff --git a/nRF Toolbox.xcodeproj/project.pbxproj b/nRF Toolbox.xcodeproj/project.pbxproj
@@ -2323,7 +2323,7 @@
 					"$(PROJECT_DIR)",
 					"$(PODS_ROOT)",
 				);
-				MARKETING_VERSION = 5.0.3;
+				MARKETING_VERSION = 5.0.4;
 				NEW_SETTING = "";
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
@@ -2490,7 +2490,7 @@
 					"$(PROJECT_DIR)",
 					"$(PODS_ROOT)",
 				);
-				MARKETING_VERSION = 5.0.3;
+				MARKETING_VERSION = 5.0.4;
 				NEW_SETTING = "";
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
@@ -2541,7 +2541,7 @@
 					"$(PROJECT_DIR)",
 					"$(PODS_ROOT)",
 				);
-				MARKETING_VERSION = 5.0.3;
+				MARKETING_VERSION = 5.0.4;
 				NEW_SETTING = "";
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (

diff --git a/nRF Toolbox.xcworkspace/contents.xcworkspacedata b/nRF Toolbox.xcworkspace/contents.xcworkspacedata
diff --git a/nRF Toolbox/BluetoothManager/BluetoothManager.swift b/nRF Toolbox/BluetoothManager/BluetoothManager.swift
@@ -184,7 +184,7 @@ class BluetoothManager: NSObject, CBPeripheralDelegate, CBCentralManagerDelegate
 
         // Check what kind of Write Type is supported. By default it will try Without Response.
         // If the RX charactereisrtic have Write property the Write Request type will be used.
-        let type: CBCharacteristicWriteType = uartRXCharacteristic.properties.contains(.write) ? .withResponse : .withoutResponse
+        let type: CBCharacteristicWriteType = uartRXCharacteristic.properties.contains(.writeWithoutResponse) ? .withoutResponse : .withResponse
         let mtu  = bluetoothPeripheral?.maximumWriteValueLength(for: type) ?? 20
 
         // The following code will split the text into packets
@@ -231,16 +231,16 @@ class BluetoothManager: NSObject, CBPeripheralDelegate, CBCentralManagerDelegate
 
         // Check what kind of Write Type is supported. By default it will try Without Response.
         // If the RX characteristic have Write property the Write Request type will be used.
-        let type: CBCharacteristicWriteType = uartRXCharacteristic.properties.contains(.write) ? .withResponse : .withoutResponse
+        let type: CBCharacteristicWriteType = uartRXCharacteristic.properties.contains(.writeWithoutResponse) ? .withoutResponse : .withResponse
         let mtu = bluetoothPeripheral?.maximumWriteValueLength(for: type) ?? 20
 
         let data = aCommand.data.split(by: mtu)
+        log(withLevel: .verbose, andMessage: "Writing to characteristic: \(uartRXCharacteristic.uuid.uuidString)")
+        let typeAsString = type == .withoutResponse ? ".withoutResponse" : ".withResponse"
         data.forEach {
             self.bluetoothPeripheral!.writeValue($0, for: uartRXCharacteristic, type: type)
+            log(withLevel: .debug, andMessage: "peripheral.writeValue(0x\($0.hexString), for: \(uartRXCharacteristic.uuid.uuidString), type: \(typeAsString))")
         }
-        log(withLevel: .verbose, andMessage: "Writing to characteristic: \(uartRXCharacteristic.uuid.uuidString)")
-        let typeAsString = type == .withoutResponse ? ".withoutResponse" : ".withResponse"
-        log(withLevel: .debug, andMessage: "peripheral.writeValue(0x\(aCommand.data.hexString), for: \(uartRXCharacteristic.uuid.uuidString), type: \(typeAsString))")
         log(withLevel: .application, andMessage: "Sent command: \(aCommand.title)")
 
     }

diff --git a/nRF Toolbox/Profiles/UART/UARTTabBarController.swift b/nRF Toolbox/Profiles/UART/UARTTabBarController.swift
@@ -73,7 +73,7 @@ class UARTTabBarController: UITabBarController {
     private var emptyView: InfoActionView!
     let btManager = BluetoothManager()
     private lazy var bSettings: InfoActionView.ButtonSettings = ("Connect", { [unowned self] in
-        let scanner = PeripheralScanner(services: nil)
+        let scanner = PeripheralScanner(services: [CBUUID(string: ServiceIdentifiers.uartServiceUUIDString)])
         let vc = ConnectionViewController(scanner: scanner)
         vc.delegate = self
         let nc = UINavigationController.nordicBranded(rootViewController: vc)