Skip to content
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

Jump to bottom

cordio: lower power polling with timeout #15

Merged
merged 3 commits into from Sep 19, 2019
Merged

cordio: lower power polling with timeout #15

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3be2231
cordio: use signals to wait for new HCI data when polling
sandeepmistry Aug 28, 2019
9b35ebd
Use rtos::ThisThread::sleep_for(ms) for sleeping > 1 ms, and rtos::Ev…
sandeepmistry Sep 10, 2019
8f4bea8
Rename WSF_MS_PER_TICK to CORDIO_TRANSPORT_WSF_MS_PER_TICK
sandeepmistry Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 25 additions & 8 deletions src/utility/HCICordioTransport.cpp
View file
Open in desktop
Expand Up @@ -103,6 +103,8 @@ extern "C" void wsf_mbed_ble_signal_event(void)
}
#endif //CORDIO_ZERO_COPY_HCI

#define CORDIO_TRANSPORT_WSF_MS_PER_TICK 10

static void bleLoop()
{
#if CORDIO_ZERO_COPY_HCI
Expand All @@ -114,7 +116,7 @@ static void bleLoop()
timer.reset();

uint64_t last_update_ms = (last_update_us / 1000);
wsfTimerTicks_t wsf_ticks = (last_update_ms / WSF_MS_PER_TICK);
wsfTimerTicks_t wsf_ticks = (last_update_ms / CORDIO_TRANSPORT_WSF_MS_PER_TICK);

if (wsf_ticks > 0) {
WsfTimerUpdate(wsf_ticks);
Expand All @@ -135,9 +137,20 @@ static void bleLoop()
uint64_t time_spent = (uint64_t) timer.read_high_resolution_us();

/* don't bother sleeping if we're already past tick */
if (sleep && (WSF_MS_PER_TICK * 1000 > time_spent)) {
if (sleep && (CORDIO_TRANSPORT_WSF_MS_PER_TICK * 1000 > time_spent)) {
/* sleep to maintain constant tick rate */
wait_us(WSF_MS_PER_TICK * 1000 - time_spent);
uint64_t wait_time_us = CORDIO_TRANSPORT_WSF_MS_PER_TICK * 1000 - time_spent;
uint64_t wait_time_ms = wait_time_us / 1000;

wait_time_us = wait_time_us % 1000;

if (wait_time_ms) {
rtos::ThisThread::sleep_for(wait_time_ms);
}

if (wait_time_us) {
wait_us(wait_time_us);
}
}
}
#else
Expand All @@ -147,7 +160,8 @@ static void bleLoop()
#endif // CORDIO_ZERO_COPY_HCI
}

rtos::Thread bleLoopThread;
static rtos::EventFlags bleEventFlags;
static rtos::Thread bleLoopThread;


HCICordioTransportClass::HCICordioTransportClass()
Expand Down Expand Up @@ -184,11 +198,12 @@ void HCICordioTransportClass::end()

void HCICordioTransportClass::wait(unsigned long timeout)
{
for (unsigned long start = millis(); (millis() - start) < timeout;) {
if (available()) {
break;
}
if (available()) {
return;
}

// wait for handleRxData to signal
bleEventFlags.wait_all(0x01, timeout, true);
}

int HCICordioTransportClass::available()
Expand Down Expand Up @@ -232,6 +247,8 @@ void HCICordioTransportClass::handleRxData(uint8_t* data, uint8_t len)
for (int i = 0; i < len; i++) {
_rxBuf.store_char(data[i]);
}

bleEventFlags.set(0x01);
}

HCICordioTransportClass HCICordioTransport;
Expand Down