Merge pull request #8094 from thinkyhead/bf2_neopixel_led_parity

[2.0.x] Bring NEOPIXEL_LED into parity with 1.1.x
This commit is contained in:
Scott Lahteine 2017-10-26 17:24:38 -05:00 committed by GitHub
commit c45514f811
10 changed files with 71 additions and 40 deletions

View file

@ -61,7 +61,7 @@ script:
- opt_set TEMP_SENSOR_BED 1 - opt_set TEMP_SENSOR_BED 1
- opt_enable PIDTEMPBED Z_SAFE_HOMING ARC_P_CIRCLES CNC_WORKSPACE_PLANES - opt_enable PIDTEMPBED Z_SAFE_HOMING ARC_P_CIRCLES CNC_WORKSPACE_PLANES
- opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS
- opt_enable BLINKM PCA9632 RGB_LED NEOPIXEL_RGBW_LED - opt_enable BLINKM PCA9632 RGB_LED NEOPIXEL_LED
- build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM} - build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
# #

View file

@ -792,7 +792,6 @@ void setup() {
#endif #endif
#if ENABLED(NEOPIXEL_LED) #if ENABLED(NEOPIXEL_LED)
SET_OUTPUT(NEOPIXEL_PIN);
setup_neopixel(); setup_neopixel();
#endif #endif

View file

@ -31,15 +31,31 @@
#include "leds.h" #include "leds.h"
void set_led_color( void set_led_color(
const uint8_t r, const uint8_t g, const uint8_t b , const uint8_t w , const uint8_t p const uint8_t r, const uint8_t g, const uint8_t b
#if ENABLED(RGBW_LED) || ENABLED(NEOPIXEL_LED)
, const uint8_t w // = 0
#if ENABLED(NEOPIXEL_LED)
, const uint8_t p // = NEOPIXEL_BRIGHTNESS
, const bool isSequence // = false
#endif
#endif
) { ) {
#if ENABLED(NEOPIXEL_LED) #if ENABLED(NEOPIXEL_LED)
if (w == 255 || (r == 255 && g == 255 && b == 255))
neopixel_set_led_color(NEO_WHITE, p); const uint32_t color = pixels.Color(r, g, b, w);
else static uint16_t nextLed = 0;
neopixel_set_led_color(r, g, b, w, p);
pixels.setBrightness(p);
if (!isSequence)
set_neopixel_color(color);
else {
pixels.setPixelColor(nextLed, color);
pixels.show();
if (++nextLed >= pixels.numPixels()) nextLed = 0;
return; return;
}
#endif #endif
#if ENABLED(BLINKM) #if ENABLED(BLINKM)

View file

@ -27,6 +27,8 @@
#ifndef __LEDS_H__ #ifndef __LEDS_H__
#define __LEDS_H__ #define __LEDS_H__
#include "../../inc/MarlinConfig.h"
#if ENABLED(NEOPIXEL_LED) #if ENABLED(NEOPIXEL_LED)
#include <Adafruit_NeoPixel.h> #include <Adafruit_NeoPixel.h>
#include "neopixel.h" #include "neopixel.h"
@ -40,14 +42,6 @@
#include "pca9632.h" #include "pca9632.h"
#endif #endif
#if ENABLED(NEOPIXEL_LED)
#if NEOPIXEL_TYPE == NEO_RGB || NEOPIXEL_TYPE == NEO_RBG || NEOPIXEL_TYPE == NEO_GRB || NEOPIXEL_TYPE == NEO_GBR || NEOPIXEL_TYPE == NEO_BRG || NEOPIXEL_TYPE == NEO_BGR
#define NEO_WHITE 255, 255, 255
#else
#define NEO_WHITE 0, 0, 0, 255
#endif
#endif
#if ENABLED(RGB_LED) || ENABLED(BLINKM) || ENABLED(PCA9632) #if ENABLED(RGB_LED) || ENABLED(BLINKM) || ENABLED(PCA9632)
#define LED_WHITE 255, 255, 255 #define LED_WHITE 255, 255, 255
#elif ENABLED(RGBW_LED) #elif ENABLED(RGBW_LED)
@ -61,7 +55,14 @@
#endif #endif
void set_led_color( void set_led_color(
const uint8_t r, const uint8_t g, const uint8_t b, const uint8_t w = 0, const uint8_t p = 255 const uint8_t r, const uint8_t g, const uint8_t b
#if ENABLED(RGBW_LED) || ENABLED(NEOPIXEL_LED)
, const uint8_t w = 0
#if ENABLED(NEOPIXEL_LED)
, const uint8_t p = NEOPIXEL_BRIGHTNESS
, const bool isSequence = false
#endif
#endif
); );
#endif // __LEDS_H__ #endif // __LEDS_H__

View file

@ -39,6 +39,7 @@ void set_neopixel_color(const uint32_t color) {
} }
void setup_neopixel() { void setup_neopixel() {
SET_OUTPUT(NEOPIXEL_PIN);
pixels.setBrightness(NEOPIXEL_BRIGHTNESS); // 0 - 255 range pixels.setBrightness(NEOPIXEL_BRIGHTNESS); // 0 - 255 range
pixels.begin(); pixels.begin();
pixels.show(); // initialize to all off pixels.show(); // initialize to all off
@ -52,22 +53,7 @@ void setup_neopixel() {
set_neopixel_color(pixels.Color(0, 0, 255, 0)); // blue set_neopixel_color(pixels.Color(0, 0, 255, 0)); // blue
delay(2000); delay(2000);
#endif #endif
set_neopixel_color(pixels.Color(0, 0, 0, 255)); // white set_neopixel_color(pixels.Color(NEO_WHITE)); // white
}
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);
pixels.setBrightness(p);
#if !ENABLED(NEOPIXEL_IS_SEQUENTIAL)
set_neopixel_color(color);
return false;
#else
static uint16_t nextLed = 0;
pixels.setPixelColor(nextLed, color);
pixels.show();
if (++nextLed >= pixels.numPixels()) nextLed = 0;
return true;
#endif
} }
#endif // NEOPIXEL_LED #endif // NEOPIXEL_LED

View file

@ -27,11 +27,22 @@
#ifndef __NEOPIXEL_H__ #ifndef __NEOPIXEL_H__
#define __NEOPIXEL_H__ #define __NEOPIXEL_H__
#include "../../inc/MarlinConfig.h"
#include <Adafruit_NeoPixel.h> #include <Adafruit_NeoPixel.h>
#include <stdint.h> #include <stdint.h>
#define NEOPIXEL_IS_RGB (NEOPIXEL_TYPE == NEO_RGB || NEOPIXEL_TYPE == NEO_RBG || NEOPIXEL_TYPE == NEO_GRB || NEOPIXEL_TYPE == NEO_GBR || NEOPIXEL_TYPE == NEO_BRG || NEOPIXEL_TYPE == NEO_BGR)
#define NEOPIXEL_IS_RGBW !NEOPIXEL_IS_RGB
#if NEOPIXEL_IS_RGB
#define NEO_WHITE 255, 255, 255
#else
#define NEO_WHITE 0, 0, 0, 255
#endif
void setup_neopixel(); void setup_neopixel();
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); void set_neopixel_color(const uint32_t color);
extern Adafruit_NeoPixel pixels; extern Adafruit_NeoPixel pixels;

