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

Making requested modifications

Browse Source
This commit is contained in:
root 2020-08-21 20:38:19 -05:00
parent 5b228a77e6
commit fe0f79adce
3 changed files with 2 additions and 7 deletions
ports/atmel-samd/common-hal/pulseio
PulseIn.cPulseIn.h
supervisor/shared
background_callback.c

4
ports/atmel-samd/common-hal/pulseio/PulseIn.c

@ -112,7 +112,7 @@ void pulsein_interrupt_handler(uint8_t channel) {
} }
uint16_t i = (self->start + self->len) % self->maxlen; uint16_t i = (self->start + self->len) % self->maxlen;
if (self->len <= self->maxlen) { if (self->len < self->maxlen) {
self->len++; self->len++;
} else { } else {
self->errored_too_fast = true; self->errored_too_fast = true;
@ -278,6 +278,7 @@ void common_hal_pulseio_pulsein_resume(pulseio_pulsein_obj_t* self,
self->first_edge = true; self->first_edge = true;
self->last_overflow = 0; self->last_overflow = 0;
self->last_count = 0; self->last_count = 0;
self->errored_too_fast = false;
gpio_set_pin_function(self->pin, GPIO_PIN_FUNCTION_A); gpio_set_pin_function(self->pin, GPIO_PIN_FUNCTION_A);
uint32_t mask = 1 << self->channel; uint32_t mask = 1 << self->channel;
// Clear previous interrupt state and re-enable it. // Clear previous interrupt state and re-enable it.
@ -299,7 +300,6 @@ uint16_t common_hal_pulseio_pulsein_popleft(pulseio_pulsein_obj_t* self) {
mp_raise_IndexError(translate("pop from an empty PulseIn")); mp_raise_IndexError(translate("pop from an empty PulseIn"));
} }
if (self->errored_too_fast) { if (self->errored_too_fast) {
self->errored_too_fast = false;
mp_raise_RuntimeError(translate("Input taking too long")); mp_raise_RuntimeError(translate("Input taking too long"));
} }
common_hal_mcu_disable_interrupts(); common_hal_mcu_disable_interrupts();

1
ports/atmel-samd/common-hal/pulseio/PulseIn.h

@ -50,7 +50,6 @@ void pulsein_reset(void);
void pulsein_interrupt_handler(uint8_t channel); void pulsein_interrupt_handler(uint8_t channel);
void pulsein_timer_interrupt_handler(uint8_t index); void pulsein_timer_interrupt_handler(uint8_t index);
void update_background_ticks(void);
#ifdef SAMD21 #ifdef SAMD21
void rtc_set_continuous(void); void rtc_set_continuous(void);
void rtc_start_pulsein(void); void rtc_start_pulsein(void);

4
supervisor/shared/background_callback.c

@ -43,10 +43,6 @@ uint64_t get_background_ticks(void) {
return last_background_tick; return last_background_tick;
} }
void update_background_ticks(void) {
last_background_tick = port_get_raw_ticks(NULL);
}
void background_callback_add_core(background_callback_t *cb) { void background_callback_add_core(background_callback_t *cb) {
last_background_tick = port_get_raw_ticks(NULL); last_background_tick = port_get_raw_ticks(NULL);
CALLBACK_CRITICAL_BEGIN; CALLBACK_CRITICAL_BEGIN;