Skip to content

Commit f9a3c52

Browse files
committed
ready to release
1 parent 989a337 commit f9a3c52

File tree

11 files changed

+6394
-6392
lines changed

11 files changed

+6394
-6392
lines changed

bootloader/feather_nrf52832/6.1.1r0/feather_nrf52832_bootloader_s132_6.1.1r0.hex

Lines changed: 1314 additions & 1312 deletions
Large diffs are not rendered by default.
Binary file not shown.

bootloader/feather_nrf52840_express/6.1.1r0/feather_nrf52840_express_bootloader_s140_6.1.1r0.hex

Lines changed: 1690 additions & 1688 deletions
Large diffs are not rendered by default.

bootloader/pca10056/6.1.1r0/pca10056_bootloader_s140_6.1.1r0.hex

Lines changed: 1687 additions & 1685 deletions
Large diffs are not rendered by default.
Binary file not shown.

bootloader/pca10059/6.1.1r0/pca10059_bootloader_s140_6.1.1r0.hex

Lines changed: 1686 additions & 1684 deletions
Large diffs are not rendered by default.
Binary file not shown.

changelog.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
## 0.9.1
44

5-
- rename FileIO.h to Bluefruit_FileIO to prevent conflict with other libraries.
5+
- Rename FileIO.h to Bluefruit_FileIO to prevent conflict with other libraries.
6+
- Minor upgrade for bootloader to prevent issue with WDT enabled by application
7+
- 52840: call cdc flush before delay()
68

79
## 0.9.0
810

cores/nRF5/delay.c

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,20 @@ uint32_t micros( void )
3737

3838
void delay( uint32_t ms )
3939
{
40-
vTaskDelay(ms2tick(ms));
40+
uint32_t ticks = ms2tick(ms);
41+
42+
#ifdef NRF52840_XXAA
43+
// Take chance to flush usb cdc
44+
uint32_t flush_tick = xTaskGetTickCount();
45+
tud_cdc_write_flush();
46+
47+
flush_tick = xTaskGetTickCount()-flush_tick;
48+
if (flush_tick >= ticks) return;
49+
50+
ticks -= flush_tick;
51+
#endif
52+
53+
vTaskDelay(ticks);
4154
}
4255

4356
void dwt_enable(void)

0 commit comments

Comments
 (0)