diff options
-rw-r--r-- | FastLED.cpp (renamed from FastSPI_LED2.cpp) | 20 | ||||
-rw-r--r-- | FastLED.h (renamed from FastSPI_LED2.h) | 12 | ||||
-rw-r--r-- | examples/Fast2Dev/Fast2Dev.ino | 2 | ||||
-rw-r--r-- | examples/FirstLight/FirstLight.ino | 4 | ||||
-rw-r--r-- | examples/RGBCalibrate/RGBCalibrate.ino | 4 |
5 files changed, 21 insertions, 21 deletions
diff --git a/FastSPI_LED2.cpp b/FastLED.cpp index b8e46e4d..85095210 100644 --- a/FastSPI_LED2.cpp +++ b/FastLED.cpp @@ -1,21 +1,21 @@ #include "FastSPI_LED2.h" -CFastSPI_LED2 LEDS; -CFastSPI_LED2 & FastSPI_LED = LEDS; -CFastSPI_LED2 & FastSPI_LED2 = LEDS; -CFastSPI_LED2 & FastLED = LEDS; +CFastLED LEDS; +CFastLED & FastSPI_LED = LEDS; +CFastLED & FastSPI_LED2 = LEDS; +CFastLED & FastLED = LEDS; uint32_t CRGB::Squant = ((uint32_t)((__TIME__[4]-'0') * 28))<<16 | ((__TIME__[6]-'0')*50)<<8 | ((__TIME__[7]-'0')*28); -CFastSPI_LED2::CFastSPI_LED2() { +CFastLED::CFastLED() { // clear out the array of led controllers m_nControllers = NUM_CONTROLLERS; m_nScale = 255; memset8(m_Controllers, 0, m_nControllers * sizeof(CControllerInfo)); } -CLEDController *CFastSPI_LED2::addLeds(CLEDController *pLed, +CLEDController *CFastLED::addLeds(CLEDController *pLed, const struct CRGB *data, int nLedsOrOffset, int nLedsIfOffset) { int nOffset = (nLedsIfOffset > 0) ? nLedsOrOffset : 0; @@ -44,7 +44,7 @@ CLEDController *CFastSPI_LED2::addLeds(CLEDController *pLed, return NULL; } -void CFastSPI_LED2::show(uint8_t scale) { +void CFastLED::show(uint8_t scale) { for(int i = 0; i < m_nControllers; i++) { if(m_Controllers[i].pLedController != NULL) { m_Controllers[i].pLedController->show(m_Controllers[i].pLedData + m_Controllers[i].nOffset, @@ -55,7 +55,7 @@ void CFastSPI_LED2::show(uint8_t scale) { } } -void CFastSPI_LED2::showColor(const struct CRGB & color, uint8_t scale) { +void CFastLED::showColor(const struct CRGB & color, uint8_t scale) { for(int i = 0; i < m_nControllers; i++) { if(m_Controllers[i].pLedController != NULL) { m_Controllers[i].pLedController->showColor(color, m_Controllers[i].nLeds, scale); @@ -65,7 +65,7 @@ void CFastSPI_LED2::showColor(const struct CRGB & color, uint8_t scale) { } } -void CFastSPI_LED2::clear(boolean includeLedData) { +void CFastLED::clear(boolean includeLedData) { showColor(CRGB(0,0,0), 0); if(includeLedData) { for(int i = 0; i < m_nControllers; i++) { @@ -76,4 +76,4 @@ void CFastSPI_LED2::clear(boolean includeLedData) { } } } -}
\ No newline at end of file +} diff --git a/FastSPI_LED2.h b/FastLED.h index de228c53..a2891fcd 100644 --- a/FastSPI_LED2.h +++ b/FastLED.h @@ -31,7 +31,7 @@ enum EClocklessChipsets { #define NUM_CONTROLLERS 8 -class CFastSPI_LED2 { +class CFastLED { struct CControllerInfo { CLEDController *pLedController; const struct CRGB *pLedData; @@ -44,7 +44,7 @@ class CFastSPI_LED2 { uint8_t m_nScale; public: - CFastSPI_LED2(); + CFastLED(); CLEDController *addLeds(CLEDController *pLed, const struct CRGB *data, int nLedsOrOffset, int nLedsIfOffset = 0); @@ -139,9 +139,9 @@ public: }; -extern CFastSPI_LED2 & FastSPI_LED; -extern CFastSPI_LED2 & FastSPI_LED2; -extern CFastSPI_LED2 & FastLED; -extern CFastSPI_LED2 LEDS; +extern CFastLED & FastSPI_LED; +extern CFastLED & FastSPI_LED2; +extern CFastLED & FastLED; +extern CFastLED LEDS; #endif diff --git a/examples/Fast2Dev/Fast2Dev.ino b/examples/Fast2Dev/Fast2Dev.ino index 3e5cca73..5090aaad 100644 --- a/examples/Fast2Dev/Fast2Dev.ino +++ b/examples/Fast2Dev/Fast2Dev.ino @@ -7,7 +7,7 @@ // Uncomment this line if you want to talk to DMX controllers // #define FASTSPI_USE_DMX_SIMPLE 1 -#include "FastSPI_LED2.h" +#include "FastLED.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/examples/FirstLight/FirstLight.ino b/examples/FirstLight/FirstLight.ino index eb9a3c8f..fcfbacbd 100644 --- a/examples/FirstLight/FirstLight.ino +++ b/examples/FirstLight/FirstLight.ino @@ -1,6 +1,6 @@ #define FORCE_SOFTWARE_SPI #define FORCE_SOFTWARE_PINS -#include "FastSPI_LED2.h" +#include "FastLED.h" /////////////////////////////////////////////////////////////////////////////////////////// // @@ -29,7 +29,7 @@ void setup() { // FastLED.addLeds<TM1803, DATA_PIN, RGB>(leds, NUM_LEDS); // FastLED.addLeds<TM1804, DATA_PIN, RGB>(leds, NUM_LEDS); // FastLED.addLeds<TM1809, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastSPI_LED2.addLeds<WS2811, DATA_PIN, GRB>(leds+18, NUM_LEDS/3); + // FastLED.addLeds<WS2811, DATA_PIN, GRB>(leds+18, NUM_LEDS/3); // FastLED.addLeds<WS2811, 8, RGB>(leds + 225, NUM_LEDS/4); // FastLED.addLeds<WS2812, DATA_PIN, RGB>(leds, NUM_LEDS); // FastLED.addLeds<WS2812B, DATA_PIN, RGB>(leds, NUM_LEDS); diff --git a/examples/RGBCalibrate/RGBCalibrate.ino b/examples/RGBCalibrate/RGBCalibrate.ino index 9e6b564d..55661052 100644 --- a/examples/RGBCalibrate/RGBCalibrate.ino +++ b/examples/RGBCalibrate/RGBCalibrate.ino @@ -1,4 +1,4 @@ -#include "FastSPI_LED2.h" +#include "FastLED.h" //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -63,4 +63,4 @@ void loop() { leds[5] = CRGB::Blue; FastLED.show(); delay(1000); -}
\ No newline at end of file +} |