Skip to content

Commit a811c9f

Browse files
committed
Fix low frequency clock issues.
Former-commit-id: f4579d3
1 parent db89fd9 commit a811c9f

File tree

46 files changed

+743
-102
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+743
-102
lines changed

boards.txt

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Generic_nRF52832.build.variant=Generic
4242
Generic_nRF52832.build.variant_system_lib=
4343
Generic_nRF52832.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
4444
Generic_nRF52832.build.ldscript=nrf52_xxaa.ld
45-
Generic_nRF52832.build.extra_flags=-DNRF52_SERIES -DNRF52832_XXAA {build.lfclk_flags} -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
45+
Generic_nRF52832.build.extra_flags=-DNRF52_SERIES -DNRF52832_XXAA -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
4646

4747
Generic_nRF52832.menu.lfclk.lfxo=Crystal Oscillator
4848
Generic_nRF52832.menu.lfclk.lfxo.build.lfclk_flags=-DUSE_LFXO
@@ -95,6 +95,7 @@ nRF52DK.build.variant=nRF52832_DK
9595
nRF52DK.build.variant_system_lib=
9696
nRF52DK.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
9797
nRF52DK.build.ldscript=nrf52_xxaa.ld
98+
nRF52DK.build.lfclk_flags=-DUSE_LFXO
9899
nRF52DK.build.extra_flags=-DNRF52_SERIES -DNRF52832_XXAA -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
99100

100101
nRF52DK.menu.role.all=All
@@ -136,6 +137,7 @@ feather52832.build.variant=feather_nrf52832
136137
feather52832.build.variant_system_lib=
137138
feather52832.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
138139
feather52832.build.ldscript=nrf52_xxaa.ld
140+
feather52832.build.lfclk_flags=-DUSE_LFXO
139141
feather52832.build.extra_flags=-DNRF52_SERIES -DNRF52832_XXAA {bootloader.flags} -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
140142
feather52832.build.dfu_pattern={adafruit-nrfutil.dfu_pattern}
141143

@@ -189,6 +191,7 @@ BT5032A-TB.build.variant=BT5032A_TB
189191
BT5032A-TB.build.variant_system_lib=
190192
BT5032A-TB.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
191193
BT5032A-TB.build.ldscript=nrf52832_xxaa.ld
194+
BT5032A-TB.build.lfclk_flags=-DUSE_LFXO
192195
BT5032A-TB.build.extra_flags=-DNRF52_SERIES -DNRF52832_XXAA {bootloader.flags} -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
193196

194197
BT5032A-TB.menu.role.all=All
@@ -240,7 +243,7 @@ bluey.build.variant=bluey
240243
bluey.build.variant_system_lib=
241244
bluey.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
242245
bluey.build.ldscript=nrf52_xxaa.ld
243-
bluey.build.extra_flags=-DNRF52_SERIES -DNRF52832_XXAA {build.lfclk_flags} -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
246+
bluey.build.extra_flags=-DNRF52_SERIES -DNRF52832_XXAA -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
244247

245248
bluey.menu.lfclk.lfxo=Crystal Oscillator
246249
bluey.menu.lfclk.lfxo.build.lfclk_flags=-DUSE_LFXO
@@ -288,7 +291,7 @@ hackaBLE.build.variant=hackaBLE
288291
hackaBLE.build.variant_system_lib=
289292
hackaBLE.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
290293
hackaBLE.build.ldscript=nrf52_xxaa.ld
291-
hackaBLE.build.extra_flags=-DNRF52_SERIES -DNRF52832_XXAA {build.lfclk_flags} -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
294+
hackaBLE.build.extra_flags=-DNRF52_SERIES -DNRF52832_XXAA -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
292295

293296
hackaBLE.menu.lfclk.lfxo=Crystal Oscillator
294297
hackaBLE.menu.lfclk.lfxo.build.lfclk_flags=-DUSE_LFXO
@@ -336,7 +339,7 @@ hackaBLE_v2.build.variant=hackaBLE_v2
336339
hackaBLE_v2.build.variant_system_lib=
337340
hackaBLE_v2.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
338341
hackaBLE_v2.build.ldscript=nrf52_xxaa.ld
339-
hackaBLE_v2.build.extra_flags=-DNRF52_SERIES -DNRF52832_XXAA {build.lfclk_flags} -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
342+
hackaBLE_v2.build.extra_flags=-DNRF52_SERIES -DNRF52832_XXAA -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
340343

