Skip to content

Commit 67ada87

Browse files
authored
Merge pull request #367 from NordicSemiconductor/develop
Version 4.7.1
2 parents 42553b9 + c0b7464 commit 67ada87

File tree

7 files changed

+228
-157
lines changed

7 files changed

+228
-157
lines changed

Example/iOSDFULibrary/Firmwares/nRF52840/nrf52840_sdk_13_all_in_one.hex

+176-151
Original file line numberDiff line numberDiff line change
@@ -1,155 +1,180 @@
11
:020000040000FA
2-
:1000000000040020E508000079050000C508000094
3-
:10001000830500008D05000097050000000000002A
4-
:1000200000000000000000000000000009090000BE
5-
:10003000A105000000000000AB050000B5050000B0
6-
:10004000BF050000C9050000D3050000DD05000064
7-
:10005000E7050000F1050000FB05000005060000B3
8-
:100060000F06000019060000230600002D06000000
9-
:1000700037060000410600004B0600005506000050
10-
:100080005F06000069060000730600007D060000A0
11-
:1000900087060000910600009B060000A5060000F0
12-
:1000A000AF060000B9060000C3060000CD06000040
13-
:1000B000D7060000E1060000EB060000F506000090
14-
:1000C000FF06000009070000130700001D070000DD
15-
:1000D00027070000310700003B070000450700002C
16-
:1000E0004F07000059070000630700006D0700007C
17-
:1000F00077070000810700008B07000095070000CC
18-
:100100009F0700001FB500F003F88DE80F001FBD2A
19-
:1001100000F0DEBB1FB56FF00100009040100390AF
20-
:10012000029001904FF010208069000B420900F00E
21-
:100130001F045DF822300120A04083434DF8223097
22-
:10014000684600F044F91FBDF0B54FF6FF734FF459
23-
:10015000B4751A466E1E11E0A94201D3344600E080
24-
:100160000C46091B30F8027B641E3B441A44F9D14B
25-
:100170009CB204EB134394B204EB12420029EBD17E
26-
:1001800098B200EB134002EB124140EA0140F0BD8F
27-
:10019000DD4992B00446D1E90001CDE91001FF220A
28-
:1001A0004021684600F03AFB94E80F008DE80F000C
29-
:1001B000684610A902E004C841F8042D8842FAD12B
30-
:1001C00010216846FFF7C0FF1090AA208DF8440068
31-
:1001D000FFF7A0FF00F0F2F84FF01024A069102202
32-
:1001E0006946803000F001F9A069082210A900F0EA
33-
:1001F000FCF800F0D7F84FF080510A6949690068AF
34-
:100200004A43824201D8102070470020704710B541
35-
:10021000D0E900214FF0805002EB8103026944696C
36-
:100220006243934209D84FF01022536903EB8103D4
37-
:100230000169406941438B4201D9092010BD5069D1
38-
:10024000401C01D0002010BD0F2010BD70B501680A
39-
:100250000446AE4D4FF01020062951D2DFE801F0E0
40-
:10026000320318283B1DD4E90265646829463046EC
41-
:1002700000F0CDF82A462146304600F0B6F8AA0034
42-
:100280002146304600F09EFA002800D0032070BDC1
43-
:1002900000F050FB4FF4805007E0201DFFF7ABFF4C
44-
:1002A0000028F4D100F046FB60682860002070BD93
45-
:1002B000241D94E80700920000F084FA0028F6D08C
46-
:1002C0000E2070BD8069401C12D0201DFFF79FFFDB
47-
:1002D0000028F6D109E08069401C09D0201DFFF7F5
48-
:1002E0008AFF0028EDD1606820B12046FFF750FF5B
49-
:1002F000042070BDFFF70EFF00F060F800F052F828
50-
:10030000072070BD10B50C46182802D001200860E7
51-
:1003100010BD2068FFF79AFF206010BD4FF0102439
52-
:10032000A069401C05D0A569A66980353079AA2846
53-
:1003300008D06069401C2DD060690068401C29D03D
54-
:1003400060692CE010212846FFF7FEFE31688142EB
55-
:100350001CD1A16901F18002C03105E030B108CAA9
56-
:1003600051F8040D984201D1012000E000208A429A
57-
:10037000F4D158B1286810B1042803D0FEE728460C
58-
:1003800000F057F861496868086008E000F016F866
59-
:1003900000F008F84FF480500168491C01D000F0CB
60-
:1003A000A3FAFEE7BFF34F8F59480168594A01F499
61-
:1003B000E06111430160BFF34F8FFEE74FF0102063
62-
:1003C0008169491C02D0806900F0ADB87047524A7B
63-
:1003D00001681160121D416811604F4A8168103236
64-
:1003E0001160111DC068086070472DE9F041174683
65-
:1003F0000D460646002406E03046296800F0A6F8BF
66-
:10040000641C2D1D361DBC42F6D3BDE8F08170B5CD
67-
:100410000C4605464FF4806608E0284600F083F855
68-
:10042000B44205D3A4F5806405F58055002CF4D1C1
69-
:1004300070BD4168044609B1012500E000254FF078
70-
:1004400010267069A268920000F0BCF9C8B120467D
71-
:1004500000F01AF89DB17669A56864684FF4002031
72-
:1004600084420AD2854208D229463046FFF7CFFFA0
73-
:100470002A4621463046FFF7B8FFFFF79FFFFFF7F8
74-
:1004800091FFFFF747FEF8E72DE9FF414FF01024F9
75-
:10049000616980680D0B01EB800000F6FF70010BB5
76-
:1004A00000200090019002900246039068460123CC
77-
:1004B0000BE0560902F01F0C50F8267003FA0CFCF2
78-
:1004C00047EA0C0740F82670521CAA42F1D30AE012
79-
:1004D0004A0901F01F0650F8225003FA06F6354388
80-
:1004E00040F82250491C8029F2D3A169090B4A091E
81-
:1004F00001F01F0150F822408B409C4340F82240FD
82-
:10050000FFF765FFBDE8FF815809000000000020EB
83-
:100510000CED00E00400FA050006004014480168F4
84-
:100520000029FCD07047134A0221116010490B6862
85-
:10053000002BFCD00F4B1B1D186008680028FCD056
86-
:100540000020106008680028FCD07047094B10B5E7
87-
:1005500001221A60064A1468002CFCD00160106861
88-
:100560000028FCD00020186010680028FCD010BDC6
89-
:1005700000E4014004E5014008208F49096809585A
90-
:10058000084710208C4909680958084714208A49EF
91-
:100590000968095808471820874909680958084711
92-
:1005A0003020854909680958084738208249096878
93-
:1005B000095808473C2080490968095808474020E5
94-
:1005C0007D4909680958084744207B49096809584A
95-
:1005D0000847482078490968095808474C20764957
96-
:1005E000096809580847502073490968095808479D
97-
:1005F0005420714909680958084758206E4909680C
98-
:10060000095808475C206C49096809580847602068
99-
:100610006949096809580847642067490968095801
100-
:100620000847682064490968095808476C206249EE
101-
:1006300009680958084770205F4909680958084740
102-
:1006400074205D4909680958084778205A490968A3
103-
:10065000095808477C2058490968095808478020EC
104-
:1006600055490968095808478420534909680958B9
105-
:100670000847882050490968095808478C204E4986
106-
:1006800009680958084790204B49096809580847E4
107-
:10069000942049490968095808479820464909683B
108-
:1006A000095808479C204449096809580847A02070
109-
:1006B0004149096809580847A4203F490968095871
110-
:1006C0000847A8203C49096809580847AC203A491E
111-
:1006D000096809580847B020374909680958084788
112-
:1006E000B4203549096809580847B82032490968D3
113-
:1006F00009580847BC203049096809580847C020F4
114-
:100700002D49096809580847C4202B490968095828
115-
:100710000847C8202849096809580847CC202649B5
116-
:10072000096809580847D02023490968095808472B
117-
:10073000D4202149096809580847D8201E4909686A
118-
:1007400009580847DC201C49096809580847E02077
119-
:100750001949096809580847E420174909680958E0
120-
:100760000847E8201449096809580847EC2012494D
121-
:10077000096809580847F0200F49096809580847CF
122-
:10078000F4200D49096809580847F8200A49096802
123-
:1007900009580847FC2008490968095808475FF4C8
124-
:1007A0008070054909680958084700000348044952
125-
:1007B000024A034B70470000000000206809000057
126-
:1007C0006809000040EA010310B59B070FD1042A15
127-
:1007D0000DD310C808C9121F9C42F8D020BA19BA0C
128-
:1007E000884201D9012010BD4FF0FF3010BD1AB171
129-
:1007F000D30703D0521C07E0002010BD10F8013BC6
130-
:1008000011F8014B1B1B07D110F8013B11F8014BEC
131-
:100810001B1B01D1921EF1D1184610BD02F0FF033F
132-
:1008200043EA032242EA024200F005B870477047EB
133-
:1008300070474FF000020429C0F0128010F0030C42
134-
:1008400000F01B80CCF1040CBCF1020F18BF00F8C3
135-
:10085000012BA8BF20F8022BA1EB0C0100F00DB872
136-
:100860005FEAC17C24BF00F8012B00F8012B48BFD0
137-
:1008700000F8012B70474FF0000200B51346944674
138-
:100880009646203922BFA0E80C50A0E80C50B1F1E8
139-
:100890002001BFF4F7AF090728BFA0E80C5048BFFC
140-
:1008A0000CC05DF804EB890028BF40F8042B08BF9A
141-
:1008B000704748BF20F8022B11F0804F18BF00F896
142-
:1008C000012B7047014B1B68DB68184700000020B4
143-
:1008D00009480A497047FFF7FBFFFFF713FC00BD0B
144-
:1008E00020BFFDE7064B1847064A1060016881F3F8
145-
:1008F0000888406800470000680900006809000097
146-
:100900001D030000000000201EF0040F0CBFEFF3D9
147-
:100910000881EFF30981886902380078182803D12B
148-
:1009200000E00000074A1047074A12682C3212689C
149-
:100930001047000000B5054B1B68054A9B589847B7
150-
:1009400000BD000005030000000000205409000065
151-
:1009500004000000001000000000000000FFFFFF86
152-
:040960000090D00330
2+
:1000000000040020810A000015070000610A0000BA
3+
:100010001F07000029070000330700000000000050
4+
:10002000000000000000000000000000A50A000021
5+
:100030003D070000000000004707000051070000D6
6+
:100040005B070000650700006F07000079070000EC
7+
:10005000830700008D07000097070000A10700003C
8+
:10006000AB070000B5070000BF070000C90700008C
9+
:10007000D3070000DD070000E7070000F1070000DC
10+
:10008000FB070000050800000F0800001908000029
11+
:10009000230800002D080000370800004108000078
12+
:1000A0004B080000550800005F08000069080000C8
13+
:1000B000730800007D080000870800009108000018
14+
:1000C0009B080000A5080000AF080000B908000068
15+
:1000D000C3080000CD080000D7080000E1080000B8
16+
:1000E000EB080000F5080000FF0800000909000007
17+
:1000F000130900001D090000270900003109000054
18+
:100100003B0900001FB500F003F88DE80F001FBD8C
19+
:1001100000F0ACBC40F6FC7108684FF01022401CA7
20+
:1001200008D00868401C09D00868401C04D0086842
21+
:1001300000F037BA9069F5E79069F9E7704770B554
22+
:100140000B46010B184400F6FF70040B4FF0805073
23+
:100150000022090303692403406943431D1B104621
24+
:1001600000F048FA29462046BDE8704000F042BA47
25+
:10017000F0B54FF6FF734FF4B4751A466E1E11E0DA
26+
:10018000A94201D3344600E00C46091B30F8027B3B
27+
:10019000641E3B441A44F9D19CB204EB134394B25D
28+
:1001A00004EB12420029EBD198B200EB134002EBB2
29+
:1001B000124140EA0140F0BDF34992B00446D1E952
30+
:1001C0000001CDE91001FF224021684600F0F4FB58
31+
:1001D00094E80F008DE80F00684610A902E004C8FB
32+
:1001E00041F8042D8842FAD110216846FFF7C0FF7C
33+
:1001F0001090AA208DF8440000F099F9FFF78AFFCB
34+
:1002000040F6FC7420684FF01025401C0FD0206889
35+
:1002100010226946803000F078F92068401C08D030
36+
:100220002068082210A900F070F900F061F9A869AF
37+
:10023000EEE7A869F5E74FF080500369406940F6A2
38+
:10024000FC71434308684FF01022401C06D0086838
39+
:1002500000F58050834203D2092070479069F7E788
40+
:100260000868401C04D00868401C03D00020704778
41+
:100270009069F9E70420704770B504460068C34DE3
42+
:10028000072876D2DFE800F033041929631E250021
43+
:10029000D4E9026564682946304600F062F92A46CE
44+
:1002A0002146304600F031F9AA002146304600F0E0
45+
:1002B00057FB002800D0032070BD00F009FC4FF46C
46+
:1002C000805007E0201D00F040F90028F4D100F034
47+
:1002D000FFFB60682860002070BD241D94E80700C3
48+
:1002E000920000F03DFB0028F6D00E2070BDFFF715
49+
:1002F000A2FF0028FAD1D4E901034FF0805100EBAE
50+
:10030000830208694D69684382420ED840F6F8704E
51+
:1003100005684FF010226D1C09D0056805EB8305B8
52+
:100320000B6949694B439D4203D9092070BD55694A
53+
:10033000F4E70168491C03D00068401C02D003E0C8
54+
:100340005069FAE70F2070BD2046FFF735FFFFF731
55+
:1003500072FF0028F7D1201D00F0F7F80028F2D135
56+
:1003600060680028F0D100F0E2F8FFF7D3FE00F05B
57+
:10037000BFF8072070BD10B50C46182802D0012028
58+
:10038000086010BD2068FFF777FF206010BD41684E
59+
:10039000054609B1012700E0002740F6F8742068FF
60+
:1003A0004FF01026401C2BD02068AA68920000F065
61+
:1003B000D7FA38B3A86881002068401C27D020688D
62+
:1003C000FFF7BDFED7B12068401C22D026684FF051
63+
:1003D0008050AC686D68016942695143A9420DD9EA
64+
:1003E000016940694143A14208D92146304600F0E5
65+
:1003F000B8F822462946304600F087F800F078F831
66+
:100400007069D2E700F093F8FFF784FEF6E77069B1
67+
:10041000D6E77669DBE740F6FC7420684FF01026DB
68+
:10042000401C23D02068401C0CD02068401C1FD0EA
69+
:100430002568206805F18005401C1BD027683879A5
70+
:10044000AA2819D040F6F8700168491C42D001680A
71+
:10045000491C45D00168491C3ED001680968491C07
72+
:100460003ED00168491C39D000683EE0B069DAE747
73+
:10047000B569DEE7B769E2E710212846FFF778FEA5
74+
:100480003968814222D12068401C05D0D4F8001080
75+
:1004900001F18002C03107E0B169F9E730B108CA63
76+
:1004A00051F8040D984201D1012000E000208A4259
77+
:1004B000F4D158B1286810B1042803D0FEE72846CB
78+
:1004C000FFF765FF3149686808600EE0FFF722FE1C
79+
:1004D00000F00EF87169BBE77169BFE7706904E06D
80+
:1004E0004FF480500168491C01D000F0CBFAFEE7C0
81+
:1004F000BFF34F8F26480168264A01F4E06111439B
82+
:100500000160BFF34F8F00BFFDE72DE9F0411746B3
83+
:100510000D460646002406E03046296800F054F8EF
84+
:10052000641C2D1D361DBC42F6D3BDE8F08140F69B
85+
:10053000FC700168491C04D0D0F800004FF48051D1
86+
:10054000FDE54FF010208069F8E74FF080510A690F
87+
:10055000496900684A43824201D810207047002050
88+
:10056000704770B50C4605464FF4806608E0284693
89+
:1005700000F017F8B44205D3A4F5806405F5805562
90+
:10058000002CF4D170BD0000F40A0000000000202F
91+
:100590000CED00E00400FA05144801680029FCD0C5
92+
:1005A0007047134A0221116010490B68002BFCD0E0
93+
:1005B0000F4B1B1D186008680028FCD0002010603D
94+
:1005C00008680028FCD07047094B10B501221A605A
95+
:1005D000064A1468002CFCD0016010680028FCD08A
96+
:1005E0000020186010680028FCD010BD00E4014015
97+
:1005F00004E5014070B50C46054600F073F810B9EB
98+
:1006000000F07EF828B121462846BDE8704000F091
99+
:1006100007B821462846BDE8704000F037B8000012
100+
:100620007FB5002200920192029203920A0B000B06
101+
:100630006946012302440AE0440900F01F0651F80C
102+
:10064000245003FA06F6354341F82450401C8242F8
103+
:10065000F2D80D490868009A10430860081D016827
104+
:10066000019A1143016000F03DF800280AD00649C4
105+
:1006700010310868029A10430860091D0868039A3F
106+
:10068000104308607FBD00000006004030B50F4CED
107+
:10069000002200BF04EB0213D3F800582DB9D3F8A1
108+
:1006A000045815B9D3F808581DB1521C082AF1D3C3
109+
:1006B00030BD082AFCD204EB0212C2F80008C3F8CD
110+
:1006C00004180220C3F8080830BD000000E0014013
111+
:1006D0004FF08050D0F83001082801D0002070473A
112+
:1006E000012070474FF08050D0F83011062905D016
113+
:1006F000D0F83001401C01D0002070470120704725
114+
:100700004FF08050D0F830010A2801D00020704707
115+
:100710000120704708208F490968095808471020B0
116+
:100720008C4909680958084714208A4909680958FA
117+
:100730000847182087490968095808473020854923
118+
:100740000968095808473820824909680958084744
119+
:100750003C20804909680958084740207D490968BC
120+
:100760000958084744207B49096809580847482028
121+
:1007700078490968095808474C207649096809589A
122+
:10078000084750207349096809580847542071499F
123+
:1007900009680958084758206E49096809580847E8
124+
:1007A0005C206C4909680958084760206949096854
125+
:1007B00009580847642067490968095808476820AC
126+
:1007C00064490968095808476C2062490968095852
127+
:1007D000084770205F4909680958084774205D4937
128+
:1007E00009680958084778205A490968095808478C
129+
:1007F0007C205849096809580847802055490968EC
130+
:10080000095808478420534909680958084788202F
131+
:1008100050490968095808478C204E490968095809
132+
:10082000084790204B4909680958084794204949CE
133+
:10083000096809580847982046490968095808472F
134+
:100840009C204449096809580847A0204149096883
135+
:1008500009580847A4203F49096809580847A820B3
136+
:100860003C49096809580847AC203A4909680958C1
137+
:100870000847B0203749096809580847B420354966
138+
:10088000096809580847B8203249096809580847D3
139+
:10089000BC203049096809580847C0202D4909681B
140+
:1008A00009580847C4202B49096809580847C82037
141+
:1008B0002849096809580847CC2026490968095879
142+
:1008C0000847D0202349096809580847D4202149FE
143+
:1008D000096809580847D8201E4909680958084777
144+
:1008E000DC201C49096809580847E02019490968B3
145+
:1008F00009580847E4201749096809580847E820BB
146+
:100900001449096809580847EC2012490968095830
147+
:100910000847F0200F49096809580847F4200D4995
148+
:10092000096809580847F8200A490968095808471A
149+
:10093000FC2008490968095808475FF48070054998
150+
:10094000096809580847000003480449024A034B54
151+
:100950007047000000000020000B0000000B0000AA
152+
:1009600040EA010310B59B070FD1042A0DD310C82C
153+
:1009700008C9121F9C42F8D020BA19BA884201D97E
154+
:10098000012010BD4FF0FF3010BD1AB1D30703D0C6
155+
:10099000521C07E0002010BD10F8013B11F8014B7C
156+
:1009A0001B1B07D110F8013B11F8014B1B1B01D198
157+
:1009B000921EF1D1184610BD02F0FF0343EA032254
158+
:1009C00042EA024200F005B87047704770474FF0A6
159+
:1009D00000020429C0F0128010F0030C00F01B800C
160+
:1009E000CCF1040CBCF1020F18BF00F8012BA8BF1A
161+
:1009F00020F8022BA1EB0C0100F00DB85FEAC17CDE
162+
:100A000024BF00F8012B00F8012B48BF00F8012B90
163+
:100A100070474FF0000200B51346944696462039C1
164+
:100A200022BFA0E80C50A0E80C50B1F12001BFF4A7
165+
:100A3000F7AF090728BFA0E80C5048BF0CC05DF80D
166+
:100A400004EB890028BF40F8042B08BF704748BF5B
167+
:100A500020F8022B11F0804F18BF00F8012B7047CF
168+
:100A6000014B1B68DB6818470000002009480A4951
169+
:100A70007047FFF7FBFFFFF745FB00BD20BFFDE719
170+
:100A8000064B1847064A1060016881F308884068E1
171+
:100A900000470000000B0000000B000017040000DE
172+
:100AA000000000201EF0040F0CBFEFF30881EFF3ED
173+
:100AB0000981886902380078182803D100E0000015
174+
:100AC000074A1047074A12682C3212681047000084
175+
:100AD00000B5054B1B68054A9B58984700BD0000B0
176+
:100AE0007703000000000020F00A0000040000006E
177+
:100AF000001000000000000000FFFFFF0090D00386
153178
:101000009012002091090200452F0000FF08020005
154179
:10101000452F0000452F0000452F00000000000074
155180
:10102000000000000000000000000000E9090200CC

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: "4.7.0")
59+
.upToNextMajor(from: "4.7.1")
6060
)
6161
],
6262
targets: [.target(name: "<Your Target Name>", dependencies: ["NordicDFU"])]

README_OBJC.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ end
1818
pod install
1919

2020
- Open the newly created `.xcworkspace` and begin working on your project.
21-
- If Xcode asks to migrate code to Swift 5.1, choose **Later**. (The codebase is Swift 5.1 already)
21+
- If Xcode asks to migrate code to Swift 5.2, choose **Later**. (The codebase is Swift 5.2 already)
2222
- Click on the `Pods` project, then go to the `Build Settings`
2323
- Click on the `iOSDFULibrary` target, then set the `Use Legacy Swift version` setting to `No`
2424
- Repeat the same for the `ZIPFoundation` target.

changelog.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
### Changelog
2+
- **4.7.1**
3+
- Bug fixed: A log message was added to help solve #365 issue.
4+
- Bug fixed: DFU will not proceed when setting alternative advertising name caused disconnection (#367).
5+
- Bug fixed: Tests for nRF52840 fixed.
6+
27
- **4.7.0**
38
- Improvement: Migration to Swift 5.2.
49

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.7.0"
3+
s.version = "4.7.1"
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.

0 commit comments

Comments
 (0)