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

Merge pull request #7378 from DavePutz/issue_7325

Browse Source 
Issue 7352 - set max value of a pulsein
This commit is contained in:
Dan Halbert 2022-12-24 19:16:44 -05:00 committed by GitHub
commit 0d3b7770d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ports/espressif/common-hal/pulseio/PulseIn.c
View File

@ -41,7 +41,12 @@ STATIC void update_internal_buffer(pulseio_pulsein_obj_t *self) {
length /= 4; length /= 4;
for (size_t i = 0; i < length; i++) { for (size_t i = 0; i < length; i++) {
uint16_t pos = (self->start + self->len) % self->maxlen; uint16_t pos = (self->start + self->len) % self->maxlen;
self->buffer[pos] = items[i].duration0 * 3; uint32_t val = items[i].duration0 * 3;
// make sure the value returned does not exceed the max uint16 value.
if (val > 65535) {
val = 65535;
}
self->buffer[pos] = (uint16_t)val;
if (self->len < self->maxlen) { if (self->len < self->maxlen) {
self->len++; self->len++;
} else { } else {
@ -50,7 +55,11 @@ STATIC void update_internal_buffer(pulseio_pulsein_obj_t *self) {
// Check if second item exists // Check if second item exists
if (items[i].duration1) { if (items[i].duration1) {
pos = (self->start + self->len) % self->maxlen; pos = (self->start + self->len) % self->maxlen;
self->buffer[pos] = items[i].duration1 * 3; val = items[i].duration1 * 3;
if (val > 65535) {
val = 65535;
}
self->buffer[pos] = (uint16_t)val;
if (self->len < self->maxlen) { if (self->len < self->maxlen) {
self->len++; self->len++;
} else { } else {