Skip to content
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

Jump to bottom

Added Arduino Nicla Sense ME support (fixes #319) #331

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

Added Arduino Nicla Sense ME support (fixes #319) #331

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3f4d3a
Added Arduino Nicla Sense ME support
Alexandra182 Oct 4, 2022
e6a253c
fixed typo
Alexandra182 Oct 4, 2022
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
18 changes: 15 additions & 3 deletions Adafruit_NeoPixel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@
#endif
#endif

#if defined(ARDUINO_ARCH_NRF52832)
#include <pinDefinitions.h>
#endif

/*!
@brief NeoPixel constructor when length, pin and pixel type are known
at compile-time.
Expand Down Expand Up @@ -1752,7 +1756,11 @@ void Adafruit_NeoPixel::show(void) {

uint8_t *p = pixels, *end = p + numBytes, pix, mask;
volatile uint32_t *set = portSetRegister(pin), *clr = portClearRegister(pin);
#if defined(ARDUINO_ARCH_NRF52832)
uint32_t cyc, msk = digitalPinToPinName(pin);
#else
uint32_t cyc, msk = digitalPinToBitMask(pin);
#endif

ARM_DEMCR |= ARM_DEMCR_TRCENA;
ARM_DWT_CTRL |= ARM_DWT_CTRL_CYCCNTENA;
Expand Down Expand Up @@ -2129,7 +2137,7 @@ void Adafruit_NeoPixel::show(void) {
// pwm->INTEN |= (PWM_INTEN_SEQEND0_Enabled<<PWM_INTEN_SEQEND0_Pos);

// PSEL must be configured before enabling PWM
#if defined(ARDUINO_ARCH_NRF52840)
#if defined(ARDUINO_ARCH_NRF52840) || defined(ARDUINO_ARCH_NRF52832)
pwm->PSEL.OUT[0] = g_APinDescription[pin].name;
#else
pwm->PSEL.OUT[0] = g_ADigitalPinMap[pin];
Expand All @@ -2145,7 +2153,7 @@ void Adafruit_NeoPixel::show(void) {

// But we have to wait for the flag to be set.
while (!pwm->EVENTS_SEQEND[0]) {
#if defined(ARDUINO_NRF52_ADAFRUIT) || defined(ARDUINO_ARCH_NRF52840)
#if defined(ARDUINO_NRF52_ADAFRUIT) || defined(ARDUINO_ARCH_NRF52840) || defined(ARDUINO_ARCH_NRF52832)
yield();
#endif
}
Expand Down Expand Up @@ -2185,7 +2193,11 @@ void Adafruit_NeoPixel::show(void) {
#endif

NRF_GPIO_Type *nrf_port = (NRF_GPIO_Type *)digitalPinToPort(pin);
uint32_t pinMask = digitalPinToBitMask(pin);
#if defined(ARDUINO_ARCH_NRF52832)
uint32_t pinMask = digitalPinToPinName(pin);
#else
uint32_t pinMask = digitalPinToBitMask(pin);
#endif

uint32_t CYCLES_X00 = CYCLES_800;
uint32_t CYCLES_X00_T1H = CYCLES_800_T1H;
Expand Down