Skip to content

Commit 0ad1677

Browse files
authored
Merge pull request #421 from NordicSemiconductor/develop
Version 4.10.2
2 parents 2ef318a + bef46b2 commit 0ad1677

File tree

9 files changed

+49
-47
lines changed

9 files changed

+49
-47
lines changed

Example/Podfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- iOSDFULibrary (4.10.1):
2+
- iOSDFULibrary (4.10.2):
33
- ZIPFoundation (= 0.9.11)
44
- ZIPFoundation (0.9.11)
55

@@ -15,7 +15,7 @@ EXTERNAL SOURCES:
1515
:path: "../"
1616

1717
SPEC CHECKSUMS:
18-
iOSDFULibrary: 54dfe3f729cabc2250b0420147d0f864d76e7b54
18+
iOSDFULibrary: 1887af06ea6ad34a9ac40880cf5e8147674999b0
1919
ZIPFoundation: b1f0de4eed33e74a676f76e12559ab6b75990197
2020

2121
PODFILE CHECKSUM: 16697609d795697cac6384a823bc962ccbddb9d0

Example/Pods/Local Podspecs/iOSDFULibrary.podspec.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Manifest.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Target Support Files/iOSDFULibrary-iOS/iOSDFULibrary-iOS-Info.plist

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Target Support Files/iOSDFULibrary-macOS/iOSDFULibrary-macOS-Info.plist

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ let package = Package(
5656
dependencies: [
5757
.package(
5858
url: "https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library",
59-
.upToNextMajor(from: "<Desired Version, e.g. 4.10.1>")
59+
.upToNextMajor(from: "<Desired Version, e.g. 4.10.2>")
6060
)
6161
],
6262
targets: [.target(name: "<Your Target Name>", dependencies: ["NordicDFU"])]

changelog.md

+38-35
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,39 @@
11
### Changelog
2+
- **4.10.2**
3+
- Bugfix: Fixed compilation issue in Xcode 12.4 ([#417](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/417)).
4+
25
- **4.10.1**
3-
-Bugfix: A log message was incorrectly shown pointing to a solution to non-existing problem (#419).
6+
- Bugfix: A log message was incorrectly shown pointing to a solution to non-existing problem ([#419](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/419)).
47

58
- **4.10.0**
6-
- Improvement: Guarantee word-aligned writes to the packet characteristic (#366).
7-
- Improvement: Extended DFU Connection Timeout from 3 to 15 seconds (#411).
8-
- Warning fix: Fixed 'deprecated class keyword for protocol objects' (#410).
9+
- Improvement: Guarantee word-aligned writes to the packet characteristic ([#366](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/366)).
10+
- Improvement: Extended DFU Connection Timeout from 3 to 15 seconds ([#411](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/411)).
11+
- Warning fix: Fixed 'deprecated class keyword for protocol objects' ([#410](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/410)).
912
- Migration to Xcode 12.5 and Swift 5.4.
10-
- Support for Apple watchOS and tvOS on CocoaPods (#412).
11-
- Bigfix: Unwrapping optionals fixed (#413).
12-
- Bugfix: Truncating too long advertising names (#415).
13+
- Support for Apple watchOS and tvOS on CocoaPods ([#412](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/412)).
14+
- Bigfix: Unwrapping optionals fixed ([#413](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/413)).
15+
- Bugfix: Truncating too long advertising names ([#415](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/415)).
1316
- Improvement: Add links to Xamarin binding libraries (#389 and #401).
14-
- Improvement: Add syntax highlighting to readme (#402).
17+
- Improvement: Add syntax highlighting to readme ([#402](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/402)).
1518

1619
- **4.9.0**
1720
- ZIPFoundation version set to 0.9.11.
1821
- Migration to Swift 5.3.
19-
- Improvement: Reconnection timeout improvements (#386).
20-
- Improvement: Asynchronous firmware provider in the sample app (#387).
22+
- Improvement: Reconnection timeout improvements ([#386](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/386)).
23+
- Improvement: Asynchronous firmware provider in the sample app ([#387](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/387)).
2124

2225
- **4.8.0**
23-
- Feature: Option to force scanning for Legacy DFU bootloader after jumping using Buttonless Service (#374).
24-
- Feature: Option to set connection timeout (#369).
25-
- Feature: Option to set data object preparation delay (#377).
26+
- Feature: Option to force scanning for Legacy DFU bootloader after jumping using Buttonless Service ([#374](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/374)).
27+
- Feature: Option to set connection timeout ([#369](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/369)).
28+
- Feature: Option to set data object preparation delay ([#377](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/377)).
2629

2730
- **4.7.2**
28-
- Improvement: Report error when bluetooth is turned off (#371).
29-
- Bugfix: Fixed Carthage configuration (shared schemes) (#370).
31+
- Improvement: Report error when bluetooth is turned off ([#371](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/371)).
32+
- Bugfix: Fixed Carthage configuration (shared schemes) ([#370](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/370)).
3033

3134
- **4.7.1**
3235
- Bug fixed: A log message was added to help solve #365 issue.
33-
- Bug fixed: DFU will not proceed when setting alternative advertising name caused disconnection (#367).
36+
- Bug fixed: DFU will not proceed when setting alternative advertising name caused disconnection ([#367](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/367)).
3437
- Bug fixed: Tests for nRF52840 fixed.
3538

3639
- **4.7.0**
@@ -43,41 +46,41 @@
4346

4447
- **4.6.0**
4548
- Feature: Automatic retrying DFU on disconnection during update.
46-
- Bugfix: Some delegates were called on a wrong queue (#339).
49+
- Bugfix: Some delegates were called on a wrong queue ([#339](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/339)).
4750
- Bugfix: DFU from SDK 6.0 fixed. PRN is forced set to 1.
4851
- Improvement: The sample app has been modified to work on iOS 13.
4952

5053
- **4.5.1**
51-
- Bugfix: Fixed an issue where DFU could not be started on iOS 13 (#322).
54+
- Bugfix: Fixed an issue where DFU could not be started on iOS 13 ([#322](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/322)).
5255

5356
- **4.5.0**
5457
- Improvement: Hex2Bin converter rewritten to Swift 5.
5558
- Library released in Swift Package Manager (SPM).
5659

5760
- **4.4.2**
58-
- Bugfix: Missing buttonless service statuses added (#297).
59-
- Improvement: Added support for older Swift versions (#295).
61+
- Bugfix: Missing buttonless service statuses added ([#297](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/297)).
62+
- Improvement: Added support for older Swift versions ([#295](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/295)).
6063
- Improvement: ZIPFoundation dependency bound to 0.9.9.
6164

6265
- **4.4.1**
63-
- Bugfix: Fixed calculating number of bytes received from PRN (#288).
64-
- Improvement: ZIPFoundation dependency upgraded to 0.9.9 (#281).
66+
- Bugfix: Fixed calculating number of bytes received from PRN ([#288](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/288)).
67+
- Improvement: ZIPFoundation dependency upgraded to 0.9.9 ([#281](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/281)).
6568

6669
- **4.4.0**
6770
- Improvement: Swift 5.0 migration.
6871
- Improvement: New App Store icon added to supress the warning.
69-
- Bugfix: Fixed name conflict when adding the library manually (#293).
72+
- Bugfix: Fixed name conflict when adding the library manually ([#293](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/293)).
7073
- Bugfix: Fixed displaying total progress in the sample app.
7174

7275
- **4.3.0**
73-
- Improvement: Zip dependency switched to ZipFramework (#251).
74-
- Improvement: Dispatching delegates in designated queues (#249).
75-
- Improvement: Added option to disable resuming Secure DFU operation (#264).
76-
- Improvement: Attempt to send an App when SD+BL update failed with remote error (#266).
77-
- Improvement: Extended errors exposed (#262).
78-
- Bugfix: Fixed a crash during restarting DFU (#269).
79-
- Bugfix: Fixed resuming Secure DFU on SDK 15 (#270).
80-
- Bugfix: Typos in 2 error constants fixed (#263).
76+
- Improvement: Zip dependency switched to ZipFramework ([#251](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/251)).
77+
- Improvement: Dispatching delegates in designated queues ([#249](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/249)).
78+
- Improvement: Added option to disable resuming Secure DFU operation ([#264](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/264)).
79+
- Improvement: Attempt to send an App when SD+BL update failed with remote error ([#266](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/266)).
80+
- Improvement: Extended errors exposed ([#262](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/262)).
81+
- Bugfix: Fixed a crash during restarting DFU ([#269](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/269)).
82+
- Bugfix: Fixed resuming Secure DFU on SDK 15 ([#270](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/270)).
83+
- Bugfix: Typos in 2 error constants fixed ([#263](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/263)).
8184

8285
- **4.2.2**
8386
- Bugfix: Fixed issue #245 where operationFailed error messages where not reported in some cases.
@@ -158,19 +161,19 @@
158161
- **3.0.4**:
159162
- Feature: `restart()` method restored in `DFUServiceController`.
160163
- Bugfix: Fixed error reporting when Buttonless jump fails.
161-
- Bugfix: Crash on aborting when peripheral is changing (#72).
164+
- Bugfix: Crash on aborting when peripheral is changing ([#72](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/72)).
162165
- Enhancement: A lot of minor code improvements.
163166

164167
- **3.0.3**:
165-
- Documentation warning fixed (#68).
168+
- Documentation warning fixed ([#68](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/68)).
166169
- License changed to BSD 3-Clause in Podspec.
167170

168171
- **3.0.2**:
169-
- Bugfix: Ignoring updates from non-DFU characteristics (#66).
172+
- Bugfix: Ignoring updates from non-DFU characteristics ([#66](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/66)).
170173
- Enhancement: Log messages improved for connected devices.
171174

172175
- **3.0.1**:
173-
- Bugfix: Crash if DFU Characteristic isn't found (#64).
176+
- Bugfix: Crash if DFU Characteristic isn't found ([#64](https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library/issues/64)).
174177
- Bugfix: Discovering all services to determine mode for Legacy bootloaders without DFU Version char.
175178
- Enhancement: License changed to BSD 3-Clause.
176179

iOSDFULibrary.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "iOSDFULibrary"
3-
s.version = "4.10.1"
3+
s.version = "4.10.2"
44
s.summary = "This repository contains a tested library for iOS 9+ devices to perform Device Firmware Update on the nRF5x devices"
55
s.description = <<-DESC
66
The nRF5x Series chips are flash-based SoCs, and as such they represent the most flexible solution available. A key feature of the nRF5x Series and their associated software architecture and S-Series SoftDevices is the possibility for Over-The-Air Device Firmware Upgrade (OTA-DFU). See Figure 1. OTA-DFU allows firmware upgrades to be issued and downloaded to products in the field via the cloud and so enables OEMs to fix bugs and introduce new features to products that are already out on the market. This brings added security and flexibility to product development when using the nRF5x Series SoCs.

iOSDFULibrary/Classes/Implementation/SecureDFU/Characteristics/ButtonlessDFU.swift

+1-2
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,7 @@ internal class ButtonlessDFU : NSObject, CBPeripheralDelegate, DFUCharacteristic
284284
}
285285

286286
// Parse response received.
287-
let dfuResponse = ButtonlessDFUResponse(characteristicValue)
288-
guard let dfuResponse = dfuResponse else {
287+
guard let dfuResponse = ButtonlessDFUResponse(characteristicValue) else {
289288
logger.e("Unknown response received: 0x\(characteristicValue.hexString)")
290289
report?(.unsupportedResponse, "Unsupported response received: 0x\(characteristicValue.hexString)")
291290
return

0 commit comments

Comments
 (0)