341344
hackaBLE_v2.menu.lfclk.lfxo=Crystal Oscillator
342345
hackaBLE_v2.menu.lfclk.lfxo.build.lfclk_flags=-DUSE_LFXO
@@ -389,6 +392,7 @@ Blend2.build.variant=RedBear_Blend2
389392
Blend2.build.variant_system_lib=
390393
Blend2.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
391394
Blend2.build.ldscript=nrf52_xxaa.ld
395+
Blend2.build.lfclk_flags=-DUSE_LFXO
392396
Blend2.build.extra_flags=-DNRF52_SERIES -DNRF52832_XXAA -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
393397

394398
Blend2.menu.role.all=All
@@ -435,6 +439,7 @@ BLENano2.build.variant=RedBear_BLENano2
435439
BLENano2.build.variant_system_lib=
436440
BLENano2.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
437441
BLENano2.build.ldscript=nrf52_xxaa.ld
442+
BLENano2.build.lfclk_flags=-DUSE_LFXO
438443
BLENano2.build.extra_flags=-DNRF52_SERIES -DNRF52832_XXAA -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
439444

440445
BLENano2.menu.role.all=All
@@ -479,7 +484,7 @@ Generic_nRF52840.build.variant=Generic
479484
Generic_nRF52840.build.variant_system_lib=
480485
Generic_nRF52840.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
481486
Generic_nRF52840.build.ldscript=nrf52840_xxaa.ld
482-
Generic_nRF52840.build.extra_flags=-DNRF52_SERIES -DNRF52840_XXAA {build.lfclk_flags} -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
487+
Generic_nRF52840.build.extra_flags=-DNRF52_SERIES -DNRF52840_XXAA -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
483488

484489
Generic_nRF52840.menu.lfclk.lfxo=Crystal Oscillator
485490
Generic_nRF52840.menu.lfclk.lfxo.build.lfclk_flags=-DUSE_LFXO
@@ -531,6 +536,7 @@ nRF52840_DK.build.variant=nRF52840_DK
531536
nRF52840_DK.build.variant_system_lib=
532537
nRF52840_DK.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
533538
nRF52840_DK.build.ldscript=nrf52840_xxaa.ld
539+
nRF52840_DK.build.lfclk_flags=-DUSE_LFXO
534540
nRF52840_DK.build.extra_flags=-DNRF52_SERIES -DNRF52840_XXAA -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
535541

536542
nRF52840_DK.menu.role.all=All
@@ -582,6 +588,7 @@ nRF52840_dongle.build.vid=0x1915
582588
nRF52840_dongle.build.pid=0x521B
583589
nRF52840_dongle.build.usb_manufacturer="Nordic Semiconductor"
584590
nRF52840_dongle.build.usb_product="nRF52840 Dongle"
591+
nRF52840_dongle.build.lfclk_flags=-DUSE_LFXO
585592
nRF52840_dongle.build.extra_flags=-DNRF52_SERIES -DNRF52840_XXAA -DUSE_NORDIC_BL {build.flags.usb} -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
586593
nRF52840_dongle.build.dfu_pattern={nrfutil.dfu_pattern}
587594

@@ -634,6 +641,7 @@ BT5040.build.vid=0x1915
634641
BT5040.build.pid=0x521B
635642
BT5040.build.usb_manufacturer="Ebyte"
636643
BT5040.build.usb_product="E104-BT5040UA"
644+
BT5040.build.lfclk_flags=-DUSE_LFXO
637645
BT5040.build.extra_flags=-DNRF52_SERIES -DNRF52840_XXAA -DUSE_NORDIC_BL {build.flags.usb} -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
638646
BT5040.build.dfu_pattern={nrfutil.dfu_pattern}
639647

@@ -691,6 +699,7 @@ feather52840.build.vid=0x239A
691699
feather52840.build.pid=0x8029
692700
feather52840.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
693701
feather52840.build.ldscript=nrf52840_xxaa.ld
702+
feather52840.build.lfclk_flags=-DUSE_LFXO
694703
feather52840.build.extra_flags=-DNRF52_SERIES -DNRF52832_XXAA {bootloader.flags} {build.flags.usb} -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
695704
feather52840.build.dfu_pattern={adafruit-nrfutil.dfu_pattern}
696705

