diff options
| author | Jeff Epler <jepler@gmail.com> | 2020-11-17 17:31:54 -0600 |
|---|---|---|
| committer | Jeff Epler <jepler@gmail.com> | 2020-11-17 17:45:41 -0600 |
| commit | 1bc770c3dc308b91184e8cab52f6f4cabdda99fc (patch) | |
| tree | ce77633e25def3142fe353b12aaf2cb94ffdf958 | |
| parent | e2b5ae2d77017cf1f95542604c26c8ee1903af64 (diff) | |
esp32s2: PulseIn: Fix supervisor tick enabling
Before, there were two problems:
* Even if a pulsein was never constructed, supervisor_disable_tick
would occur during restart. This could cancel out a supervisor_enable_tick
from someplace else, with unexpected results.
* If two or more pulseins were constructed, each one would enable ticks,
but only the last one deinited (or the reset routine) would disable,
leaving ticks running indefinitely.
In my testing, it seemed that this led to the board sometimes stopping when
it should have auto-reloaded.
| -rw-r--r-- | ports/esp32s2/common-hal/pulseio/PulseIn.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ports/esp32s2/common-hal/pulseio/PulseIn.c b/ports/esp32s2/common-hal/pulseio/PulseIn.c index f7429ec12..9feeea147 100644 --- a/ports/esp32s2/common-hal/pulseio/PulseIn.c +++ b/ports/esp32s2/common-hal/pulseio/PulseIn.c @@ -77,7 +77,9 @@ void pulsein_reset(void) { for (size_t i = 0; i < RMT_CHANNEL_MAX; i++) { handles[i] = NULL; } - supervisor_disable_tick(); + if (refcount != 0) { + supervisor_disable_tick(); + } refcount = 0; } @@ -122,8 +124,10 @@ void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t* self, const mcu // start RMT RX, and enable ticks so the core doesn't turn off. rmt_rx_start(channel, true); - supervisor_enable_tick(); refcount++; + if (refcount == 1) { + supervisor_enable_tick(); + } } bool common_hal_pulseio_pulsein_deinited(pulseio_pulsein_obj_t* self) { |
