diff options
| author | DavePutz <dwputz@gmail.com> | 2021-03-12 16:18:33 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-12 16:18:33 -0600 |
| commit | 96ce43e6d6eaad1ef4d7ab455f594ed64169bc9d (patch) | |
| tree | 8e6da1573fad5718f863a364c3174330f2f3dd6b /ports/raspberrypi/common-hal/pulseio/PulseIn.h | |
| parent | 6628f49852a4963cb2aeaa08fa281eb0e994415e (diff) | |
Added the correct files
Diffstat (limited to 'ports/raspberrypi/common-hal/pulseio/PulseIn.h')
| -rw-r--r-- | ports/raspberrypi/common-hal/pulseio/PulseIn.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ports/raspberrypi/common-hal/pulseio/PulseIn.h b/ports/raspberrypi/common-hal/pulseio/PulseIn.h index 39199e524..c83a86fca 100644 --- a/ports/raspberrypi/common-hal/pulseio/PulseIn.h +++ b/ports/raspberrypi/common-hal/pulseio/PulseIn.h @@ -42,10 +42,6 @@ typedef struct { volatile uint16_t start; volatile uint16_t len; rp2pio_statemachine_obj_t state_machine; -<<<<<<< HEAD -======= - uint16_t pio_interrupt; ->>>>>>> a3c3e8a0fa5e06910747f1a95a12b899562a618d } pulseio_pulsein_obj_t; void pulsein_reset(void); |