Mirror
/
klipper-dgus
mirror of https://github.com/Desuuuu/klipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

neopixel: Add support for daisy-chained chips 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-07-17 19:58:37 -04:00
parent abf3fa4b71
commit 46041f5411
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/example-extras.cfg
View File

@ -1656,6 +1656,10 @@
#pin: #pin:
# The pin connected to the neopixel. This parameter must be # The pin connected to the neopixel. This parameter must be
# provided. # provided.
#chain_count:
# The number of Neopixel chips that are "daisy chained" to the
# provided pin. The default is 1 (which indices only a single
# Neopixel is connected to the pin).
#initial_RED: 0.0 #initial_RED: 0.0
#initial_GREEN: 0.0 #initial_GREEN: 0.0
#initial_BLUE: 0.0 #initial_BLUE: 0.0

10
docs/G-Codes.md
View File

@ -195,9 +195,13 @@ is enabled:
The following command is available when a "neopixel" config section The following command is available when a "neopixel" config section
is enabled: is enabled:
- `SET_NEOPIXEL NEOPIXEL=<config_name> RED=<value> GREEN=<value> - `SET_NEOPIXEL NEOPIXEL=<config_name> INDEX=<index> RED=<value>
BLUE=<value>`: This sets the neopixel LED output. Each <value> must GREEN=<value> BLUE=<value>`: This sets the Neopixel LED output. Each
be between 0.0 and 1.0. color <value> must be between 0.0 and 1.0. If multiple Neopixel
chips are daisy-chained then one may specify INDEX to alter the
color of just the given Neopixel chip (1 for the first Neopixel, 2
for the second, etc.). If INDEX is not provided then all Neopixels
in the daisy-chain will be set to the provided color.
## Servo Commands ## Servo Commands

11
klippy/extras/neopixel.py
View File

@ -16,6 +16,7 @@ class PrinterNeoPixel:
self.mcu.add_config_cmd("config_neopixel oid=%d pin=%s" self.mcu.add_config_cmd("config_neopixel oid=%d pin=%s"
% (self.oid, pin_params['pin'])) % (self.oid, pin_params['pin']))
self.mcu.register_config_callback(self.build_config) self.mcu.register_config_callback(self.build_config)
self.chain_count = config.getint('chain_count', 1, minval=1, maxval=18)
self.neopixel_send_cmd = None self.neopixel_send_cmd = None
# Initial color # Initial color
red = config.getfloat('initial_RED', 0., minval=0., maxval=1.) red = config.getfloat('initial_RED', 0., minval=0., maxval=1.)
@ -24,7 +25,7 @@ class PrinterNeoPixel:
red = int(red * 255. + .5) red = int(red * 255. + .5)
blue = int(blue * 255. + .5) blue = int(blue * 255. + .5)
green = int(green * 255. + .5) green = int(green * 255. + .5)
self.color_data = [green, red, blue] self.color_data = [green, red, blue] * self.chain_count
self.printer.register_event_handler("klippy:connect", self.send_data) self.printer.register_event_handler("klippy:connect", self.send_data)
# Register commands # Register commands
self.gcode = self.printer.lookup_object('gcode') self.gcode = self.printer.lookup_object('gcode')
@ -50,7 +51,13 @@ class PrinterNeoPixel:
red = int(red * 255. + .5) red = int(red * 255. + .5)
blue = int(blue * 255. + .5) blue = int(blue * 255. + .5)
green = int(green * 255. + .5) green = int(green * 255. + .5)
self.color_data = [green, red, blue] color_data = [green, red, blue]
if 'INDEX' in params:
index = self.gcode.get_int('INDEX', params,
minval=1, maxval=self.chain_count)
self.color_data[(index-1)*3:index*3] = color_data
else:
self.color_data = color_data * self.chain_count
# Send command # Send command
print_time = self.printer.lookup_object('toolhead').get_last_move_time() print_time = self.printer.lookup_object('toolhead').get_last_move_time()
self.send_data(self.mcu.print_time_to_clock(print_time)) self.send_data(self.mcu.print_time_to_clock(print_time))