8000 Merge pull request #5013 from DavePutz/issue_5012 · domdfcoding/circuitpython@3c25d8e · GitHub
[go: up one dir, main page]
Skip to content

Commit 3c25d8e

Browse files
microdev1microdev1
authored
Merge pull request adafruit#5013 from DavePutz/issue_5012
Issue adafruit#5012 - RP2040 moved globals to PulseIn object to fix multiple instances
2 parents 40b0857 + 43275e0 commit 3c25d8e

File tree

2 files changed

+46
-41
lines changed

2 files changed

+46
-41
lines changed

‎ports/raspberrypi/common-hal/pulseio/PulseIn.c

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@
3939
#define NO_PIN 0xff
4040
#define MAX_PULSE 65535
4141
#define MIN_PULSE 10
42-
volatile bool last_level;
43-
volatile uint32_t level_count = 0;
44-
volatile uint32_t result = 0;
45-
volatile uint16_t buf_index = 0;
4642

4743
uint16_t pulsein_program[] = {
4844
0x4001, // 1: in pins, 1
@@ -77,12 +73,15 @@ void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t *self,
7773
true, 32, true, // RX auto-push every 32 bits
7874
false); // claim pins
7975

76+
if (!ok) {
77+
mp_raise_RuntimeError(translate("All state machines in use"));
78+
}
79+
8080
pio_sm_set_enabled(self->state_machine.pio,self->state_machine.state_machine, false);
8181
pio_sm_clear_fifos(self->state_machine.pio,self->state_machine.state_machine);
82-
last_level = self->idle_state;
83-
level_count = 0;
84-
result = 0;
85-
buf_index = 0;
82+
self->last_level = self->idle_state;
83+
self->level_count = 0;
84+
self->buf_index = 0;
8685

8786
pio_sm_set_in_pins(self->state_machine.pio,self->state_machine.state_machine,pin->number);
8887
common_hal_rp2pio_statemachine_set_interrupt_handler(&(self->state_machine),&common_hal_pulseio_pulsein_interrupt,self,PIO_IRQ0_INTE_SM0_RXNEMPTY_BITS);
@@ -116,47 +115,50 @@ void common_hal_pulseio_pulsein_deinit(pulseio_pulsein_obj_t *self) {
116115
void common_hal_pulseio_pulsein_pause(pulseio_pulsein_obj_t *self) {
117116
pio_sm_restart(self->state_machine.pio, self->state_machine.state_machine);
118117
pio_sm_set_enabled(self->state_machine.pio, self->state_machine.state_machine, false);
119-
last_level = self->idle_state;
120-
level_count = 0;
121-
result = 0;
122-
buf_index = 0;
118+
self->last_level = self->idle_state;
119+
self->level_count = 0;
120+
self->buf_index = 0;
123121
}
124122
void common_hal_pulseio_pulsein_interrupt(pulseio_pulsein_obj_t *self) {
125123

126124
uint32_t rxfifo = 0;
127125

128126
rxfifo = pio_sm_get_blocking(self->state_machine.pio, self->state_machine.state_machine);
129127
// translate from fifo to buffer
130-
for (uint i = 0; i < 32; i++) {
131-
bool level = (rxfifo & (1 << i)) >> i;
132-
if (level == last_level) {
133-
level_count++;
134-
} else {
135-
result = level_count;
136-
last_level = level;
137-
level_count = 0;
138-
// Pulses that are longer than MAX_PULSE will return MAX_PULSE
139-
if (result > MAX_PULSE) {
140-
result = MAX_PULSE;
141-
}
142-
// return pulses that are not too short
143-
if (result > MIN_PULSE) {
144-
self->buffer[buf_index] = (uint16_t)result;
145-
if (self->len < self->maxlen) {
146-
self->len++;
128+
if ((rxfifo == 0 && self->last_level == false) || (rxfifo == 0xffffffff && self->last_level == true)) {
129+
self->level_count = self->level_count + 32;
130+
} else {
131+
for (uint i = 0; i < 32; i++) {
132+
bool level = (rxfifo & (1 << i)) >> i;
133+
if (level == self->last_level) {
134+
self->level_count++;
135+
} else {
136+
uint32_t result = self->level_count;
137+
self->last_level = level;
138+
self->level_count = 0;
139+
// Pulses that are longer than MAX_PULSE will return MAX_PULSE
140+
if (result > MAX_PULSE) {
141+
result = MAX_PULSE;
147142
}
148-
if (buf_index < self->maxlen) {
149-
buf_index++;
150-
} else {
151-
self->start = 0;
152-
buf_index = 0;
143+
// return pulses that are not too short
144+
if (result > MIN_PULSE) {
145+
self->buffer[self->buf_index] = (uint16_t)result;
146+
if (self->len < self->maxlen) {
147+
self->len++;
148+
}
149+
if (self->buf_index < self->maxlen) {
150+
self->buf_index++;
151+
} else {
152+
self->start = 0;
153+
self->buf_index = 0;
154+
}
153155
}
154156
}
155157
}
156158
}
157159

158160
// check for a pulse thats too long (MAX_PULSE us) or maxlen reached, and reset
159-
if ((level_count > MAX_PULSE) || (buf_index >= self->maxlen)) {
161+
if ((self->level_count > MAX_PULSE) || (self->buf_index >= self->maxlen)) {
160162
pio_sm_set_enabled(self->state_machine.pio, self->state_machine.state_machine, false);
161163
pio_sm_init(self->state_machine.pio, self->state_machine.state_machine, self->state_machine.offset, &self->state_machine.sm_config);
162164
pio_sm_restart(self->state_machine.pio,self->state_machine.state_machine);
@@ -189,7 +191,7 @@ void common_hal_pulseio_pulsein_resume(pulseio_pulsein_obj_t *self,
189191
void common_hal_pulseio_pulsein_clear(pulseio_pulsein_obj_t *self) {
190192
self->start = 0;
191193
self->len = 0;
192-
buf_index = 0;
194+
self->buf_index = 0;
193195
}
194196

195197
uint16_t common_hal_pulseio_pulsein_popleft(pulseio_pulsein_obj_t *self) {
@@ -202,8 +204,8 @@ uint16_t common_hal_pulseio_pulsein_popleft(pulseio_pulsein_obj_t *self) {
202204
// if we are empty reset buffer pointer and counters
203205
if (self->len == 0) {
204206
self->start = 0;
205-
buf_index = 0;
206-
level_count = 0;
207+
self->buf_index = 0;
208+
self->level_count = 0;
207209
}
208210
return value;
209211
}

‎ports/raspberrypi/common-hal/pulseio/PulseIn.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,14 @@
3636
typedef struct {
3737
mp_obj_base_t base;
3838
uint8_t pin;
39-
uint16_t *buffer;
40-
uint16_t maxlen;
4139
bool idle_state;
42-
volatile uint16_t start;
40+
uint16_t maxlen;
41+
uint16_t *buffer;
42+
volatile bool last_level;
43+
volatile uint32_t level_count;
4344
volatile uint16_t len;
45+
volatile uint16_t start;
46+
volatile uint16_t buf_index;
4447
rp2pio_statemachine_obj_t state_machine;
4548
} pulseio_pulsein_obj_t;
4649

0 commit comments

Comments
 (0)
0