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

NEOPIXEL2_SEPARATE Sanity check Error temp fix #19287

Merged
merged 71 commits into from
Sep 7, 2020
Merged

NEOPIXEL2_SEPARATE Sanity check Error temp fix #19287

Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
b4d329a
Merge pull request #1 from MarlinFirmware/bugfix-2.0.x
Bacon-Fixation Aug 22, 2020
6a9442d
seperate neopixel control with M151
Bacon-Fixation Aug 22, 2020
5363276
Update Configuration.h
Bacon-Fixation Aug 22, 2020
bd39337
further intergration
Bacon-Fixation Aug 22, 2020
757ac62
Merge branch 'bugfix-2.0.x' of https://github.com/Bacon-Fixation/Marl…
Bacon-Fixation Aug 22, 2020
465092b
-Fixed TYPO for the Smart effector
Bacon-Fixation Aug 22, 2020
970005f
better intergration
Bacon-Fixation Aug 23, 2020
7a2c6d5
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/19115
thinkyhead Aug 23, 2020
7243dd1
Neo 2 initial cleanup
thinkyhead Aug 23, 2020
1593471
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/19115
thinkyhead Aug 23, 2020
0a97a4c
Clean up, extend M150
thinkyhead Aug 23, 2020
5992942
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/19115
thinkyhead Aug 23, 2020
42150e3
Rename some pca9632 functions
thinkyhead Aug 23, 2020
356715d
Rename adaneo# and other vars
thinkyhead Aug 23, 2020
cd9d80d
Re-use LEDColor
thinkyhead Aug 23, 2020
0dbe7ff
Misc. cleanup
thinkyhead Aug 23, 2020
ffb781c
Fix set_color binding
thinkyhead Aug 23, 2020
bdb4722
Adding conflict protection with other neopixel features
Bacon-Fixation Aug 23, 2020
c8b9ec6
Merge branch 'bugfix-2.0.x' of https://github.com/Bacon-Fixation/Marl…
Bacon-Fixation Aug 23, 2020
4434b88
reverting change
Bacon-Fixation Aug 23, 2020
1abbb8c
fixed compiling Error with the LPC1769
Bacon-Fixation Aug 24, 2020
3ffa4ca
second index to stop M150 from bleeding into the second neopixel channel
Bacon-Fixation Aug 24, 2020
ca79f2b
Who needs accessors?
thinkyhead Aug 24, 2020
c60bea4
Thanks but no thanks for your configs
thinkyhead Aug 24, 2020
b41a733
Condition for conjoined strips
thinkyhead Aug 24, 2020
85b0a48
Fix M150 to fit current design
thinkyhead Aug 24, 2020
7d57af2
Patch neoindex
thinkyhead Aug 24, 2020
d3624ad
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/19115
thinkyhead Aug 24, 2020
0cf88aa
dont know how i lost this config
Bacon-Fixation Aug 24, 2020
8a35574
Update Configuration.h
thinkyhead Aug 24, 2020
971e130
Update leds.h
Bacon-Fixation Aug 25, 2020
563029d
Update neopixel.h
Bacon-Fixation Aug 25, 2020
066ac3d
not needed
Bacon-Fixation Aug 25, 2020
dfa25dc
add an extra example to M150 for Sn
Bacon-Fixation Aug 25, 2020
b540b00
Fixed Typo for Neo2 color presets
Bacon-Fixation Aug 25, 2020
4d7cd2c
Merge branch 'bugfix-2.0.x' into bugfix-2.0.x
thinkyhead Aug 26, 2020
9b3a4a1
tinkering
Bacon-Fixation Aug 26, 2020
88f050d
NEOPIXEL_SEPERATE to run diferent neopixel types
Bacon-Fixation Aug 27, 2020
8b12f7b
ffs
thinkyhead Aug 27, 2020
dc7e169
Update neopixel.h
thinkyhead Aug 27, 2020
5f0fd8c
Update leds.h
thinkyhead Aug 27, 2020
b201138
Update leds.h
thinkyhead Aug 27, 2020
ceeea2f
Update neopixel.h
thinkyhead Aug 27, 2020
dd9bb52
Update leds.cpp
thinkyhead Aug 27, 2020
19a20df
Bugfix for Neopixel_separate
Bacon-Fixation Aug 28, 2020
584323d
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/19179
thinkyhead Aug 31, 2020
2308030
adjust
thinkyhead Aug 31, 2020
654e6a9
Update neopixel.h
Bacon-Fixation Sep 1, 2020
7e4ea41
Merge branch 'bugfix-2.0.x' into bugfix-2.0.x
thinkyhead Sep 1, 2020
435ef10
Update neopixel.h
Bacon-Fixation Sep 3, 2020
9880be5
Update neopixel.h
thinkyhead Sep 3, 2020
1868ba8
Merge branch 'bugfix-2.0.x' into bugfix-2.0.x
thinkyhead Sep 3, 2020
0ed3232
Added menu support for NEOPIXLE2_SEPARATE
Bacon-Fixation Sep 6, 2020
8aee8ed
Update menu_led.cpp
Bacon-Fixation Sep 6, 2020
0cd232a
refinement
Bacon-Fixation Sep 6, 2020
02dd0a1
Update menu_led.cpp
Bacon-Fixation Sep 6, 2020
c32f568
Update SanityCheck.h
Bacon-Fixation Sep 6, 2020
73c7e74
Update SanityCheck.h
Bacon-Fixation Sep 6, 2020
0d9b30b
Update SanityCheck.h
Bacon-Fixation Sep 7, 2020
5c8b6e2
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/19280
thinkyhead Sep 7, 2020
9d554dd
Update menu_led.cpp
thinkyhead Sep 7, 2020
9a90653
Update language_en.h
thinkyhead Sep 7, 2020
fd97878
Fix insanity check
thinkyhead Sep 7, 2020
a1f4ecc
Update SanityCheck.h
thinkyhead Sep 7, 2020
086e37f
Update leds.cpp
thinkyhead Sep 7, 2020
6e64423
Reduce strings
thinkyhead Sep 7, 2020
676c1e7
Maybe save bytes
thinkyhead Sep 7, 2020
324d8db
'editable' better than stack?
thinkyhead Sep 7, 2020
ce70d89
Update SanityCheck.h
Bacon-Fixation Sep 7, 2020
b85d194
Merge branch 'bugfix-2.0.x' into bugfix-2.0.x
thinkyhead Sep 7, 2020
47d7e33
Fix bad merge
thinkyhead Sep 7, 2020
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
4 changes: 2 additions & 2 deletions Marlin/src/inc/SanityCheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2126,8 +2126,8 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
#if ENABLED(NEOPIXEL_LED)
#if !PIN_EXISTS(NEOPIXEL) || NEOPIXEL_PIXELS == 0
#error "NEOPIXEL_LED requires NEOPIXEL_PIN and NEOPIXEL_PIXELS."
#elif ENABLED(NEOPIXEL2_SEPARATE) && !(NEOPIXEL2_TYPE && PIN_EXISTS(NEOPIXEL2) && NEOPIXEL2_PIXELS > 0)
#error "NEOPIXEL2_SEPARATE requires NEOPIXEL2_PIN, NEOPIXEL2_TYPE and NEOPIXEL2_PIXELS."
#elif ENABLED(NEOPIXEL2_SEPARATE) && !(defined(NEOPIXEL2_TYPE) && PIN_EXISTS(NEOPIXEL2) && NEOPIXEL2_PIXELS > 0)
#error "NEOPIXEL2_SEPARATE requires NEOPIXEL2_TYPE, NEOPIXEL2_PIN and NEOPIXEL2_PIXELS."
#elif ENABLED(NEO2_COLOR_PRESETS) && DISABLED(NEOPIXEL2_SEPARATE)
#error "NEO2_COLOR_PRESETS requires NEOPIXEL2_SEPARATE to be enabled."
#endif
Expand Down