Merge pull request #53 from adafruit/pb-hwspi

Add support for non-default SPI devices

Author: PaintYourDragon

Adafruit_DotStar.cpp

@@ -44,17 +44,20 @@
 /*!
   @brief   DotStar constructor for hardware SPI. Must be connected to
            MOSI, SCK pins.
-  @param   n  Number of DotStars in strand.
-  @param   o  Pixel type -- one of the DOTSTAR_* constants defined in
-              Adafruit_DotStar.h, for example DOTSTAR_BRG for DotStars
-              expecting color bytes expressed in blue, red, green order
-              per pixel. Default if unspecified is DOTSTAR_BRG.
+  @param   n    Number of DotStars in strand.
+  @param   o    Pixel type -- one of the DOTSTAR_* constants defined in
+                Adafruit_DotStar.h, for example DOTSTAR_BRG for DotStars
+                expecting color bytes expressed in blue, red, green order
+                per pixel. Default if unspecified is DOTSTAR_BRG.
+  @param   spi  Pointer to hardware SPIClass object (default is primary
+                SPI device 'SPI' if defined, else MUST pass in device).
   @return  Adafruit_DotStar object. Call the begin() function before use.
 */
-Adafruit_DotStar::Adafruit_DotStar(uint16_t n, uint8_t o)
+Adafruit_DotStar::Adafruit_DotStar(uint16_t n, uint8_t o, SPIClass *spi)
     : numLEDs(n), brightness(0), pixels(NULL), rOffset(o & 3),
       gOffset((o >> 2) & 3), bOffset((o >> 4) & 3) {
-  spi_dev = new Adafruit_SPIDevice(-1, 8000000);
+  spi_dev = new Adafruit_SPIDevice(-1, 8000000, SPI_BITORDER_MSBFIRST,
+                                   SPI_MODE0, spi);
   updateLength(n);
 }
 

Adafruit_DotStar.h

@@ -101,7 +101,11 @@ static const uint8_t PROGMEM _DotStarGammaTable[256] = {
 class Adafruit_DotStar {
 
 public:
-  Adafruit_DotStar(uint16_t n, uint8_t o = DOTSTAR_BRG);
+#if defined SPI // Is a default hardware SPI device defined for this board?
+  Adafruit_DotStar(uint16_t n, uint8_t o = DOTSTAR_BRG, SPIClass *spi = &SPI);
+#else
+  Adafruit_DotStar(uint16_t n, uint8_t o = DOTSTAR_BRG, SPIClass *spi = NULL);
+#endif
   Adafruit_DotStar(uint16_t n, uint8_t d, uint8_t c, uint8_t o = DOTSTAR_BRG);
   ~Adafruit_DotStar(void);
 

library.properties

@@ -1,5 +1,5 @@
 name=Adafruit DotStar
-version=1.2.1
+version=1.2.2
 author=Adafruit
 maintainer=Adafruit <info@adafruit.com>
 sentence=Adafruit DotStar LED Library