Skip to content

espressif: enable PCNT accumulator for Counter, FrequencyIn, Incremental Encoder #9461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 25, 2024
Merged

espressif: enable PCNT accumulator for Counter, FrequencyIn, Incremental Encoder #9461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a60ad7b
espressif: enable PCNT accumulator for Counter, FrequencyIn, Incremen…
vickash Jul 25, 2024
3e44957
Fix whitespace and dereference error in espressif FrequencyIn
vickash Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ports/espressif/common-hal/countio/Counter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,19 @@ void common_hal_countio_counter_construct(countio_counter_obj_t *self,

pcnt_unit_config_t unit_config = {
// Set counter limit
.low_limit = -1,
.low_limit = INT16_MIN,
.high_limit = INT16_MAX
};
// The pulse count driver automatically counts roll overs.
// Enable PCNT internal accumulator to count overflows.
unit_config.flags.accum_count = true;

// initialize PCNT
CHECK_ESP_RESULT(pcnt_new_unit(&unit_config, &self->unit));

// Set watchpoints at limis, to auto-accumulate overflows.
pcnt_unit_add_watch_point(self->unit, INT16_MIN);
pcnt_unit_add_watch_point(self->unit, INT16_MAX);

self->pin = pin->number;
pcnt_chan_config_t channel_config = {
.edge_gpio_num = self->pin,
Expand Down
8 changes: 6 additions & 2 deletions ports/espressif/common-hal/frequencyio/FrequencyIn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ static IRAM_ATTR bool timer_interrupt_handler(gptimer_handle_t timer,
static esp_err_t init_pcnt(frequencyio_frequencyin_obj_t *self) {
pcnt_unit_config_t unit_config = {
// Set counter limit
.low_limit = -INT16_MAX + 1,
.low_limit = INT16_MIN,
.high_limit = INT16_MAX
};
// The pulse count driver automatically counts roll overs.
// Enable PCNT internal accumulator to count overflows.
unit_config.flags.accum_count = true;

// initialize PCNT
Expand All @@ -42,6 +42,10 @@ static esp_err_t init_pcnt(frequencyio_frequencyin_obj_t *self) {
return result;
}

// Set watchpoints at limis, to auto-accumulate overflows.
pcnt_unit_add_watch_point(self->internal_data->unit, INT16_MIN);
pcnt_unit_add_watch_point(self->internal_data->unit, INT16_MAX);

pcnt_chan_config_t channel_config = {
.edge_gpio_num = self->pin,
.level_gpio_num = -1
Expand Down
8 changes: 6 additions & 2 deletions ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,19 @@ void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencode
// in CircuitPython.
pcnt_unit_config_t unit_config = {
// Set counter limit
.low_limit = -INT16_MAX,
.low_limit = INT16_MIN,
.high_limit = INT16_MAX
};
// The pulse count driver automatically counts roll overs.
// Enable PCNT internal accumulator to count overflows.
unit_config.flags.accum_count = true;

// initialize PCNT
CHECK_ESP_RESULT(pcnt_new_unit(&unit_config, &self->unit));

// Set watchpoints at limits, to auto-accumulate overflows.
pcnt_unit_add_watch_point(self->unit, INT16_MIN);
pcnt_unit_add_watch_point(self->unit, INT16_MAX);

pcnt_chan_config_t channel_a_config = {
.edge_gpio_num = pin_a->number,
.level_gpio_num = pin_b->number
Expand Down