@@ -759,6 +768,7 @@ feather52840sense.build.vid=0x239A
759768
feather52840sense.build.pid=0x8087
760769
feather52840sense.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
761770
feather52840sense.build.ldscript=nrf52840_xxaa.ld
771+
feather52840sense.build.lfclk_flags=-DUSE_LFRC
762772
feather52840sense.build.extra_flags=-DNRF52_SERIES -DNRF52832_XXAA {bootloader.flags} {build.flags.usb} -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
763773
feather52840sense.build.dfu_pattern={adafruit-nrfutil.dfu_pattern}
764774

@@ -827,6 +837,7 @@ itsybitsy52840.build.vid=0x239A
827837
itsybitsy52840.build.pid=0x8051
828838
itsybitsy52840.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
829839
itsybitsy52840.build.ldscript=nrf52840_xxaa.ld
840+
itsybitsy52840.build.lfclk_flags=-DUSE_LFXO
830841
itsybitsy52840.build.extra_flags=-DNRF52_SERIES -DNRF52832_XXAA {bootloader.flags} {build.flags.usb} -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
831842
itsybitsy52840.build.dfu_pattern={adafruit-nrfutil.dfu_pattern}
832843

@@ -893,6 +904,7 @@ cplaynrf52840.build.vid=0x239A
893904
cplaynrf52840.build.pid=0x8045
894905
cplaynrf52840.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
895906
cplaynrf52840.build.ldscript=nrf52840_xxaa.ld
907+
cplaynrf52840.build.lfclk_flags=-DUSE_LFRC
896908
cplaynrf52840.build.extra_flags=-DNRF52_SERIES -DNRF52832_XXAA {bootloader.flags} {build.flags.usb} -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
897909
cplaynrf52840.build.dfu_pattern={adafruit-nrfutil.dfu_pattern}
898910

@@ -959,6 +971,7 @@ cluenrf52840.build.vid=0x239A
959971
cluenrf52840.build.pid=0x8071
960972
cluenrf52840.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
961973
cluenrf52840.build.ldscript=nrf52840_xxaa.ld
974+
cluenrf52840.build.lfclk_flags=-DUSE_LFRC
962975
cluenrf52840.build.extra_flags=-DNRF52_SERIES -DNRF52832_XXAA {bootloader.flags} {build.flags.usb} -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
963976
cluenrf52840.build.dfu_pattern={adafruit-nrfutil.dfu_pattern}
964977

@@ -1015,7 +1028,7 @@ Generic_nRF52833.build.variant=Generic
10151028
Generic_nRF52833.build.variant_system_lib=
10161029
Generic_nRF52833.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
10171030
Generic_nRF52833.build.ldscript=nrf52833_xxaa.ld
1018-
Generic_nRF52833.build.extra_flags=-DNRF52_SERIES -DNRF52833_XXAA {build.lfclk_flags} -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
1031+
Generic_nRF52833.build.extra_flags=-DNRF52_SERIES -DNRF52833_XXAA -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
10191032

10201033
Generic_nRF52833.menu.lfclk.lfxo=Crystal Oscillator
10211034
Generic_nRF52833.menu.lfclk.lfxo.build.lfclk_flags=-DUSE_LFXO
@@ -1067,6 +1080,7 @@ nRF52833DK.build.variant=nRF52833_DK
10671080
nRF52833DK.build.variant_system_lib=
10681081
nRF52833DK.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
10691082
nRF52833DK.build.ldscript=nrf52833_xxaa.ld
1083+
nRF52833DK.build.lfclk_flags=-DUSE_LFXO
10701084
nRF52833DK.build.extra_flags=-DNRF52_SERIES -DNRF52833_XXAA -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
10711085

10721086
nRF52833DK.menu.role.all=All
@@ -1113,6 +1127,7 @@ BBCmicrobitV2.build.variant=BBCmicrobitV2
11131127
BBCmicrobitV2.build.variant_system_lib=
11141128
BBCmicrobitV2.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
11151129
BBCmicrobitV2.build.ldscript=nrf52833_xxaa.ld
1130+
BBCmicrobitV2.build.lfclk_flags=-DUSE_LFSYNT
11161131
BBCmicrobitV2.build.extra_flags=-DNRF52_SERIES -DNRF52833_XXAA -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
11171132

