Skip to content

Added M-SoM Compatibility #47

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 1 commit into
base: master
Choose a base branch
from
Open

Added M-SoM Compatibility #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions library.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name=neopixel
version=1.0.4
version=1.0.5
license=LGPLv3
author=Adafruit, Technobly
sentence=An Implementation of Adafruit's NeoPixel Library for the Particle Core, Photon, Electron, Argon, Boron, Xenon, RedBear Duo, B SoM, B5 SoM, E SoM X, P2, Photon 2, and Tracker
sentence=An Implementation of Adafruit's NeoPixel Library for the Particle Core, Photon, Electron, Argon, Boron, Xenon, RedBear Duo, B SoM, B5 SoM, E SoM X, P2, Photon 2, M SoM and Tracker
url=https://github.com/technobly/Particle-NeoPixel
repository=https://github.com/technobly/Particle-NeoPixel.git
24 changes: 13 additions & 11 deletions src/neopixel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------
Particle Core, Particle Photon, P1, Electron, Argon, Boron, Xenon, B SoM, B5 SoM, E SoM X, P2, Photon 2, Tracker and
Particle Core, Particle Photon, P1, Electron, Argon, Boron, Xenon, B SoM, M SoM, B5 SoM, E SoM X, P2, Photon 2, Tracker and
RedBear Duo library to control WS2811/WS2812/WS2813 based RGB LED
devices such as Adafruit NeoPixel strips.

Expand Down Expand Up @@ -75,15 +75,15 @@
#endif // SYSTEM_VERSION < SYSTEM_VERSION_ALPHA(5,0,0,2)
#define pinLO(_pin) (nrf_gpio_pin_clear(NRF_GPIO_PIN_MAP(PIN_MAP2[_pin].gpio_port, PIN_MAP2[_pin].gpio_pin)))
#define pinHI(_pin) (nrf_gpio_pin_set(NRF_GPIO_PIN_MAP(PIN_MAP2[_pin].gpio_port, PIN_MAP2[_pin].gpio_pin)))
#elif (PLATFORM_ID == 32) // HAL_PLATFORM_RTL872X
// nothing extra needed for P2
#elif (PLATFORM_ID == 32 || PLATFORM_ID == 35) // HAL_PLATFORM_RTL872X
// nothing extra needed for P2 or M SoM
#else
#error "*** PLATFORM_ID not supported by this library. PLATFORM should be Particle Core, Photon, Electron, Argon, Boron, Xenon, RedBear Duo, B SoM, B5 SoM, E SoM X, Tracker or P2 ***"
#endif
// fast pin access
#define pinSet(_pin, _hilo) (_hilo ? pinHI(_pin) : pinLO(_pin))

#if (PLATFORM_ID == 32)
#if (PLATFORM_ID == 32 || PLATFORM_ID == 35) // HAL_PLATFORM_RTL872X
Adafruit_NeoPixel::Adafruit_NeoPixel(uint16_t n, SPIClass& spi, uint8_t t) :
begun(false), type(t), brightness(0), pixels(NULL), endTime(0)
{
Expand All @@ -98,11 +98,11 @@ Adafruit_NeoPixel::Adafruit_NeoPixel(uint16_t n, uint8_t p, uint8_t t) :
setPin(p);
}

#endif // #if (PLATFORM_ID == 32)
#endif // #if (PLATFORM_ID == 32 || PLATFORM_ID == 35)

