Prefix config defines with FASTLED_ to make sure we don't conflict with anything else.

8 files changed, 14 insertions, 14 deletions

diff --git a/examples/FirstLight/FirstLight.ino b/examples/FirstLight/FirstLight.ino
index 928c7bbd..beec2986 100644
--- a/examples/FirstLight/FirstLight.ino
+++ b/examples/FirstLight/FirstLight.ino
@@ -1,8 +1,8 @@
 // Use if you want to force the software SPI subsystem to be used for some reason (generally, you don't)
-// #define FORCE_SOFTWARE_SPI
+// #define FASTLED_FORCE_SOFTWARE_SPI
 // Use if you want to force non-accelerated pin access (hint: you really don't, it breaks lots of things)
-// #define FORCE_SOFTWARE_SPI
-// #define FORCE_SOFTWARE_PINS
+// #define FASTLED_FORCE_SOFTWARE_SPI
+// #define FASTLED_FORCE_SOFTWARE_PINS
 #include "FastLED.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/fastled_config.h b/fastled_config.h
index e085f61a..d7a0a8d9 100644
--- a/fastled_config.h
+++ b/fastled_config.h
@@ -4,11 +4,11 @@
 // Use this option only for debugging pin access and forcing software pin access.  Note that
 // software pin access only works in Arduino based environments.  Forces use of digitalWrite
 // methods for pin access vs. direct hardware port access
-// #define FORCE_SOFTWARE_PINS
+// #define FASTLED_FORCE_SOFTWARE_PINS
 
 // Use this option only for debugging bitbang'd spi access or to work around bugs in hardware
 // spi access.  Forces use of bit-banged spi, even on pins that has hardware SPI available.
-// #define FORCE_SOFTWARE_SPI
+// #define FASTLED_FORCE_SOFTWARE_SPI
 
 // Use this to force FastLED to allow interrupts in the clockless chipsets (or to force it to
 // disallow), overriding the default on platforms that support this.  Set the value to 1 to
diff --git a/fastspi.h b/fastspi.h
index 4c247157..d64a0984 100644
--- a/fastspi.h
+++ b/fastspi.h
@@ -27,7 +27,7 @@ class SPIOutput : public AVRSoftwareSPIOutput<_DATA_PIN, _CLOCK_PIN, _SPI_CLOCK_
 template<uint8_t _DATA_PIN, uint8_t _CLOCK_PIN, uint8_t _SPI_CLOCK_DIVIDER>
 class SoftwareSPIOutput : public AVRSoftwareSPIOutput<_DATA_PIN, _CLOCK_PIN, _SPI_CLOCK_DIVIDER> {};
 
-#ifndef FORCE_SOFTWARE_SPI
+#ifndef FASTLED_FORCE_SOFTWARE_SPI
 #if defined(SPI_DATA) && defined(SPI_CLOCK)
 
 #if defined(FASTLED_TEENSY3) && defined(CORE_TEENSY)
diff --git a/platforms/arm/k20/fastpin_arm_k20.h b/platforms/arm/k20/fastpin_arm_k20.h
index edbbd5b9..99666a49 100644
--- a/platforms/arm/k20/fastpin_arm_k20.h
+++ b/platforms/arm/k20/fastpin_arm_k20.h
@@ -1,7 +1,7 @@
 #ifndef __FASTPIN_ARM_K20_H
 #define __FASTPIN_ARM_K20_H
 
-#if defined(FORCE_SOFTWARE_PINS)
+#if defined(FASTLED_FORCE_SOFTWARE_PINS)
 #warning "Software pin support forced, pin access will be sloightly slower."
 #define NO_HARDWARE_PIN_SUPPORT
 #undef HAS_HARDWARE_PIN_SUPPORT
@@ -113,6 +113,6 @@ _DEFPIN_ARM(32, 18, B); _DEFPIN_ARM(33, 4, A);
 #define HAS_HARDWARE_PIN_SUPPORT
 #endif
 
