diff options
| author | Daniel Garcia <danielgarcia@gmail.com> | 2014-11-29 21:42:01 +0300 |
|---|---|---|
| committer | Daniel Garcia <danielgarcia@gmail.com> | 2014-11-29 21:42:01 +0300 |
| commit | 3630190d99ac23efaa69c3015271e86eb5c7e991 (patch) | |
| tree | 453332baf7b07f2136f83873a2be375923bb5f6a | |
| parent | 832c1bcdecb41b00a8897f364a244aad96a5dc2f (diff) | |
Gate FASTLED_ACCURATE_CLOCK on whether or not interrupts are allowed.
| -rw-r--r-- | platforms/arm/k20/led_sysdefs_arm_k20.h | 5 | ||||
| -rw-r--r-- | platforms/arm/sam/led_sysdefs_arm_sam.h | 4 | ||||
| -rw-r--r-- | platforms/avr/led_sysdefs_avr.h | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/platforms/arm/k20/led_sysdefs_arm_k20.h b/platforms/arm/k20/led_sysdefs_arm_k20.h index e0a8a979..ed87c026 100644 --- a/platforms/arm/k20/led_sysdefs_arm_k20.h +++ b/platforms/arm/k20/led_sysdefs_arm_k20.h @@ -3,7 +3,6 @@ #define FASTLED_TEENSY3 #define FASTLED_ARM -#define FASTLED_ACCURATE_CLOCK #ifndef INTERRUPT_THRESHOLD #define INTERRUPT_THRESHOLD 1 @@ -14,6 +13,10 @@ #define FASTLED_ALLOW_INTERRUPTS 1 #endif +#if FASTLED_ALLOW_INTERRUPTS == 1 +#define FASTLED_ACCURATE_CLOCK +#endif + #if (F_CPU == 96000000) #define CLK_DBL 1 #endif diff --git a/platforms/arm/sam/led_sysdefs_arm_sam.h b/platforms/arm/sam/led_sysdefs_arm_sam.h index a6ef12bb..20bf4600 100644 --- a/platforms/arm/sam/led_sysdefs_arm_sam.h +++ b/platforms/arm/sam/led_sysdefs_arm_sam.h @@ -27,6 +27,10 @@ #define FASTLED_ALLOW_INTERRUPTS 1 #endif +#if FASTLED_ALLOW_INTERRUPTS == 1 +#define FASTLED_ACCURATE_CLOCK +#endif + // reuseing/abusing cli/sei defs for due #define cli() __disable_irq(); __disable_fault_irq(); #define sei() __enable_irq(); __enable_fault_irq(); diff --git a/platforms/avr/led_sysdefs_avr.h b/platforms/avr/led_sysdefs_avr.h index e4972c7d..ebba81aa 100644 --- a/platforms/avr/led_sysdefs_avr.h +++ b/platforms/avr/led_sysdefs_avr.h @@ -2,7 +2,6 @@ #define __INC_LED_SYSDEFS_AVR_H #define FASTLED_AVR -#define FASTLED_ACCURATE_CLOCK #ifndef INTERRUPT_THRESHOLD #define INTERRUPT_THRESHOLD 2 @@ -24,6 +23,10 @@ typedef volatile uint8_t RwReg; /**< Read-Write 8-bit register (volatile u #define FASTLED_ALLOW_INTERRUPTS 0 #endif +#if FASTLED_ALLOW_INTERRUPTS == 1 +#define FASTLED_ACCURATE_CLOCK +#endif + # if defined(CORE_TEENSY) extern volatile unsigned long timer0_millis_count; # define MS_COUNTER timer0_millis_count |