11181133
BBCmicrobitV2.menu.role.all=All
@@ -1157,7 +1172,7 @@ Generic_nRF51822.build.variant=Generic
11571172
Generic_nRF51822.build.variant_system_lib=
11581173
Generic_nRF51822.build.float_flags=
11591174
Generic_nRF51822.build.ldscript=nrf51_{build.chip}.ld
1160-
Generic_nRF51822.build.extra_flags=-DNRF51 {build.ram_size} {build.lfclk_flags} -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
1175+
Generic_nRF51822.build.extra_flags=-DNRF51 {build.ram_size} -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
11611176

11621177
Generic_nRF51822.menu.chip.xxaa=16 kB RAM, 256 kB flash (xxaa)
11631178
Generic_nRF51822.menu.chip.xxaa.build.chip=xxaa
@@ -1214,6 +1229,7 @@ nRF51DK.build.variant=nRF51822_DK
12141229
nRF51DK.build.variant_system_lib=
12151230
nRF51DK.build.float_flags=
12161231
nRF51DK.build.ldscript=nrf51_xxaa.ld
1232+
nRF51DK.build.lfclk_flags=-DUSE_LFXO
12171233
nRF51DK.build.extra_flags=-DNRF51 -DDEVICE_RAM_SIZE=16 -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
12181234

12191235
nRF51DK.menu.role.all=All
@@ -1259,6 +1275,7 @@ BBCmicrobit.build.variant=BBCmicrobit
12591275
BBCmicrobit.build.variant_system_lib=
12601276
BBCmicrobit.build.float_flags=
12611277
BBCmicrobit.build.ldscript=nrf51_xxaa.ld
1278+
BBCmicrobit.build.lfclk_flags=-DUSE_LFSYNT
12621279
BBCmicrobit.build.extra_flags=-DNRF51 -DDEVICE_RAM_SIZE=16 -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
12631280

12641281
BBCmicrobit.menu.role.all=All
@@ -1300,6 +1317,7 @@ Beacon_PCA20006.build.variant=PCA20006
13001317
Beacon_PCA20006.build.variant_system_lib=
13011318
Beacon_PCA20006.build.float_flags=
13021319
Beacon_PCA20006.build.ldscript=nrf51_xxaa.ld
1320+
Beacon_PCA20006.build.lfclk_flags=-DUSE_LFXO
13031321
Beacon_PCA20006.build.extra_flags=-DNRF51 -DDEVICE_RAM_SIZE=16 -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
13041322

13051323
Beacon_PCA20006.menu.role.all=All
@@ -1343,6 +1361,7 @@ BLENano.build.variant=BLENano
13431361
BLENano.build.variant_system_lib=
13441362
BLENano.build.float_flags=
13451363
BLENano.build.ldscript=nrf51_{build.chip}.ld
1364+
BLENano.build.lfclk_flags=-DUSE_LFXO
13461365
BLENano.build.extra_flags=-DNRF51 {build.ram_size} -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
13471366

13481367
BLENano.menu.chip.xxaa=16 kB RAM, 256 kB flash (xxaa)
@@ -1391,6 +1410,7 @@ BluzDK.build.variant=BluzDK
13911410
BluzDK.build.variant_system_lib=
13921411
BluzDK.build.float_flags=
13931412
BluzDK.build.ldscript=nrf51_xxaa.ld
1413+
BluzDK.build.lfclk_flags=-DUSE_LFXO
13941414
BluzDK.build.extra_flags=-DNRF51 -DDEVICE_RAM_SIZE=16 -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
13951415

13961416
BluzDK.menu.role.all=All
@@ -1437,6 +1457,7 @@ CalliopeMini.build.variant=CalliopeMini
14371457
CalliopeMini.build.variant_system_lib=
14381458
CalliopeMini.build.float_flags=
14391459
CalliopeMini.build.ldscript=nrf51_xxaa.ld
1460+
CalliopeMini.build.lfclk_flags=-DUSE_LFRC
14401461
CalliopeMini.build.extra_flags=-DNRF51 -DDEVICE_RAM_SIZE=16 -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
14411462

