Merge pull request #449 from NordicSemiconductor/develop

Version 4.11.0

Author: philips77

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - iOSDFULibrary (4.10.4):
+  - iOSDFULibrary (4.11.0):
     - ZIPFoundation (= 0.9.11)
   - ZIPFoundation (0.9.11)
 
@@ -15,9 +15,9 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  iOSDFULibrary: 5d41d0ac69418d63755195db5f46e99588ae7d48
+  iOSDFULibrary: ca2a4da1f1680fe4957b0a33ad605c9e10f7ae7c
   ZIPFoundation: b1f0de4eed33e74a676f76e12559ab6b75990197
 
 PODFILE CHECKSUM: 16697609d795697cac6384a823bc962ccbddb9d0
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.10.2

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

@@ -56,7 +56,7 @@ let package = Package(
   dependencies: [
     .package(
       url: "https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library", 
-      .upToNextMajor(from: "<Desired Version, e.g. 4.10.4>")
+      .upToNextMajor(from: "<Desired Version, e.g. 4.11.0>")
     )
   ],
   targets: [.target(name: "<Your Target Name>", dependencies: ["NordicDFU"])]

Example/Pods/Manifest.lock

@@ -1,4 +1,13 @@
 ### Changelog
+- **4.11.0**
+   - Feature: Support for Abort op code added in Secure DFU (#447). 
+   - Improvement: More op codes added in Secure DFU in SDK 15 (#447).
+   - Improvement: Use connection timeout when reconnecting in DFU mode (#442).
+   - Bugfix: Handling missing error codes (#446).
+   - Bugfix: Handling invalid max object size (#443, #444).
+   - Other improvements (#445, #448).
+   - Read Object Info renamed to Select Object, like in DFU specification.
+   
 - **4.10.4**
    - Fix for compilation error in Xcode 13 related to change in iOS API (#433, #439).
    - Improvement: State validation (#434, #435, #437).

Example/Pods/Pods.xcodeproj/project.pbxproj

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name             = "iOSDFULibrary"
-  s.version          = "4.10.4"
-  s.summary          = "This repository contains a tested library for iOS 9+ devices to perform Device Firmware Update on the nRF5x devices"
+  s.version          = "4.11.0"
+  s.summary          = "This repository contains a library to perform Device Firmware Update on the nRF5x devices."
   s.description      = <<-DESC
 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.
                        DESC
@@ -11,7 +11,7 @@ The nRF5x Series chips are flash-based SoCs, and as such they represent the most
   s.authors          = { "Aleksander Nowakowski" => "[email protected]" }
   s.source           = { :git => "https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library.git", :tag => s.version.to_s }
   s.social_media_url = 'https://twitter.com/nordictweets'
-  s.swift_versions   = ['4.2', '5.0', '5.1', '5.2', '5.3', '5.4']
+  s.swift_versions   = ['4.2', '5.0', '5.1', '5.2', '5.3', '5.4', '5.5']
 
   s.ios.deployment_target = '9.0'
   s.osx.deployment_target = '10.14'

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

@@ -30,6 +30,22 @@
 
 import Foundation
 
+internal enum DFURemoteError : Int {
+    case legacy                      = 0
+    case secure                      = 10
+    case secureExtended              = 20
+    case buttonless                  = 90
+    case experimentalButtonless      = 9000
+    
+    func with(code: UInt8) -> DFUError {
+        // The force-unwrap here is used, as the only available codes
+        // that this method is called with are hardcoded in the library
+        // (ButtonlessDFU, DFUControlPoint, SecureDFUControlPoint)
+        // and, with the optional offset, will match an existing DFUError.
+        return DFUError(rawValue: Int(code) + rawValue)!
+    }
+}
+
 @objc public enum DFUError : Int {
     // Legacy DFU errors.
     case remoteLegacyDFUSuccess               = 1
@@ -52,6 +68,7 @@ import Foundation
 
     // This error will no longer be reported.
     case remoteSecureDFUExtendedError         = 21 // 10 + 11
+    
     // Instead, one of the extended errors below will used.
     case remoteExtendedErrorWrongCommandFormat   = 22 // 20 + 0x02
     case remoteExtendedErrorUnknownCommand       = 23 // 20 + 0x03
@@ -74,9 +91,12 @@ import Foundation
 
     // Buttonless DFU errors (received value + 90 as they overlap legacy
     // and secure DFU errors).
-    case remoteButtonlessDFUSuccess            = 91 // 90 + 1
-    case remoteButtonlessDFUOpCodeNotSupported = 92 // 90 + 2
-    case remoteButtonlessDFUOperationFailed    = 94 // 90 + 4
+    case remoteButtonlessDFUSuccess                     = 91 // 90 + 1
+    case remoteButtonlessDFUOpCodeNotSupported          = 92 // 90 + 2
+    case remoteButtonlessDFUOperationFailed             = 94 // 90 + 4
+    case remoteButtonlessDFUInvalidAdvertisementName    = 95 // 90 + 5
+    case remoteButtonlessDFUBusy                        = 96 // 90 + 6
+    case remoteButtonlessDFUNotBonded                   = 97 // 90 + 7
 
     /// Providing the DFUFirmware is required.
     case fileNotSpecified                     = 101