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

Merge remote-tracking branch 'origin/main' into main

Browse Source
This commit is contained in:
Hosted Weblate 2021-08-20 05:55:50 +02:00
commit 87b47cfe9a
No known key found for this signature in database
GPG Key ID: A3FAAA06E6569B4C
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ports/atmel-samd/common-hal/canio/Listener.c
View File

@ -30,6 +30,8 @@
#include "py/obj.h" #include "py/obj.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "lib/utils/interrupt_char.h"
#include "common-hal/canio/__init__.h" #include "common-hal/canio/__init__.h"
#include "common-hal/canio/Listener.h" #include "common-hal/canio/Listener.h"
#include "shared-bindings/canio/Listener.h" #include "shared-bindings/canio/Listener.h"
@ -356,6 +358,11 @@ mp_obj_t common_hal_canio_listener_receive(canio_listener_obj_t *self) {
if (supervisor_ticks_ms64() > deadline) { if (supervisor_ticks_ms64() > deadline) {
return NULL; return NULL;
} }
RUN_BACKGROUND_TASKS;
// Allow user to break out of a timeout with a KeyboardInterrupt.
if (mp_hal_is_interrupted()) {
return NULL;
}
} while (!common_hal_canio_listener_in_waiting(self)); } while (!common_hal_canio_listener_in_waiting(self));
} }
int index = self->hw->RXFS.bit.F0GI; int index = self->hw->RXFS.bit.F0GI;

5
ports/esp32s2/common-hal/canio/Listener.c
View File

@ -151,6 +151,11 @@ mp_obj_t common_hal_canio_listener_receive(canio_listener_obj_t *self) {
if (supervisor_ticks_ms64() > deadline) { if (supervisor_ticks_ms64() > deadline) {
return NULL; return NULL;
} }
RUN_BACKGROUND_TASKS;
// Allow user to break out of a timeout with a KeyboardInterrupt.
if (mp_hal_is_interrupted()) {
return NULL;
}
} while (!common_hal_canio_listener_in_waiting(self)); } while (!common_hal_canio_listener_in_waiting(self));
} }

7
ports/stm/common-hal/canio/Listener.c
View File

@ -30,6 +30,8 @@
#include "py/obj.h" #include "py/obj.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "lib/utils/interrupt_char.h"
#include "common-hal/canio/__init__.h" #include "common-hal/canio/__init__.h"
#include "common-hal/canio/Listener.h" #include "common-hal/canio/Listener.h"
#include "shared-bindings/canio/Listener.h" #include "shared-bindings/canio/Listener.h"
@ -272,6 +274,11 @@ mp_obj_t common_hal_canio_listener_receive(canio_listener_obj_t *self) {
if (supervisor_ticks_ms64() > deadline) { if (supervisor_ticks_ms64() > deadline) {
return NULL; return NULL;
} }
RUN_BACKGROUND_TASKS;
// Allow user to break out of a timeout with a KeyboardInterrupt.
if (mp_hal_is_interrupted()) {
return NULL;
}
} while (!common_hal_canio_listener_in_waiting(self)); } while (!common_hal_canio_listener_in_waiting(self));
} }