Skip to content

Commit faa066c

Browse files
committed
Fix compile errors for using the Pixie led chipset
1 parent fb5e83e commit faa066c

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

FastLED.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ void CFastLED::setMaxRefreshRate(uint16_t refresh, bool constrain) {
220220
}
221221
}
222222

223+
extern "C" int atexit(void (* /*func*/ )()) { return 0; }
223224

224225
#ifdef NEED_CXX_BITS
225226
namespace __cxxabiv1

FastLED.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@ enum ESPIChipsets {
7171
enum ESM { SMART_MATRIX };
7272
enum OWS2811 { OCTOWS2811,OCTOWS2811_400 };
7373

74-
template<uint8_t DATA_PIN, EOrder RGB_ORDER> class Pixie : public PixieController<DATA_PIN, RGB_ORDER> {};
74+
#ifdef HAS_PIXIE
75+
template<uint8_t DATA_PIN, EOrder RGB_ORDER> class PIXIE : public PixieController<DATA_PIN, RGB_ORDER> {};
76+
#endif
77+
7578
#ifdef FASTLED_HAS_CLOCKLESS
7679
template<uint8_t DATA_PIN> class NEOPIXEL : public WS2812Controller800Khz<DATA_PIN, GRB> {};
7780
template<uint8_t DATA_PIN, EOrder RGB_ORDER> class TM1829 : public TM1829Controller800Khz<DATA_PIN, RGB_ORDER> {};

chipsets.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,14 @@ FASTLED_NAMESPACE_BEGIN
1212
///
1313
///@{
1414

15-
#if defined(ARDUINO)
15+
#if defined(ARDUINO) //&& defined(SoftwareSerial_h)
16+
17+
18+
#if defined(SoftwareSerial_h)
1619
#include "SoftwareSerial.h"
1720

21+
#define HAS_PIXIE
22+
1823
/// Adafruit Pixie controller class
1924
/// @tparam DATAPIN the pin to write data out on
2025
/// @tparam RGB_ORDER the RGB ordering for the led data
@@ -71,6 +76,7 @@ class PixieController : public CLEDController {
7176
// }
7277
// };
7378
#endif
79+
#endif
7480

7581
///@name Clocked chipsets - nominally SPI based these chipsets have a data and a clock line.
7682
///@{

0 commit comments

Comments
 (0)