14421463
CalliopeMini.menu.role.all=All
@@ -1478,6 +1499,7 @@ ng_beacon.build.variant=ng-beacon
14781499
ng_beacon.build.variant_system_lib=
14791500
ng_beacon.build.float_flags=
14801501
ng_beacon.build.ldscript=nrf51_xxaa.ld
1502+
ng_beacon.build.lfclk_flags=-DUSE_LFRC
14811503
ng_beacon.build.extra_flags=-DNRF51 -DDEVICE_RAM_SIZE=16 -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
14821504

14831505
ng_beacon.menu.role.all=All
@@ -1521,6 +1543,7 @@ nRF51Dongle.build.variant=nRF51_Dongle
15211543
nRF51Dongle.build.variant_system_lib=
15221544
nRF51Dongle.build.float_flags=
15231545
nRF51Dongle.build.ldscript=nrf51_xxac.ld
1546+
nRF51Dongle.build.lfclk_flags=-DUSE_LFXO
15241547
nRF51Dongle.build.extra_flags=-DNRF51 -DDEVICE_RAM_SIZE=32 -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
15251548

15261549
nRF51Dongle.menu.role.all=All
@@ -1562,6 +1585,7 @@ OSHChip.build.variant=OSHChip
15621585
OSHChip.build.variant_system_lib=
15631586
OSHChip.build.float_flags=
15641587
OSHChip.build.ldscript=nrf51_xxac.ld
1588+
OSHChip.build.lfclk_flags=-DUSE_LFRC
15651589
OSHChip.build.extra_flags=-DNRF51 -DDEVICE_RAM_SIZE=32 -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
15661590

15671591
OSHChip.menu.role.all=All
@@ -1605,6 +1629,7 @@ RedBearLab_nRF51822.build.variant=RedBearLab_nRF51822
16051629
RedBearLab_nRF51822.build.variant_system_lib=
16061630
RedBearLab_nRF51822.build.float_flags=
16071631
RedBearLab_nRF51822.build.ldscript=nrf51_{build.chip}.ld
1632+
RedBearLab_nRF51822.build.lfclk_flags=-DUSE_LFXO
16081633
RedBearLab_nRF51822.build.extra_flags=-DNRF51 {build.ram_size} -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
16091634

16101635
RedBearLab_nRF51822.menu.chip.xxaa=16 kB RAM, 256 kB flash (xxaa)
@@ -1658,6 +1683,7 @@ Sinobit.build.variant=Sinobit
16581683
Sinobit.build.variant_system_lib=
16591684
Sinobit.build.float_flags=
16601685
Sinobit.build.ldscript=nrf51_xxaa.ld
1686+
Sinobit.build.lfclk_flags=-DUSE_LFRC
16611687
Sinobit.build.extra_flags=-DNRF51 -DDEVICE_RAM_SIZE=16 -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
16621688

16631689
Sinobit.menu.role.all=All
@@ -1701,6 +1727,7 @@ TinyBLE.build.variant=TinyBLE
17011727
TinyBLE.build.variant_system_lib=
17021728
TinyBLE.build.float_flags=
17031729
TinyBLE.build.ldscript=nrf51_xxaa.ld
1730+
TinyBLE.build.lfclk_flags=-DUSE_LFXO
17041731
TinyBLE.build.extra_flags=-DNRF51 -DDEVICE_RAM_SIZE=16 -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
17051732

17061733
TinyBLE.menu.role.all=All
@@ -1742,6 +1769,7 @@ Waveshare_BLE400.build.variant=Waveshare_BLE400
17421769
Waveshare_BLE400.build.variant_system_lib=
17431770
Waveshare_BLE400.build.float_flags=
17441771
Waveshare_BLE400.build.ldscript=nrf51_{build.chip}.ld
1772+
Waveshare_BLE400.build.lfclk_flags=-DUSE_LFXO
17451773
Waveshare_BLE400.build.extra_flags=-DNRF51 {build.ram_size} -DCONFIG_NIMBLE_CPP_LOG_LEVEL={build.cpp_debug} {build.nimble_flags}
17461774

