Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FastLED/FastLED.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Kriegsman <kriegsman@tr.org>2015-07-23 20:02:37 +0300
committerMark Kriegsman <kriegsman@tr.org>2015-07-23 20:02:37 +0300
commitc2ee876cc4a80854da50cb7c3de9d861be9be43f (patch)
tree9f3989151b617d317950ff59375a4224e674254f /noise.cpp
parent4cef6f2dd1788d4d0ffb290177a3056bbdb850df (diff)
PROGMEM made optional. Control via FASTLED_USE_PROGMEM, which defaults to the right thing.
Diffstat (limited to 'noise.cpp')
-rw-r--r--noise.cpp21
1 files changed, 1 insertions, 20 deletions
diff --git a/noise.cpp b/noise.cpp
index 51b46ad0..190e74e7 100644
--- a/noise.cpp
+++ b/noise.cpp
@@ -1,28 +1,9 @@
#define FASTLED_INTERNAL
#include "FastLED.h"
-#ifdef FASTLED_AVR
-#include <avr/pgmspace.h>
-#define USE_PROGMEM
-#endif
-
FASTLED_NAMESPACE_BEGIN
-// Workaround for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=34734
-#ifdef FASTLED_AVR
-#ifdef PROGMEM
-#undef PROGMEM
-#define PROGMEM __attribute__((section(".progmem.data")))
-#endif
-#endif
-
-#ifdef USE_PROGMEM
-#define FL_PROGMEM PROGMEM
-#define P(x) pgm_read_byte_near(p + x)
-#else
-#define FL_PROGMEM
-#define P(x) p[(x)]
-#endif
+#define P(x) FL_PGM_READ_BYTE_NEAR(p + x)
FL_PROGMEM static uint8_t const p[] = { 151,160,137,91,90,15,
131,13,201,95,96,53,194,233,7,225,140,36,103,30,69,142,8,99,37,240,21,10,23,