djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

atmel-samd: Fix PulseIn duration math to handle case when current us time is after the last one but more than a ms has passed.

Browse Source
This commit is contained in:
Scott Shawcroft 2017-04-11 16:55:42 -07:00
parent f28f8ba568
commit 1e8fc15a41
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
atmel-samd/common-hal/pulseio/PulseIn.c
View File

@ -87,12 +87,14 @@ static void pulsein_callback(void) {
} else {
uint32_t ms_diff = current_ms - last_ms[self->channel];
uint16_t us_diff = current_us - last_us[self->channel];
if (last_us[self->channel] > current_us) {
us_diff = 1000 + current_us - last_us[self->channel];
}
uint32_t total_diff = us_diff;
if (ms_diff > 1) {
total_diff += (ms_diff - 1) * 1000;
if (last_us[self->channel] > current_us) {
total_diff = 1000 + current_us - last_us[self->channel];
if (ms_diff > 1) {
total_diff += (ms_diff - 1) * 1000;
}
} else {
total_diff += ms_diff * 1000;
}
uint16_t duration = 0xffff;
if (total_diff < duration) {