View file

@ -49,9 +49,13 @@ void GcodeSuite::M150() {
set_led_color( set_led_color(
parser.seen('R') ? (parser.has_value() ? parser.value_byte() : 255) : 0, parser.seen('R') ? (parser.has_value() ? parser.value_byte() : 255) : 0,
parser.seen('U') ? (parser.has_value() ? parser.value_byte() : 255) : 0, parser.seen('U') ? (parser.has_value() ? parser.value_byte() : 255) : 0,
parser.seen('B') ? (parser.has_value() ? parser.value_byte() : 255) : 0, parser.seen('B') ? (parser.has_value() ? parser.value_byte() : 255) : 0
parser.seen('W') ? (parser.has_value() ? parser.value_byte() : 255) : 0, #if ENABLED(RGBW_LED) || ENABLED(NEOPIXEL_LED)
parser.seen('P') ? (parser.has_value() ? parser.value_byte() : 255) : LED_BRIGHTNESS , parser.seen('W') ? (parser.has_value() ? parser.value_byte() : 255) : 0
#if ENABLED(NEOPIXEL_LED)
, parser.seen('P') ? (parser.has_value() ? parser.value_byte() : 255) : pixels.getBrightness()
#endif
#endif
); );
} }

View file

@ -190,7 +190,14 @@ void GcodeSuite::M109() {
const uint8_t blue = map(constrain(temp, start_temp, target_temp), start_temp, target_temp, 255, 0); const uint8_t blue = map(constrain(temp, start_temp, target_temp), start_temp, target_temp, 255, 0);
if (blue != old_blue) { if (blue != old_blue) {
old_blue = blue; old_blue = blue;
set_led_color(255, 0, blue); set_led_color(255, 0, blue
#if ENABLED(NEOPIXEL_LED)
, 0, pixels.getBrightness()
#if ENABLED(NEOPIXEL_IS_SEQUENTIAL)
, true
#endif
#endif
);
} }
} }
#endif #endif

View file

@ -132,7 +132,14 @@ void GcodeSuite::M190() {
const uint8_t red = map(constrain(temp, start_temp, target_temp), start_temp, target_temp, 0, 255); const uint8_t red = map(constrain(temp, start_temp, target_temp), start_temp, target_temp, 0, 255);
if (red != old_red) { if (red != old_red) {
old_red = red; old_red = red;
set_led_color(red, 0, 255); set_led_color(red, 0, 255
#if ENABLED(NEOPIXEL_LED)
, 0, pixels.getBrightness()
#if ENABLED(NEOPIXEL_IS_SEQUENTIAL)
, true
#endif
#endif
);
} }
} }
#endif #endif

View file

@ -1162,7 +1162,7 @@ static_assert(1 >= 0
#if !(PIN_EXISTS(NEOPIXEL) && NEOPIXEL_PIXELS > 0) #if !(PIN_EXISTS(NEOPIXEL) && NEOPIXEL_PIXELS > 0)
#error "NEOPIXEL_LED requires NEOPIXEL_PIN and NEOPIXEL_PIXELS." #error "NEOPIXEL_LED requires NEOPIXEL_PIN and NEOPIXEL_PIXELS."
#endif #endif
#elif ENABLED(PRINTER_EVENT_LEDS) && DISABLED(BLINKM) && DISABLED(PCA9632) && DISABLED(NEOPIXEL_LED) #elif ENABLED(PRINTER_EVENT_LEDS) && DISABLED(BLINKM) && DISABLED(PCA9632)
#error "PRINTER_EVENT_LEDS requires BLINKM, PCA9632, RGB_LED, RGBW_LED or NEOPIXEL_LED." #error "PRINTER_EVENT_LEDS requires BLINKM, PCA9632, RGB_LED, RGBW_LED or NEOPIXEL_LED."
#endif #endif