SPI Hardware Not on AtTiny (#320)

Makuna · Dec 21, 2019 · e0782bb · e0782bb
1 parent 4b027db
commit e0782bb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -1,5 +1,5 @@
 name=NeoPixelBus by Makuna
-version=2.5.4
+version=2.5.5
 author=Michael C. Miller ([email protected])
 maintainer=Michael C. Miller ([email protected])
 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
@@ -46,10 +46,12 @@ template<typename T_TWOWIRE> 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<typename T_TWOWIRE> class DotStarMethodBase
 
 typedef DotStarMethodBase<TwoWireBitBangImple> DotStarMethod;
 
-#if !defined(__AVR_ATtiny85__)
+#if !defined(__AVR_ATtiny85__) && !defined(ARDUINO_attiny)
 #include "TwoWireSpiImple.h"
 typedef DotStarMethodBase<TwoWireSpiImple<SpiSpeed20Mhz>> DotStarSpi20MhzMethod;
 typedef DotStarMethodBase<TwoWireSpiImple<SpiSpeed10Mhz>> DotStarSpi10MhzMethod;

diff --git a/src/internal/Lpd8806GenericMethod.h b/src/internal/Lpd8806GenericMethod.h
@@ -46,10 +46,13 @@ template<typename T_TWOWIRE> 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<typename T_TWOWIRE> class Lpd8806MethodBase
 
 typedef Lpd8806MethodBase<TwoWireBitBangImple> Lpd8806Method;
 
-#if !defined(__AVR_ATtiny85__)
+#if !defined(__AVR_ATtiny85__) && !defined(ARDUINO_attiny)
 #include "TwoWireSpiImple.h"
 typedef Lpd8806MethodBase<TwoWireSpiImple<SpiSpeed20Mhz>> Lpd8806Spi20MhzMethod;
 typedef Lpd8806MethodBase<TwoWireSpiImple<SpiSpeed10Mhz>> Lpd8806Spi10MhzMethod;