Permalink
Browse files

SparkCore needs FastLED to be in a namespace.

  • Loading branch information...
focalintent committed Feb 9, 2015
1 parent f149084 commit 033f47f3c95f4143d7f1d97144b0100dafa3d1df
Showing with 235 additions and 66 deletions.
  1. +2 −0 FastLED.cpp
  2. +4 −0 FastLED.h
  3. +5 −0 bitswap.h
  4. +4 −0 chipsets.h
  5. +6 −1 color.h
  6. +2 −0 colorpalettes.cpp
  7. +3 −0 colorpalettes.h
  8. +1 −0 colorutils.cpp
  9. +66 −60 colorutils.h
  10. +4 −0 controller.h
  11. +3 −0 delay.h
  12. +9 −0 dmx.h
  13. +66 −3 fastpin.h
  14. +4 −0 fastspi.h
  15. +4 −0 fastspi_bitbang.h
  16. +4 −0 fastspi_nop.h
  17. +5 −1 fastspi_ref.h
  18. +4 −0 fastspi_types.h
  19. +2 −0 hsv2rgb.cpp
  20. +3 −0 hsv2rgb.h
  21. +9 −1 led_sysdefs.h
  22. +2 −0 lib8tion.cpp
  23. +4 −0 lib8tion.h
  24. +2 −0 noise.cpp
  25. +4 −0 noise.h
  26. +3 −0 pixeltypes.h
  27. +2 −0 platforms.h
  28. +2 −0 power_mgt.cpp
  29. +4 −0 power_mgt.h
  30. +2 −0 wiring.cpp
@@ -1,6 +1,8 @@
#define FASTLED_INTERNAL
#include "FastLED.h"
FASTLED_USING_NAMESPACE
#if defined(__SAM3X8E__)
volatile uint32_t fuckit;
#endif
@@ -52,6 +52,8 @@
#include "fastspi.h"
#include "chipsets.h"
FASTLED_NAMESPACE_BEGIN
enum ESPIChipsets {
LPD8806,
WS2801,
@@ -464,4 +466,6 @@ extern CFastLED FastLED;
#endif
FASTLED_NAMESPACE_END
#endif
@@ -1,6 +1,8 @@
#ifndef __INC_BITSWAP_H
#define __INC_BITSWAP_H
FASTLED_NAMESPACE_BEGIN
#ifdef FASTLED_ARM
// structure representing 8 bits of access
typedef union {
@@ -254,4 +256,7 @@ __attribute__((always_inline)) inline void transpose8(unsigned char *A, unsigned
// B[4*n]=y>>24; B[5*n]=y>>16; B[6*n]=y>>8; B[7*n]=y>>0;
}
#endif
FASTLED_NAMESPACE_END
#endif
@@ -3,6 +3,8 @@
#include "pixeltypes.h"
FASTLED_NAMESPACE_BEGIN
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// DeepPixel controller class - takes data/clock/select pin values (N.B. should take an SPI definition?)
@@ -577,4 +579,6 @@ class LPD1886Controller1250Khz : public ClocklessController<DATA_PIN, NS(200), N
#endif
FASTLED_NAMESPACE_END
#endif
@@ -1,6 +1,8 @@
#ifndef __INC_COLOR_H
#define __INC_COLOR_H
FASTLED_NAMESPACE_BEGIN
// definitions for color correction and light temperatures
typedef enum {
@@ -51,4 +53,7 @@ typedef enum {
// Uncorrected temperature 0xFFFFFF
UncorrectedTemperature=0xFFFFFF
} ColorTemperature;
#endif
FASTLED_NAMESPACE_END
#endif
@@ -5,6 +5,8 @@
#include "colorutils.h"
#include "colorpalettes.h"
FASTLED_USING_NAMESPACE
// Workaround for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=34734
#ifdef FASTLED_AVR
#ifdef PROGMEM
@@ -3,6 +3,7 @@
#include "colorutils.h"
FASTLED_NAMESPACE_BEGIN
// Preset color schemes, such as they are.
@@ -39,4 +40,6 @@ extern const TProgmemRGBPalette16 PartyColors_p PROGMEM;
// which looks wrong.
extern const TProgmemRGBPalette16 HeatColors_p PROGMEM;
FASTLED_NAMESPACE_END
#endif
@@ -5,6 +5,7 @@
#include "FastLED.h"
FASTLED_USING_NAMESPACE
Oops, something went wrong.

0 comments on commit 033f47f

Please sign in to comment.