Skip to content

Commit

Permalink
ready to release
Browse files Browse the repository at this point in the history
  • Loading branch information
hathach committed Nov 19, 2018
1 parent 989a337 commit f9a3c52
Show file tree
Hide file tree
Showing 11 changed files with 6,394 additions and 6,392 deletions.
2,626 changes: 1,314 additions & 1,312 deletions bootloader/feather_nrf52832/6.1.1r0/feather_nrf52832_bootloader_s132_6.1.1r0.hex

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
3,372 changes: 1,687 additions & 1,685 deletions bootloader/pca10056/6.1.1r0/pca10056_bootloader_s140_6.1.1r0.hex

Large diffs are not rendered by default.

Binary file modified bootloader/pca10056/6.1.1r0/pca10056_bootloader_s140_6.1.1r0.zip
Binary file not shown.
3,370 changes: 1,686 additions & 1,684 deletions bootloader/pca10059/6.1.1r0/pca10059_bootloader_s140_6.1.1r0.hex

Large diffs are not rendered by default.

Binary file modified bootloader/pca10059/6.1.1r0/pca10059_bootloader_s140_6.1.1r0.zip
Binary file not shown.
4 changes: 3 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

## 0.9.1

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

## 0.9.0

Expand Down
15 changes: 14 additions & 1 deletion cores/nRF5/delay.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,20 @@ uint32_t micros( void )

void delay( uint32_t ms )
{
vTaskDelay(ms2tick(ms));
uint32_t ticks = ms2tick(ms);

#ifdef NRF52840_XXAA
// Take chance to flush usb cdc
uint32_t flush_tick = xTaskGetTickCount();
tud_cdc_write_flush();

flush_tick = xTaskGetTickCount()-flush_tick;
if (flush_tick >= ticks) return;

ticks -= flush_tick;
#endif

vTaskDelay(ticks);
}

void dwt_enable(void)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,24 +227,3 @@ void loop()
// Only send update once per second
delay(1000);
}

/**
* RTOS Idle callback is automatically invoked by FreeRTOS
* when there are no active threads. E.g when loop() calls delay() and
* there is no bluetooth or hw event. This is the ideal place to handle
* background data.
*
* NOTE: FreeRTOS is configured as tickless idle mode. After this callback
* is executed, if there is time, freeRTOS kernel will go into low power mode.
* Therefore waitForEvent() should not be called in this callback.
* http://www.freertos.org/low-power-tickless-rtos.html
*
* WARNING: This function MUST NOT call any blocking FreeRTOS API
* such as delay(), xSemaphoreTake() etc ... for more information
* http://www.freertos.org/a00016.html
*/
void rtos_idle_callback(void)
{
// Don't call any other FreeRTOS blocking API()
// Perform background task(s) here
}

0 comments on commit f9a3c52

Please sign in to comment.