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

Issue #5012 - Moved globals to PulseIn object to fix multiple instances

Browse Source
This commit is contained in:
root 2021-07-16 15:59:08 -05:00
parent 9fdecacec7
commit 588a19a1ab
2 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
ports/raspberrypi/common-hal/pulseio/PulseIn.c
View File

@ -39,10 +39,7 @@
#define NO_PIN 0xff #define NO_PIN 0xff
#define MAX_PULSE 65535 #define MAX_PULSE 65535
#define MIN_PULSE 10 #define MIN_PULSE 10
volatile bool last_level;
volatile uint32_t level_count = 0;
volatile uint32_t result = 0; volatile uint32_t result = 0;
volatile uint16_t buf_index = 0;
uint16_t pulsein_program[] = { uint16_t pulsein_program[] = {
0x4001, // 1: in pins, 1 0x4001, // 1: in pins, 1
@ -77,12 +74,16 @@ void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t *self,
true, 32, true, // RX auto-push every 32 bits true, 32, true, // RX auto-push every 32 bits
false); // claim pins false); // claim pins
if (!ok) {
mp_raise_RuntimeError(translate("All state machines in use"));
}
pio_sm_set_enabled(self->state_machine.pio,self->state_machine.state_machine, false); pio_sm_set_enabled(self->state_machine.pio,self->state_machine.state_machine, false);
pio_sm_clear_fifos(self->state_machine.pio,self->state_machine.state_machine); pio_sm_clear_fifos(self->state_machine.pio,self->state_machine.state_machine);
last_level = self->idle_state; self->last_level = self->idle_state;
level_count = 0; self->level_count = 0;
result = 0; result = 0;
buf_index = 0; self->buf_index = 0;
pio_sm_set_in_pins(self->state_machine.pio,self->state_machine.state_machine,pin->number); pio_sm_set_in_pins(self->state_machine.pio,self->state_machine.state_machine,pin->number);
common_hal_rp2pio_statemachine_set_interrupt_handler(&(self->state_machine),&common_hal_pulseio_pulsein_interrupt,self,PIO_IRQ0_INTE_SM0_RXNEMPTY_BITS); common_hal_rp2pio_statemachine_set_interrupt_handler(&(self->state_machine),&common_hal_pulseio_pulsein_interrupt,self,PIO_IRQ0_INTE_SM0_RXNEMPTY_BITS);
@ -116,10 +117,10 @@ void common_hal_pulseio_pulsein_deinit(pulseio_pulsein_obj_t *self) {
void common_hal_pulseio_pulsein_pause(pulseio_pulsein_obj_t *self) { void common_hal_pulseio_pulsein_pause(pulseio_pulsein_obj_t *self) {
pio_sm_restart(self->state_machine.pio, self->state_machine.state_machine); pio_sm_restart(self->state_machine.pio, self->state_machine.state_machine);
pio_sm_set_enabled(self->state_machine.pio, self->state_machine.state_machine, false); pio_sm_set_enabled(self->state_machine.pio, self->state_machine.state_machine, false);
last_level = self->idle_state; self->last_level = self->idle_state;
level_count = 0; self->level_count = 0;
result = 0; result = 0;
buf_index = 0; self->buf_index = 0;
} }
void common_hal_pulseio_pulsein_interrupt(pulseio_pulsein_obj_t *self) { void common_hal_pulseio_pulsein_interrupt(pulseio_pulsein_obj_t *self) {
@ -127,36 +128,40 @@ void common_hal_pulseio_pulsein_interrupt(pulseio_pulsein_obj_t *self) {
rxfifo = pio_sm_get_blocking(self->state_machine.pio, self->state_machine.state_machine); rxfifo = pio_sm_get_blocking(self->state_machine.pio, self->state_machine.state_machine);
// translate from fifo to buffer // translate from fifo to buffer
if ((rxfifo == 0 && self->last_level == false) || (rxfifo == 0xffffffff && self->last_level == true)) {
self->level_count = self->level_count + 32;
} else {
for (uint i = 0; i < 32; i++) { for (uint i = 0; i < 32; i++) {
bool level = (rxfifo & (1 << i)) >> i; bool level = (rxfifo & (1 << i)) >> i;
if (level == last_level) { if (level == self->last_level) {
level_count++; self->level_count++;
} else { } else {
result = level_count; result = self->level_count;
last_level = level; self->last_level = level;
level_count = 0; self->level_count = 0;
// Pulses that are longer than MAX_PULSE will return MAX_PULSE // Pulses that are longer than MAX_PULSE will return MAX_PULSE
if (result > MAX_PULSE) { if (result > MAX_PULSE) {
result = MAX_PULSE; result = MAX_PULSE;
} }
// return pulses that are not too short // return pulses that are not too short
if (result > MIN_PULSE) { if (result > MIN_PULSE) {
self->buffer[buf_index] = (uint16_t)result; self->buffer[self->buf_index] = (uint16_t)result;
if (self->len < self->maxlen) { if (self->len < self->maxlen) {
self->len++; self->len++;
} }
if (buf_index < self->maxlen) { if (self->buf_index < self->maxlen) {
buf_index++; self->buf_index++;
} else { } else {
self->start = 0; self->start = 0;
buf_index = 0; self->buf_index = 0;
} }
} }
} }
} }
}
// check for a pulse thats too long (MAX_PULSE us) or maxlen reached, and reset // check for a pulse thats too long (MAX_PULSE us) or maxlen reached, and reset
if ((level_count > MAX_PULSE) || (buf_index >= self->maxlen)) { if ((self->level_count > MAX_PULSE) || (self->buf_index >= self->maxlen)) {
pio_sm_set_enabled(self->state_machine.pio, self->state_machine.state_machine, false); pio_sm_set_enabled(self->state_machine.pio, self->state_machine.state_machine, false);
pio_sm_init(self->state_machine.pio, self->state_machine.state_machine, self->state_machine.offset, &self->state_machine.sm_config); pio_sm_init(self->state_machine.pio, self->state_machine.state_machine, self->state_machine.offset, &self->state_machine.sm_config);
pio_sm_restart(self->state_machine.pio,self->state_machine.state_machine); pio_sm_restart(self->state_machine.pio,self->state_machine.state_machine);
@ -189,7 +194,7 @@ void common_hal_pulseio_pulsein_resume(pulseio_pulsein_obj_t *self,
void common_hal_pulseio_pulsein_clear(pulseio_pulsein_obj_t *self) { void common_hal_pulseio_pulsein_clear(pulseio_pulsein_obj_t *self) {
self->start = 0; self->start = 0;
self->len = 0; self->len = 0;
buf_index = 0; self->buf_index = 0;
} }
uint16_t common_hal_pulseio_pulsein_popleft(pulseio_pulsein_obj_t *self) { uint16_t common_hal_pulseio_pulsein_popleft(pulseio_pulsein_obj_t *self) {
@ -202,8 +207,8 @@ uint16_t common_hal_pulseio_pulsein_popleft(pulseio_pulsein_obj_t *self) {
// if we are empty reset buffer pointer and counters // if we are empty reset buffer pointer and counters
if (self->len == 0) { if (self->len == 0) {
self->start = 0; self->start = 0;
buf_index = 0; self->buf_index = 0;
level_count = 0; self->level_count = 0;
} }
return value; return value;
} }

3
ports/raspberrypi/common-hal/pulseio/PulseIn.h
View File

@ -39,6 +39,9 @@ typedef struct {
uint16_t *buffer; uint16_t *buffer;
uint16_t maxlen; uint16_t maxlen;
bool idle_state; bool idle_state;
bool last_level;
uint32_t level_count;
volatile uint16_t buf_index;
volatile uint16_t start; volatile uint16_t start;
volatile uint16_t len; volatile uint16_t len;
rp2pio_statemachine_obj_t state_machine; rp2pio_statemachine_obj_t state_machine;