diff options
| author | Mark Kriegsman <1334634+kriegsman@users.noreply.github.com> | 2022-01-02 20:06:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-02 20:06:44 +0300 |
| commit | 049c016d6b3ac210c65064952c057a8d63043f7d (patch) | |
| tree | 35e712ab67a3942f9f5330723dd9c6bb06997c76 | |
| parent | b898c797c84a759bb5f09d6c768ea99275b5e4b8 (diff) | |
| parent | 97b296543e48dfd5ba380c497bf24eeccf5f82b9 (diff) | |
Merge pull request #1271 from ben-xo/bugfix/duplicate-define-NO-CORRECTION
Bugfix/duplicate define no correction
| -rw-r--r-- | src/platforms/avr/clockless_trinket.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/platforms/avr/clockless_trinket.h b/src/platforms/avr/clockless_trinket.h index 2cfbef0d..45143d91 100644 --- a/src/platforms/avr/clockless_trinket.h +++ b/src/platforms/avr/clockless_trinket.h @@ -87,7 +87,14 @@ template<> __attribute__((always_inline)) inline void _dc<20>(register uint8_t & // ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#if (!defined(NO_CORRECTION) || (NO_CORRECTION == 0)) && (FASTLED_ALLOW_INTERRUPTS == 0) +#if ((FASTLED_ALLOW_INTERRUPTS == 0) && defined(NO_CORRECTION) && (NO_CORRECTION == 1) && !(defined(NO_CLOCK_CORRECTION))) +// we hit this if you were trying to turn off clock correction without also trying to enable interrupts. +# pragma message "In older versions of FastLED defining NO_CORRECTION 1 would mistakenly turn off color correction as well as clock correction." +# pragma message "define NO_CLOCK_CORRECTION 1 to fix this warning." +# define NO_CLOCK_CORRECTION 1 +#endif + +#if (!defined(NO_CLOCK_CORRECTION) || (NO_CLOCK_CORRECTION == 0)) && (FASTLED_ALLOW_INTERRUPTS == 0) static uint8_t gTimeErrorAccum256ths; #endif @@ -118,7 +125,7 @@ protected: showRGBInternal(pixels); // Adjust the timer -#if (!defined(NO_CORRECTION) || (NO_CORRECTION == 0)) && (FASTLED_ALLOW_INTERRUPTS == 0) +#if (!defined(NO_CLOCK_CORRECTION) || (NO_CLOCK_CORRECTION == 0)) && (FASTLED_ALLOW_INTERRUPTS == 0) uint32_t microsTaken = (uint32_t)pixels.size() * (uint32_t)CLKS_TO_MICROS(24 * (T1 + T2 + T3)); // adust for approximate observed actal runtime (as of January 2015) |