-#endif // FORCE_SOFTWARE_PINS
+#endif // FASTLED_FORCE_SOFTWARE_PINS
 
 #endif // __INC_FASTPIN_ARM_K20
diff --git a/platforms/arm/sam/fastpin_arm_sam.h b/platforms/arm/sam/fastpin_arm_sam.h
index e1a36990..a370e753 100644
--- a/platforms/arm/sam/fastpin_arm_sam.h
+++ b/platforms/arm/sam/fastpin_arm_sam.h
@@ -1,7 +1,7 @@
 #ifndef __INC_FASTPIN_ARM_SAM_H
 #define __INC_FASTPIN_ARM_SAM_H
 
-#if defined(FORCE_SOFTWARE_PINS)
+#if defined(FASTLED_FORCE_SOFTWARE_PINS)
 #warning "Software pin support forced, pin access will be sloightly slower."
 #define NO_HARDWARE_PIN_SUPPORT
 #undef HAS_HARDWARE_PIN_SUPPORT
@@ -127,6 +127,6 @@ _DEFPIN_DUE(110, 29, B); _DEFPIN_DUE(111, 30, B); _DEFPIN_DUE(112, 31, B); _DEFP
 
 #endif
 
-#endif // FORCE_SOFTWARE_PINS
+#endif // FASTLED_FORCE_SOFTWARE_PINS
 
 #endif // __INC_FASTPIN_ARM_SAM_H
diff --git a/platforms/avr/fastpin_avr.h b/platforms/avr/fastpin_avr.h
index f223de10..fdae2598 100644
--- a/platforms/avr/fastpin_avr.h
+++ b/platforms/avr/fastpin_avr.h
@@ -1,7 +1,7 @@
 #ifndef __INC_FASTPIN_AVR_H
 #define __INC_FASTPIN_AVR_H
 
-#if defined(FORCE_SOFTWARE_PINS)
+#if defined(FASTLED_FORCE_SOFTWARE_PINS)
 #warning "Software pin support forced, pin access will be sloightly slower."
 #define NO_HARDWARE_PIN_SUPPORT
 #undef HAS_HARDWARE_PIN_SUPPORT
@@ -203,6 +203,6 @@ _DEFPIN_AVR(20, 32, F); _DEFPIN_AVR(21, 16, F); _DEFPIN_AVR(22, 2, F); _DEFPIN_A
 
 #endif
 
-#endif // FORCE_SOFTWARE_PINS
+#endif // FASTLED_FORCE_SOFTWARE_PINS
 
 #endif // __INC_FASTPIN_AVR_H
diff --git a/platforms/avr/fastspi_avr.h b/platforms/avr/fastspi_avr.h
index 6470f37d..7f0b731b 100644
--- a/platforms/avr/fastspi_avr.h
+++ b/platforms/avr/fastspi_avr.h
@@ -294,7 +294,7 @@ public:
 #endif
 
 #else
-// #define FORCE_SOFTWARE_SPI
+// #define FASTLED_FORCE_SOFTWARE_SPI
 #endif
 
 #endif
diff --git a/release_notes.md b/release_notes.md
index c88bc403..fa3ffbaf 100644
--- a/release_notes.md
+++ b/release_notes.md
@@ -91,7 +91,7 @@ FastLED2
 * Enforce intra-frame timing for ws2801s
 * SM16716 support
 * Add #define FAST_SPI_INTERRUPTS_WRITE_PINS to make sure world is ok w/interrupts and SPI
-* Add #define FORCE_SOFTWARE_SPI for those times when you absolutely don't want to use hardware SPI, ev
+* Add #define FASTLED_FORCE_SOFTWARE_SPI for those times when you absolutely don't want to use hardware SPI, ev
 en if you're using the hardware SPI pins
 * Add pin definitions for the arduino megas - should fix ws2811 support
 * Add pin definitions for the leonardo - should fix spi support and pin mappings