Adafruit_NeoPixel::~Adafruit_NeoPixel() {
if (pixels) free(pixels);
#if (PLATFORM_ID == 32)
#if (PLATFORM_ID == 32 || PLATFORM_ID == 35)
spi_->end();
#else
if (begun) pinMode(pin, INPUT);
Expand Down Expand Up @@ -131,7 +131,9 @@ void Adafruit_NeoPixel::updateLength(uint16_t n) {
}

void Adafruit_NeoPixel::begin(void) {
#if (PLATFORM_ID == 32)
#if (PLATFORM_ID == 32 || PLATFORM_ID == 35)
// Setup SPI in MOSI mode only. To prevent MISO/SCK from being disturbed, their values
// are stored and restored after beginning spi.
if (getType() == WS2812B) {
if (spi_->interface() >= HAL_PLATFORM_SPI_NUM) {
Log.error("SPI/SPI1 interface not defined!");
Expand Down Expand Up @@ -172,7 +174,7 @@ void Adafruit_NeoPixel::begin(void) {
#else
pinMode(pin, OUTPUT);
digitalWrite(pin, LOW);
#endif // #if (PLATFORM_ID == 32)
#endif // #if (PLATFORM_ID == 32 || PLATFORM_ID == 35)
begun = true;
}

Expand All @@ -191,7 +193,7 @@ void Adafruit_NeoPixel::setPin(uint8_t p) {
void Adafruit_NeoPixel::show(void) {
if(!pixels) return;

#if (PLATFORM_ID != 32)
#if (PLATFORM_ID != 32 && PLATFORM_ID != 35)
// Data latch = 24 or 50 microsecond pause in the output stream. Rather than
// put a delay at the end of the function, the ending time is noted and
// the function will simply hold off (if needed) on issuing the
Expand Down Expand Up @@ -224,7 +226,7 @@ void Adafruit_NeoPixel::show(void) {
// endTime is a private member (rather than global var) so that multiple
// instances on different pins can be quickly issued in succession (each
// instance doesn't delay the next).
#endif // (PLATFORM_ID != 32)
#endif // (PLATFORM_ID != 32 && PLATFORM_ID != 35)

#if (PLATFORM_ID == 0) || (PLATFORM_ID == 6) || (PLATFORM_ID == 8) || (PLATFORM_ID == 10) || (PLATFORM_ID == 88) // Core (0), Photon (6), P1 (8), Electron (10) or Redbear Duo (88)
__disable_irq(); // Need 100% focus on instruction timing
Expand Down Expand Up @@ -872,7 +874,7 @@ void Adafruit_NeoPixel::show(void) {

__enable_irq();

#elif (PLATFORM_ID == 32)
#elif (PLATFORM_ID == 32 || PLATFORM_ID == 35)
if (getType() != WS2812B) { // WS2812 WS2812B and WS2813 supported for P2
Log.error("Pixel type not supported!");
return;
Expand Down
8 changes: 4 additions & 4 deletions src/neopixel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------
Particle Core, Particle Photon, P1, Electron, Argon, Boron, Xenon, B SoM, B5 SoM, E SoM X, P2, Photon 2, Tracker and
Particle Core, Particle Photon, P1, Electron, Argon, Boron, Xenon, B SoM, B5 SoM, E SoM X, P2, Photon 2, M SoM Tracker and
RedBear Duo library to control WS2811/WS2812/WS2813 based RGB LED
devices such as Adafruit NeoPixel strips.

Expand Down Expand Up @@ -73,11 +73,11 @@ class Adafruit_NeoPixel {
public:

// Constructor: number of LEDs, pin number, LED type
#if (PLATFORM_ID == 32)
#if (PLATFORM_ID == 32 || PLATFORM_ID == 35)
Adafruit_NeoPixel(uint16_t n, SPIClass& spi, uint8_t t=WS2812B);
#else
Adafruit_NeoPixel(uint16_t n, uint8_t p=2, uint8_t t=WS2812B);
#endif // #if (PLATFORM_ID == 32)
#endif // #if (PLATFORM_ID == 32 || PLATFORM_ID == 35)
~Adafruit_NeoPixel();

void
Expand Down Expand Up @@ -127,7 +127,7 @@ class Adafruit_NeoPixel {
*pixels; // Holds LED color values (3 bytes each)
uint32_t
endTime; // Latch timing reference
#if (PLATFORM_ID == 32)
#if (PLATFORM_ID == 32 || PLATFORM_ID == 35)
SPIClass*
spi_;
#endif
Expand Down