Skip to content

Bluefruit: don't send commands to the connection LED timer before it exists #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cvaldess wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bluefruit: don't send commands to the connection LED timer before it exists #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions libraries/Bluefruit54Lib/src/bluefruit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,10 @@ void AdafruitBluefruit::autoConnLed(bool enabled)

void AdafruitBluefruit::setConnLedInterval(uint32_t ms)
{
// begin() creates the timer at its very end, and can fail before that. A NULL handle would only
// fault later, in the timer task, with nothing on its stack to say who sent the command.
if ( !_led_blink_th ) return;

BaseType_t active = xTimerIsTimerActive(_led_blink_th);
xTimerChangePeriod(_led_blink_th, ms2tick(ms), 0);

Expand Down Expand Up @@ -933,12 +937,12 @@ void AdafruitBluefruit::_ble_handler(ble_evt_t* evt)
*------------------------------------------------------------------*/
void AdafruitBluefruit::_startConnLed(void)
{
if (_led_conn) xTimerStart(_led_blink_th, 0);
if (_led_conn && _led_blink_th) xTimerStart(_led_blink_th, 0);
}

void AdafruitBluefruit::_stopConnLed(void)
{
xTimerStop(_led_blink_th, 0);
if (_led_blink_th) xTimerStop(_led_blink_th, 0);

_setConnLed( this->connected() );
}
Expand Down
Loading