17471775
Waveshare_BLE400.menu.chip.xxaa=16 kB RAM, 256 kB flash (xxaa)

cores/nRF5/Arduino.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "nrf.h"
1111
#include "nrf_power.h"
1212
#include "nrf_peripherals.h"
13+
#include "freertos/FreeRTOS.h"
1314

1415
typedef bool boolean;
1516
typedef uint8_t byte;

cores/nRF5/TinyUSB/Adafruit_TinyUSB_ArduinoCore/tinyusb/src/portable/nordic/nrf5x/dcd_nrf5x.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
* The MIT License (MIT)
33
*
44
* Copyright (c) 2019 Ha Thach (tinyusb.org)
@@ -466,7 +466,7 @@ void dcd_int_handler(uint8_t rhport)
466466
// DMA complete move data from SRAM -> Endpoint
467467
edpt_dma_end();
468468
}
469-
469+
470470
// Setup tokens are specific to the Control endpoint.
471471
if ( int_status & USBD_INTEN_EP0SETUP_Msk )
472472
{
@@ -647,6 +647,7 @@ static bool hfclk_running(void)
647647

648648
static void hfclk_enable(void)
649649
{
650+
#if 0
650651
// already running, nothing to do
651652
if ( hfclk_running() ) return;
652653

@@ -660,10 +661,14 @@ static void hfclk_enable(void)
660661

661662
nrf_clock_event_clear(NRF_CLOCK, NRF_CLOCK_EVENT_HFCLKSTARTED);
662663
nrf_clock_task_trigger(NRF_CLOCK, NRF_CLOCK_TASK_HFCLKSTART);
664+
#else
665+
hw_clock_hfxo_request();
666+
#endif
663667
}
664668

665669
static void hfclk_disable(void)
666670
{
671+
#if 0
667672
#ifdef SOFTDEVICE_PRESENT
668673
if ( is_sd_enabled() )
669674
{
@@ -673,6 +678,9 @@ static void hfclk_disable(void)
673678
#endif
674679

675680
nrf_clock_task_trigger(NRF_CLOCK, NRF_CLOCK_TASK_HFCLKSTOP);
681+
#else
682+
hw_clock_hfxo_release();
683+
#endif
676684
}
677685

678686
// Power & Clock Peripheral on nRF5x to manage USB

cores/nRF5/nimble_config/nrf51_nimconfig.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@
8383
#define CONFIG_NIMBLE_STACK_USE_MEM_POOLS 0
8484
#endif
8585

86+
#ifdef USE_LFRC
87+
#define MYNEWT_VAL_BLE_LL_SCA (500)
88+
#endif
89+
8690

8791
/**
8892
* This macro exists to ensure code includes this header when needed. If code
@@ -313,10 +317,6 @@
313317
#define MYNEWT_VAL_BLE_LL_NUM_SCAN_RSP_ADVS (8)
314318
#endif
315319

316-
#ifndef MYNEWT_VAL_BLE_LL_OUR_SCA
317-
#define MYNEWT_VAL_BLE_LL_OUR_SCA (60)
318-
#endif
319-
320320
#ifndef MYNEWT_VAL_BLE_LL_SCA
321321
#define MYNEWT_VAL_BLE_LL_SCA (60)
322322
#endif

cores/nRF5/nimble_config/nrf52832_nimconfig.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@
8585
# endif
8686
#endif
8787

88+
#ifdef USE_LFRC
89+
#define MYNEWT_VAL_BLE_LL_SCA (500)
90+
#endif
8891

8992
/**
9093
* This macro exists to ensure code includes this header when needed. If code

cores/nRF5/nimble_config/nrf52833_nimconfig.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@
8585
# endif
8686
#endif
8787

88+
#ifdef USE_LFRC
89+
#define MYNEWT_VAL_BLE_LL_SCA (500)
90+
#endif
8891

8992
/**
9093
* This macro exists to ensure code includes this header when needed. If code

cores/nRF5/nimble_config/nrf52840_nimconfig.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@
8585
# endif
8686
#endif
8787

88+
#ifdef USE_LFRC
89+
#define MYNEWT_VAL_BLE_LL_SCA (500)
90+
#endif
8891

8992
/**
9093
* This macro exists to ensure code includes this header when needed. If code

0 commit comments

Comments
 (0)