From e0782bb88b5937bf4d16c5004fdcfcf4c304da3b Mon Sep 17 00:00:00 2001 From: Michael Miller Date: Fri, 20 Dec 2019 23:48:00 -0800 Subject: [PATCH] SPI Hardware Not on AtTiny (#320) --- library.json | 2 +- library.properties | 2 +- src/internal/DotStarGenericMethod.h | 4 +++- src/internal/Lpd8806GenericMethod.h | 5 ++++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/library.json b/library.json index c080a611..86e6d46a 100644 --- a/library.json +++ b/library.json @@ -7,7 +7,7 @@ "type": "git", "url": "https://github.com/Makuna/NeoPixelBus" }, - "version": "2.5.4", + "version": "2.5.5", "frameworks": "arduino", "platforms": "*" } diff --git a/library.properties b/library.properties index 58c8c5a0..2eceb5e9 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=NeoPixelBus by Makuna -version=2.5.4 +version=2.5.5 author=Michael C. Miller (makuna@live.com) maintainer=Michael C. Miller (makuna@live.com) sentence=A library that makes controlling NeoPixels (APA106, WS2811, WS2812, WS2813 & SK6812) and DotStars (APA102, LPD8806, SK9822) easy. diff --git a/src/internal/DotStarGenericMethod.h b/src/internal/DotStarGenericMethod.h index c660e3cf..4b29c6bb 100644 --- a/src/internal/DotStarGenericMethod.h +++ b/src/internal/DotStarGenericMethod.h @@ -46,10 +46,12 @@ template class DotStarMethodBase memset(_pixels, 0, _sizePixels); } +#if !defined(__AVR_ATtiny85__) && !defined(ARDUINO_attiny) DotStarMethodBase(uint16_t pixelCount, size_t elementSize) : DotStarMethodBase(SCK, MOSI, pixelCount, elementSize) { } +#endif ~DotStarMethodBase() { @@ -115,7 +117,7 @@ template class DotStarMethodBase typedef DotStarMethodBase DotStarMethod; -#if !defined(__AVR_ATtiny85__) +#if !defined(__AVR_ATtiny85__) && !defined(ARDUINO_attiny) #include "TwoWireSpiImple.h" typedef DotStarMethodBase> DotStarSpi20MhzMethod; typedef DotStarMethodBase> DotStarSpi10MhzMethod; diff --git a/src/internal/Lpd8806GenericMethod.h b/src/internal/Lpd8806GenericMethod.h index ddfe0d0f..1e109d52 100644 --- a/src/internal/Lpd8806GenericMethod.h +++ b/src/internal/Lpd8806GenericMethod.h @@ -46,10 +46,13 @@ template class Lpd8806MethodBase memset(_pixels, 0, _sizePixels); } +#if !defined(__AVR_ATtiny85__) && !defined(ARDUINO_attiny) Lpd8806MethodBase(uint16_t pixelCount, size_t elementSize) : Lpd8806MethodBase(SCK, MOSI, pixelCount, elementSize) { } +#endif + ~Lpd8806MethodBase() { @@ -115,7 +118,7 @@ template class Lpd8806MethodBase typedef Lpd8806MethodBase Lpd8806Method; -#if !defined(__AVR_ATtiny85__) +#if !defined(__AVR_ATtiny85__) && !defined(ARDUINO_attiny) #include "TwoWireSpiImple.h" typedef Lpd8806MethodBase> Lpd8806Spi20MhzMethod; typedef Lpd8806MethodBase> Lpd8806Spi10MhzMethod;