Skip to content

Moves claiming of sm to init; destructor frees pio resources. #352

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Moves claiming of sm to init; destructor frees pio resources. #352

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
84ce468
Moves claiming of sm to init; destructor frees pio resources.
MarcusGarfunkel Mar 23, 2023
b7f9727
Added RP2040 ifdef to destructor additions
MarcusGarfunkel Mar 23, 2023
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
32 changes: 21 additions & 11 deletions Adafruit_NeoPixel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,6 @@ Adafruit_NeoPixel::Adafruit_NeoPixel(uint16_t n, int16_t p, neoPixelType t)
updateType(t);
updateLength(n);
setPin(p);
#if defined(ARDUINO_ARCH_RP2040)
// Find a free SM on one of the PIO's
sm = pio_claim_unused_sm(pio, false); // don't panic
// Try pio1 if SM not found
if (sm < 0) {
pio = pio1;
sm = pio_claim_unused_sm(pio, true); // panic if no SM is free
}
init = true;
#endif
}

/*!
Expand Down Expand Up @@ -120,6 +110,15 @@ Adafruit_NeoPixel::~Adafruit_NeoPixel() {
free(pixels);
if (pin >= 0)
pinMode(pin, INPUT);

#if defined(ARDUINO_ARCH_RP2040)
if(!init)
{
pio_sm_set_enabled(pio, sm, false);
pio_remove_program(pio, &ws2812_program, offset);
pio_sm_unclaim(pio, sm);
}
#endif
}

/*!
Expand Down Expand Up @@ -197,7 +196,18 @@ void Adafruit_NeoPixel::updateType(neoPixelType t) {
#if defined(ARDUINO_ARCH_RP2040)
void Adafruit_NeoPixel::rp2040Init(uint8_t pin, bool is800KHz)
{
uint offset = pio_add_program(pio, &ws2812_program);


// Find a free SM on one of the PIO's
sm = pio_claim_unused_sm(pio, false); // don't panic
// Try pio1 if SM not found
if (sm < 0) {
pio = pio1;
sm = pio_claim_unused_sm(pio, true); // panic if no SM is free
}
init = true;

offset = pio_add_program(pio, &ws2812_program);

if (is800KHz)
{
Expand Down
1 change: 1 addition & 0 deletions Adafruit_NeoPixel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,7 @@ class Adafruit_NeoPixel {
PIO pio = pio0;
int sm = 0;
bool init = true;
uint offset;
#endif
};

Expand Down