diff options
| author | Ben Isaacs <75862+ben-xo@users.noreply.github.com> | 2021-08-01 20:10:23 +0300 |
|---|---|---|
| committer | Ben Isaacs <75862+ben-xo@users.noreply.github.com> | 2021-08-01 20:13:40 +0300 |
| commit | 6a45df755c1b78ba4f6b41a1029e4464c5070e11 (patch) | |
| tree | 84a5923a2ec34fdd8a30e2a6ce92de1df866e04c | |
| parent | 5cc17b2be88982eb34b1998de22b83fee56d4f07 (diff) | |
Change define NO_CORRECTION in clockless_trinket to NO_CLOCK_CORRECTION (#1263)
The more specific use is in clockless_trinket, so this is the one which has been renamed.
It was only relevant if you also had FASTLED_ALLOW_INTERRUPTS defined.
Existing code will still work exactly the same, but in cases where this define would have altered the code, a warning is now emitted as well.
| -rw-r--r-- | src/platforms/avr/clockless_trinket.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/platforms/avr/clockless_trinket.h b/src/platforms/avr/clockless_trinket.h index 2cfbef0d..2b4f3245 100644 --- a/src/platforms/avr/clockless_trinket.h +++ b/src/platforms/avr/clockless_trinket.h @@ -87,7 +87,13 @@ 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 == 1) && defined(NO_CORRECTION) && (NO_CORRECTION == 1) && !(defined(NO_CLOCK_CORRECTION)) +# warning In older versions of FastLED defining NO_CORRECTION 1 would mistakenly turn off color correction as well as clock correction. +# warning As clock correction is unnecessary with FASTLED_ALLOW_INTERRUPTS 1, you should define NO_CLOCK_CORRECTION 1 instead. +# 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 +124,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) |