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

Added counters per slice

Browse Source
This commit is contained in:
gamblor21 2021-02-27 15:17:27 -06:00
parent b935dcafdc
commit d7bc8a46a5
3 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
locale/circuitpython.pot
View File

@ -539,7 +539,6 @@ msgstr ""
#: ports/atmel-samd/common-hal/displayio/ParallelBus.c
#: ports/esp32s2/common-hal/displayio/ParallelBus.c
#: ports/nrf/common-hal/displayio/ParallelBus.c
#: ports/raspberrypi/common-hal/displayio/ParallelBus.c
#, c-format
msgid "Bus pin %d is already in use"
msgstr ""
@ -1688,6 +1687,10 @@ msgid ""
"PWM frequency not writable when variable_frequency is False on construction."
msgstr ""
#: ports/raspberrypi/common-hal/countio/Counter.c
msgid "PWM slice already in use"
msgstr ""
#: ports/mimxrt10xx/common-hal/displayio/ParallelBus.c
#: ports/raspberrypi/common-hal/displayio/ParallelBus.c
#: ports/stm/common-hal/displayio/ParallelBus.c
@ -3687,6 +3690,7 @@ msgstr ""
#: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h
#: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
#: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
#: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h
msgid "pressing boot button at start up.\n"
msgstr ""

29
ports/raspberrypi/common-hal/countio/Counter.c
View File

@ -19,6 +19,10 @@ void common_hal_countio_counter_construct(countio_counter_obj_t* self,
self->pin_a = pin_a->number;
self->slice_num = pwm_gpio_to_slice_num(self->pin_a);
if (MP_STATE_PORT(counting)[self->slice_num] != NULL) {
mp_raise_RuntimeError(translate("PWM slice already in use"));
}
pwm_clear_irq(self->slice_num);
pwm_set_irq_enabled(self->slice_num, true);
irq_set_exclusive_handler(PWM_IRQ_WRAP, counter_interrupt_handler);
@ -29,12 +33,11 @@ void common_hal_countio_counter_construct(countio_counter_obj_t* self,
pwm_init(self->slice_num, &cfg, false);
gpio_set_function(self->pin_a, GPIO_FUNC_PWM);
self->count = 0;
claim_pin(pin_a);
MP_STATE_PORT(counting) = self;
MP_STATE_PORT(counting)[self->slice_num] = self;
self->count = 0;
pwm_set_enabled(self->slice_num, true);
}
@ -51,10 +54,10 @@ void common_hal_countio_counter_deinit(countio_counter_obj_t* self) {
pwm_set_irq_enabled(self->slice_num, false);
reset_pin_number(self->pin_a);
gpio_init(self->pin_a);
MP_STATE_PORT(counting)[self->slice_num] = NULL;
self->pin_a = 0;
self->slice_num = 0;
MP_STATE_PORT(counting) = NULL;
}
mp_int_t common_hal_countio_counter_get_count(countio_counter_obj_t* self) {
@ -75,7 +78,17 @@ void common_hal_countio_counter_reset(countio_counter_obj_t* self){
}
void counter_interrupt_handler() {
countio_counter_obj_t *self = MP_STATE_PORT(counting);
pwm_clear_irq(self->slice_num);
self->count += 65536;
uint32_t mask = pwm_get_irq_status_mask();
uint8_t i = 1, pos = 1;
while (!(i & mask)) {
i = i << 1;
++pos;
}
countio_counter_obj_t *self = MP_STATE_PORT(counting)[pos-1];
if (self != NULL) {
pwm_clear_irq(self->slice_num);
self->count += 65536;
}
}

2
ports/raspberrypi/mpconfigport.h
View File

@ -43,7 +43,7 @@
#include "py/circuitpy_mpconfig.h"
#define MICROPY_PORT_ROOT_POINTERS \
mp_obj_t counting; \
mp_obj_t counting[NUM_PWM_SLICES]; \
mp_obj_t playing_audio[NUM_DMA_CHANNELS]; \
CIRCUITPY_COMMON_ROOT_POINTERS;