Fix #473 -- pull including bitswap and fastled_delay into a top level header file, reduces reliance on builders setting up include paths properly.

11 files changed, 3 insertions, 15 deletions

diff --git a/FastLED.h b/FastLED.h
index b1f7e7f6..fc1cf549 100644
--- a/FastLED.h
+++ b/FastLED.h
@@ -43,7 +43,10 @@
 #include "fastled_config.h"
 #include "led_sysdefs.h"
 
+// Utility functions
+#include "fastled_delay.h"
 #include "bitswap.h"
+
 #include "controller.h"
 #include "fastpin.h"
 #include "fastspi_types.h"
diff --git a/platforms/arm/d21/fastled_arm_d21.h b/platforms/arm/d21/fastled_arm_d21.h
index 3a62efc5..98412749 100644
--- a/platforms/arm/d21/fastled_arm_d21.h
+++ b/platforms/arm/d21/fastled_arm_d21.h
@@ -1,7 +1,6 @@
 #ifndef __INC_FASTLED_ARM_D21_H
 #define __INC_FASTLED_ARM_D21_H
 
-#include "fastled_delay.h"
 #include "fastpin_arm_d21.h"
 #include "clockless_arm_d21.h"
 
diff --git a/platforms/arm/k20/fastled_arm_k20.h b/platforms/arm/k20/fastled_arm_k20.h
index 7220aef2..8b338fcb 100644
--- a/platforms/arm/k20/fastled_arm_k20.h
+++ b/platforms/arm/k20/fastled_arm_k20.h
@@ -2,8 +2,6 @@
 #define __INC_FASTLED_ARM_K20_H
 
 // Include the k20 headers
-#include "bitswap.h"
-#include "fastled_delay.h"
 #include "fastpin_arm_k20.h"
 #include "fastspi_arm_k20.h"
 #include "octows2811_controller.h"
diff --git a/platforms/arm/k66/fastled_arm_k66.h b/platforms/arm/k66/fastled_arm_k66.h
index 30799d7b..239e4d5c 100644
--- a/platforms/arm/k66/fastled_arm_k66.h
+++ b/platforms/arm/k66/fastled_arm_k66.h
@@ -2,8 +2,6 @@
 #define __INC_FASTLED_ARM_K66_H
 
 // Include the k66 headers
-#include "bitswap.h"
-#include "fastled_delay.h"
 #include "fastpin_arm_k66.h"
 #include "fastspi_arm_k66.h"
 #include "../k20/octows2811_controller.h"
diff --git a/platforms/arm/kl26/fastled_arm_kl26.h b/platforms/arm/kl26/fastled_arm_kl26.h
index 9a93caa5..1e7c2e30 100644
--- a/platforms/arm/kl26/fastled_arm_kl26.h
+++ b/platforms/arm/kl26/fastled_arm_kl26.h
@@ -2,7 +2,6 @@
 #define __INC_FASTLED_ARM_KL26_H
 
 // Include the k20 headers
-#include "fastled_delay.h"
 #include "fastpin_arm_kl26.h"
 #include "fastspi_arm_kl26.h"
 #include "clockless_arm_kl26.h"
diff --git a/platforms/arm/nrf51/fastled_arm_nrf51.h b/platforms/arm/nrf51/fastled_arm_nrf51.h
index bfdefc34..88344a35 100644
--- a/platforms/arm/nrf51/fastled_arm_nrf51.h
+++ b/platforms/arm/nrf51/fastled_arm_nrf51.h
@@ -2,8 +2,6 @@
 #define __INC_FASTLED_ARM_NRF51_H
 
 // Include the k20 headers
-#include "bitswap.h"
-#include "fastled_delay.h"
 #include "fastpin_arm_nrf51.h"
 #include "fastspi_arm_nrf51.h"
 #include "clockless_arm_nrf51.h"
diff --git a/platforms/arm/sam/fastled_arm_sam.h b/platforms/arm/sam/fastled_arm_sam.h
index fd61c14c..3567bb62 100644
--- a/platforms/arm/sam/fastled_arm_sam.h
+++ b/platforms/arm/sam/fastled_arm_sam.h
@@ -2,7 +2,6 @@
 #define __INC_FASTLED_ARM_SAM_H
 
 // Include the sam headers
-#include "fastled_delay.h"
 #include "fastpin_arm_sam.h"
 #include "fastspi_arm_sam.h"
 #include "clockless_arm_sam.h"
diff --git a/platforms/arm/stm32/fastled_arm_stm32.h b/platforms/arm/stm32/fastled_arm_stm32.h
index e790bfec..3f86a873 100644
--- a/platforms/arm/stm32/fastled_arm_stm32.h
+++ b/platforms/arm/stm32/fastled_arm_stm32.h
@@ -2,7 +2,6 @@
 #define __INC_FASTLED_ARM_SAM_H
 
 // Include the sam headers
-#include "fastled_delay.h"
 #include "fastpin_arm_stm32.h"
 // #include "fastspi_arm_stm32.h"
 #include "clockless_arm_stm32.h"
diff --git a/platforms/avr/fastled_avr.h b/platforms/avr/fastled_avr.h
index f5b5ee58..47236f44 100644
--- a/platforms/avr/fastled_avr.h
+++ b/platforms/avr/fastled_avr.h
@@ -1,7 +1,6 @@
 #ifndef __INC_FASTLED_AVR_H
 #define __INC_FASTLED_AVR_H
 
-#include "fastled_delay.h"
 #include "fastpin_avr.h"
 #include "fastspi_avr.h"
 #include "clockless_trinket.h"
diff --git a/platforms/esp/32/fastled_esp32.h b/platforms/esp/32/fastled_esp32.h
index 2dcbe2df..fabbfeda 100644
--- a/platforms/esp/32/fastled_esp32.h
+++ b/platforms/esp/32/fastled_esp32.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "bitswap.h"
-#include "fastled_delay.h"
 #include "fastpin_esp32.h"
 #include "clockless_esp32.h"
 // #include "clockless_block_esp32.h"
diff --git a/platforms/esp/8266/fastled_esp8266.h b/platforms/esp/8266/fastled_esp8266.h
index d209de97..8c4048db 100644
--- a/platforms/esp/8266/fastled_esp8266.h
+++ b/platforms/esp/8266/fastled_esp8266.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "bitswap.h"
-#include "fastled_delay.h"
 #include "fastpin_esp8266.h"
 #include "clockless_esp8266.h"
 #include "clockless_block_esp8266.h"