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

Made suggested changes (mostly)

Browse Source
This commit is contained in:
root 2021-07-18 12:00:37 -05:00
parent 1c80696746
commit 43275e0b0d
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,6 @@
#define NO_PIN 0xff
#define MAX_PULSE 65535
#define MIN_PULSE 10
volatile uint32_t result = 0;
uint16_t pulsein_program[] = {
0x4001, // 1: in pins, 1
@ -82,7 +81,6 @@ void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t *self,
pio_sm_clear_fifos(self->state_machine.pio,self->state_machine.state_machine);
self->last_level = self->idle_state;
self->level_count = 0;
result = 0;
self->buf_index = 0;
pio_sm_set_in_pins(self->state_machine.pio,self->state_machine.state_machine,pin->number);
@ -119,7 +117,6 @@ void common_hal_pulseio_pulsein_pause(pulseio_pulsein_obj_t *self) {
pio_sm_set_enabled(self->state_machine.pio, self->state_machine.state_machine, false);
self->last_level = self->idle_state;
self->level_count = 0;
result = 0;
self->buf_index = 0;
}
void common_hal_pulseio_pulsein_interrupt(pulseio_pulsein_obj_t *self) {
@ -136,7 +133,7 @@ void common_hal_pulseio_pulsein_interrupt(pulseio_pulsein_obj_t *self) {
if (level == self->last_level) {
self->level_count++;
} else {
result = self->level_count;
uint32_t result = self->level_count;
self->last_level = level;
self->level_count = 0;
// Pulses that are longer than MAX_PULSE will return MAX_PULSE

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

@ -36,14 +36,14 @@
typedef struct {
mp_obj_base_t base;
uint8_t pin;
uint16_t *buffer;
uint16_t maxlen;
bool idle_state;
bool last_level;
uint32_t level_count;
volatile uint16_t buf_index;
volatile uint16_t start;
uint16_t maxlen;
uint16_t *buffer;
volatile bool last_level;
volatile uint32_t level_count;
volatile uint16_t len;
volatile uint16_t start;
volatile uint16_t buf_index;
rp2pio_statemachine_obj_t state_machine;
} pulseio_pulsein_obj_t;