Skip to content

Commit d23f109

Browse files
philips77philips77
authored
Merge pull request #350 from NordicSemiconductor/develop
Version 4.6.1
2 parents d8d32fe + 9cda0e5 commit d23f109

35 files changed

+86
-23
lines changed

‎Example/Pods/Pods.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/iOSDFULibrary/DFU Test Performer/nRF52832TestSet.swift‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,31 @@ class nRF52832TestSet: DFUTestSet {
3636
// Firmwares used for testing DFU on nRF52832 DK
3737
var steps: [(firmware: DFUFirmware, options: ServiceModifier?, expectedError: DFUError?, description: String, next: Filter?)]? {
3838
return try? [
39-
// Files with 'bl' must be uploaded in the correct order, as each next version mu must have bl_version greater then the last one.
39+
// Files with 'bl' must be uploaded in the correct order, as each next version must have bl_version greater then the last one.
4040

4141
// Update from SDK 11 to 12.x is not working despite the 11th BL was compiled to match the start address of Secure DFU.
4242
// New BL erases some memory from the new SD when started (addresses 0xE000 -> 0xE7F0)
4343
// Let's start from SDK 12.2 then.
4444
(DFUFirmware.from(zip: "nrf52832_sdk_12.2_app" , locatedIn: "Firmwares/nRF52832"),
4545
Option.experimentalButtonlessEnabled, nil, "Flashing app from SDK 12.2", FilterBy.name("DFU2A122")),
46+
47+
// Updating to SDK 13.
4648
(DFUFirmware.from(zip: "nrf52832_sdk_12.2_to_13_all_in_one", locatedIn: "Firmwares/nRF52832"),
4749
Option.experimentalButtonlessEnabled, nil, "Upgrading to SDK 13", FilterBy.name("DFU2A13")),
4850
(DFUFirmware.from(zip: "nrf52832_sdk_13_app" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating app from SDK 13", FilterBy.name("DFU2A13")),
51+
4952
// In SDK 14 there was a bug releated to SD size. As SD size increased from pre-14 to 14 it is not possible to update without a fix that was added in SDK 14.1.
5053
// Here we can just skip this version and upgrade directly to 14.1.
54+
55+
// Updating to SDK 14.1.
5156
(DFUFirmware.from(zip: "nrf52832_sdk_13_to_14.1_all_in_one", locatedIn: "Firmwares/nRF52832"), nil, nil, "Upgrading to SDK 14.1", FilterBy.name("DFU2A141")),
5257
(DFUFirmware.from(zip: "nrf52832_sdk_14.1_app" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating app", FilterBy.name("DFU2A141")),
5358
// The following steps may be removed without any harm if more SDKs are added.
5459
(DFUFirmware.from(zip: "nrf52832_sdk_14.1_sd" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating SD only", FilterBy.name("DFU2A141")),
5560
(DFUFirmware.from(zip: "nrf52832_sdk_14.1_sd_bl_1" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating SD+BL", FilterBy.name("DFU2A141")),
5661
(DFUFirmware.from(zip: "nrf52832_sdk_14.1_bl_2" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating BL only", FilterBy.name("DFU2A141")),
5762
(DFUFirmware.from(zip: "nrf52832_sdk_14.1_sd_bl_app_3" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating SD+BL+App", FilterBy.name("DFU2A141")),
63+
5864
// Updating to SDK 15.
5965
(DFUFirmware.from(zip: "nrf52832_sdk_14.1_to_15_all_in_one", locatedIn: "Firmwares/nRF52832"), nil, nil, "Upgrading to SDK 15", FilterBy.name("DFU2A15")),
6066
(DFUFirmware.from(zip: "nrf52832_sdk_15_app" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating app", FilterBy.name("DFU2A15")),
@@ -63,14 +69,33 @@ class nRF52832TestSet: DFUTestSet {
6369
(DFUFirmware.from(zip: "nrf52832_sdk_15_sd_bl_1" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating SD+BL", FilterBy.name("DFU2A15")),
6470
(DFUFirmware.from(zip: "nrf52832_sdk_15_bl_2" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating BL only", FilterBy.name("DFU2A15")),
6571
(DFUFirmware.from(zip: "nrf52832_sdk_15_sd_bl_app_3" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating SD+BL+App", FilterBy.name("DFU2A15")),
72+
6673
// Updating to SDK 15.2.
6774
(DFUFirmware.from(zip: "nrf52832_sdk_15_to_15.2_all_in_one", locatedIn: "Firmwares/nRF52832"), nil, nil, "Upgrading to SDK 15.2", FilterBy.name("DFU2A152")),
6875
(DFUFirmware.from(zip: "nrf52832_sdk_15.2_app" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating app", FilterBy.name("DFU2A152")),
6976
// The following steps may be removed without any harm if more SDKs are added.
7077
(DFUFirmware.from(zip: "nrf52832_sdk_15.2_sd" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating SD only", FilterBy.name("DFU2A152")),
7178
(DFUFirmware.from(zip: "nrf52832_sdk_15.2_sd_bl_1" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating SD+BL", FilterBy.name("DFU2A152")),
7279
(DFUFirmware.from(zip: "nrf52832_sdk_15.2_bl_2" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating BL only", FilterBy.name("DFU2A152")),
73-
(DFUFirmware.from(zip: "nrf52832_sdk_15.2_sd_bl_app_3" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating SD+BL+App", nil),
80+
(DFUFirmware.from(zip: "nrf52832_sdk_15.2_sd_bl_app_3" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating SD+BL+App", FilterBy.name("DFU2A152")),
81+
82+
// Updating to SDK 15.3.
83+
(DFUFirmware.from(zip: "nrf52832_sdk_15.2_to_15.3_all_in_one",locatedIn: "Firmwares/nRF52832"), nil, nil, "Upgrading to SDK 15.3", FilterBy.name("DFU2A153")),
84+
(DFUFirmware.from(zip: "nrf52832_sdk_15.3_app" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating app", FilterBy.name("DFU2A153")),
85+
// The following steps may be removed without any harm if more SDKs are added.
86+
(DFUFirmware.from(zip: "nrf52832_sdk_15.3_sd" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating SD only", FilterBy.name("DFU2A153")),
87+
(DFUFirmware.from(zip: "nrf52832_sdk_15.3_sd_bl_1" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating SD+BL", FilterBy.name("DFU2A153")),
88+
(DFUFirmware.from(zip: "nrf52832_sdk_15.3_bl_2" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating BL only", FilterBy.name("DFU2A153")),
89+
(DFUFirmware.from(zip: "nrf52832_sdk_15.3_sd_bl_app_3" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating SD+BL+App", FilterBy.name("DFU2A153")),
90+
91+
// Updating to SDK 16.
92+
(DFUFirmware.from(zip: "nrf52832_sdk_15.3_to_16_all_in_one", locatedIn: "Firmwares/nRF52832"), nil, nil, "Upgrading to SDK 16", FilterBy.name("DFU2A16")),
93+
(DFUFirmware.from(zip: "nrf52832_sdk_16_app" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating app", FilterBy.name("DFU2A16")),
94+
// The following steps may be removed without any harm if more SDKs are added.
95+
(DFUFirmware.from(zip: "nrf52832_sdk_16_sd" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating SD only", FilterBy.name("DFU2A16")),
96+
(DFUFirmware.from(zip: "nrf52832_sdk_16_sd_bl_1" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating SD+BL", FilterBy.name("DFU2A16")),
97+
(DFUFirmware.from(zip: "nrf52832_sdk_16_bl_2" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating BL only", FilterBy.name("DFU2A16")),
98+
(DFUFirmware.from(zip: "nrf52832_sdk_16_sd_bl_app_3" , locatedIn: "Firmwares/nRF52832"), nil, nil, "Updating SD+BL+App", nil),
7499
]
75100
}
76101

‎Example/iOSDFULibrary/DFU Test Performer/nRF52840TestSet.swift‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,15 @@ import iOSDFULibrary
3333

3434
class nRF52840TestSet: DFUTestSet {
3535

36-
// Firmwares used for testing DFU on nRF52840 DK
36+
// Firmwares used for testing DFU on nRF52840 DK.
3737
var steps: [(firmware: DFUFirmware, options: ServiceModifier?, expectedError: DFUError?, description: String, next: Filter?)]? {
3838
return try? [
3939
// The MBR in nrf52840_sdk_13_all_in_one.hex has been replaced with 2.3.0 version (MBR from SD s140 6.0.0).
4040
// The original one (2.1.0) had a bug preventing writing in Bootloader space, so the Bootloader was not updatable.
4141
// This is not something a customer would do, but with this trick it is possible to test DFU on older SDKs.
4242

43-
// Files with 'bl' must be uploaded in the correct order, as each next version mu must have bl_version greater then the last one.
44-
45-
(DFUFirmware.from(zip: "nrf52840_sdk_13_app" , locatedIn: "Firmwares/nRF52840"), nil, nil, "Updating app from SDK 13", FilterBy.name("DFU3A13")),
43+
// Files with 'bl' must be uploaded in the correct order, as each next version must have bl_version greater then the last one.
44+
(DFUFirmware.from(zip: "nrf52840_sdk_13_app" , locatedIn: "Firmwares/nRF52840"), nil, nil, "Updating app", FilterBy.name("DFU3A13")),
4645
// The following steps may be removed without any harm if more SDKs are added.
4746
(DFUFirmware.from(zip: "nrf52840_sdk_13_sd" , locatedIn: "Firmwares/nRF52840"), nil, nil, "Updating SD only", FilterBy.name("DFU3A13")),
4847
(DFUFirmware.from(zip: "nrf52840_sdk_13_sd_bl_1" , locatedIn: "Firmwares/nRF52840"), nil, nil, "Updating SD+BL", FilterBy.name("DFU3A13")),
@@ -83,7 +82,25 @@ class nRF52840TestSet: DFUTestSet {
8382
(DFUFirmware.from(zip: "nrf52840_sdk_15.2_sd" , locatedIn: "Firmwares/nRF52840"), nil, nil, "Updating SD only", FilterBy.name("DFU3A152")),
8483
(DFUFirmware.from(zip: "nrf52840_sdk_15.2_sd_bl_1" , locatedIn: "Firmwares/nRF52840"), nil, nil, "Updating SD+BL", FilterBy.name("DFU3A152")),
8584
(DFUFirmware.from(zip: "nrf52840_sdk_15.2_bl_2" , locatedIn: "Firmwares/nRF52840"), nil, nil, "Updating BL only", FilterBy.name("DFU3A152")),
86-
(DFUFirmware.from(zip: "nrf52840_sdk_15.2_sd_bl_app_3" , locatedIn: "Firmwares/nRF52840"), nil, nil, "Updating SD+BL+App", nil),
85+
(DFUFirmware.from(zip: "nrf52840_sdk_15.2_sd_bl_app_3" , locatedIn: "Firmwares/nRF52840"), nil, nil, "Updating SD+BL+App", FilterBy.name("DFU3A152")),
86+
87+
// Updating to SDK 15.3.
88+
(DFUFirmware.from(zip: "nrf52840_sdk_15.2_to_15.3_all_in_one",locatedIn: "Firmwares/nRF52840"), nil, nil, "Upgrading to SDK 15.3", FilterBy.name("DFU3A153")),
89+
(DFUFirmware.from(zip: "nrf52840_sdk_15.3_app" , locatedIn: "Firmwares/nRF52840"), nil, nil, "Updating app", FilterBy.name("DFU3A153")),
90+
// The following steps may be removed without any harm if more SDKs are added.
91+
(DFUFirmware.from(zip: "nrf52840_sdk_15.3_sd" , locatedIn: "Firmwares/nRF52840"), nil, nil, "Updating SD only", FilterBy.name("DFU3A153")),
92+
(DFUFirmware.from(zip: "nrf52840_sdk_15.3_sd_bl_1" , locatedIn: "Firmwares/nRF52840"), nil, nil, "Updating SD+BL", FilterBy.name("DFU3A153")),
93+
(DFUFirmware.from(zip: "nrf52840_sdk_15.3_bl_2" , locatedIn: "Firmwares/nRF52840"), nil, nil, "Updating BL only", FilterBy.name("DFU3A153")),
94+
(DFUFirmware.from(zip: "nrf52840_sdk_15.3_sd_bl_app_3" , locatedIn: "Firmwares/nRF52840"), nil, nil, "Updating SD+BL+App", FilterBy.name("DFU3A153")),
95+
96+
// Updating to SDK 16.
97+
(DFUFirmware.from(zip: "nrf52840_sdk_15.3_to_16_all_in_one", locatedIn: "Firmwares/nRF52840"), nil, nil, "Upgrading to SDK 16", FilterBy.name("DFU3A16")),
98+
(DFUFirmware.from(zip: "nrf52840_sdk_16_app" , locatedIn: "Firmwares/nRF52840"), nil, nil, "Updating app", FilterBy.name("DFU3A16")),
99+
// The following steps may be removed without any harm if more SDKs are added.
100+
(DFUFirmware.from(zip: "nrf52840_sdk_16_sd" , locatedIn: "Firmwares/nRF52840"), nil, nil, "Updating SD only", FilterBy.name("DFU3A16")),
101+
(DFUFirmware.from(zip: "nrf52840_sdk_16_sd_bl_1" , locatedIn: "Firmwares/nRF52840"), nil, nil, "Updating SD+BL", FilterBy.name("DFU3A16")),
102+
(DFUFirmware.from(zip: "nrf52840_sdk_16_bl_2" , locatedIn: "Firmwares/nRF52840"), nil, nil, "Updating BL only", FilterBy.name("DFU3A16")),
103+
(DFUFirmware.from(zip: "nrf52840_sdk_16_sd_bl_app_3" , locatedIn: "Firmwares/nRF52840"), nil, nil, "Updating SD+BL+App", nil),
87104

88105
]
89106
}

‎Example/iOSDFULibrary/Firmwares/nRF52832/nrf52832_sdk_15.2_to_15.3_all_in_one.zip‎

202 KB
Binary file not shown.

‎Example/iOSDFULibrary/Firmwares/nRF52832/nrf52832_sdk_15.3_app.zip‎

51.1 KB
Binary file not shown.

‎Example/iOSDFULibrary/Firmwares/nRF52832/nrf52832_sdk_15.3_bl_2.zip‎

23.6 KB
Binary file not shown.

‎Example/iOSDFULibrary/Firmwares/nRF52832/nrf52832_sdk_15.3_sd.zip‎

145 KB
Binary file not shown.

‎Example/iOSDFULibrary/Firmwares/nRF52832/nrf52832_sdk_15.3_sd_bl_1.zip‎

168 KB
Binary file not shown.

‎Example/iOSDFULibrary/Firmwares/nRF52832/nrf52832_sdk_15.3_sd_bl_app_3.zip‎

219 KB
Binary file not shown.

‎Example/iOSDFULibrary/Firmwares/nRF52832/nrf52832_sdk_15.3_to_16_all_in_one.zip‎

204 KB
Binary file not shown.

0 commit comments

Comments
 (0)