Different NEOPIXEL types
Same as #7728 but for 2.0.x, Lot of cleanup and remove references in whole code to other "LED files" than leds.h. Now will be much easier to add next drivers/libraries. e.g. FastLED. But bad news, currently FastLED is suporting only RGB devices (no RGBW)
This commit is contained in:
committed by
Scott Lahteine
parent
b30b55307c
commit
a11e6a1022
@@ -26,11 +26,11 @@
|
||||
|
||||
#include "../../inc/MarlinConfig.h"
|
||||
|
||||
#if ENABLED(NEOPIXEL_RGBW_LED)
|
||||
#if ENABLED(NEOPIXEL_LED)
|
||||
|
||||
#include "neopixel.h"
|
||||
|
||||
Adafruit_NeoPixel pixels(NEOPIXEL_PIXELS, NEOPIXEL_PIN, NEO_GRBW + NEO_KHZ800);
|
||||
Adafruit_NeoPixel pixels(NEOPIXEL_PIXELS, NEOPIXEL_PIN, NEOPIXEL_TYPE + NEO_KHZ800);
|
||||
|
||||
void set_neopixel_color(const uint32_t color) {
|
||||
for (uint16_t i = 0; i < pixels.numPixels(); ++i)
|
||||
@@ -39,7 +39,7 @@ void set_neopixel_color(const uint32_t color) {
|
||||
}
|
||||
|
||||
void setup_neopixel() {
|
||||
pixels.setBrightness(255); // 0 - 255 range
|
||||
pixels.setBrightness(NEOPIXEL_BRIGHTNESS); // 0 - 255 range
|
||||
pixels.begin();
|
||||
pixels.show(); // initialize to all off
|
||||
|
||||
@@ -55,18 +55,19 @@ void setup_neopixel() {
|
||||
set_neopixel_color(pixels.Color(0, 0, 0, 255)); // white
|
||||
}
|
||||
|
||||
bool neopixel_set_led_color(const uint8_t r, const uint8_t g, const uint8_t b, const uint8_t w, const bool isSequence) {
|
||||
bool neopixel_set_led_color(const uint8_t r, const uint8_t g, const uint8_t b, const uint8_t w, const uint8_t p) {
|
||||
const uint32_t color = pixels.Color(r, g, b, w);
|
||||
static uint16_t nextLed = 0;
|
||||
if (!isSequence)
|
||||
pixels.setBrightness(p);
|
||||
#if !ENABLED(NEOPIXEL_IS_SEQUENTIAL)
|
||||
set_neopixel_color(color);
|
||||
else {
|
||||
return false;
|
||||
#else
|
||||
static uint16_t nextLed = 0;
|
||||
pixels.setPixelColor(nextLed, color);
|
||||
pixels.show();
|
||||
if (++nextLed >= pixels.numPixels()) nextLed = 0;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif // NEOPIXEL_RGBW_LED
|
||||
#endif // NEOPIXEL_LED
|
||||
|
||||
Reference in New Issue
Block a user