Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add option for M150 to control only the first LED strip #23066

Merged
merged 7 commits into from
Dec 7, 2022
Merged

Add option for M150 to control only the first LED strip #23066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
916455f
Add option for M150 to control only first stripe
sblaisot Nov 3, 2021
1b5ea0c
adjust
thinkyhead Apr 23, 2022
35fe38b
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/23066
thinkyhead Apr 23, 2022
9693710
fix
thinkyhead Apr 23, 2022
00ce75e
better
thinkyhead Dec 7, 2022
ef77f59
Merge branch 'bugfix-2.1.x' into pr/23066
thinkyhead Dec 7, 2022
c456a92
TERN_
thinkyhead Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Marlin/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3305,6 +3305,7 @@
#define NEOPIXEL2_PIXELS 15 // Number of LEDs in the second strip
#define NEOPIXEL2_BRIGHTNESS 127 // Initial brightness (0-255)
#define NEOPIXEL2_STARTUP_TEST // Cycle through colors at startup
#define NEOPIXEL_M150_DEFAULT -1 // Default strip for M150 without 'S'. Use -1 to set all by default.
#else
//#define NEOPIXEL2_INSERIES // Default behavior is NeoPixel 2 in parallel
#endif
Expand Down
7 changes: 6 additions & 1 deletion Marlin/src/gcode/feature/leds/M150.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,12 @@ void GcodeSuite::M150() {
#if ENABLED(NEOPIXEL_LED)
const pixel_index_t index = parser.intval('I', -1);
#if ENABLED(NEOPIXEL2_SEPARATE)
int8_t brightness = neo.brightness(), unit = parser.intval('S', -1);
#ifndef NEOPIXEL_M150_DEFAULT
#define NEOPIXEL_M150_DEFAULT -1
#elif NEOPIXEL_M150_DEFAULT > 1
#error "NEOPIXEL_M150_DEFAULT must be -1, 0, or 1."
#endif
int8_t brightness = neo.brightness(), unit = parser.intval('S', NEOPIXEL_M150_DEFAULT);
switch (unit) {
case -1: neo2.neoindex = index; // fall-thru
case 0: neo.neoindex = index; old_color = parser.seen('K') ? neo.pixel_color(index >= 0 ? index : 0) : 0; break;
Expand Down