3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dotstar: Use new GCodeCommand wrappers 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-04-25 00:20:34 -04:00
parent a7ca0e1670
commit 821df4e994
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
klippy/extras/dotstar.py
View File

@ -33,29 +33,27 @@ class PrinterDotstar:
self.color_data = [0, 0, 0, 0] + color_data + [0xff, 0xff, 0xff, 0xff] self.color_data = [0, 0, 0, 0] + color_data + [0xff, 0xff, 0xff, 0xff]
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') gcode = self.printer.lookup_object('gcode')
self.gcode.register_mux_command("SET_LED", "LED", name, gcode.register_mux_command("SET_LED", "LED", name, self.cmd_SET_LED,
self.cmd_SET_LED, desc=self.cmd_SET_LED_help)
desc=self.cmd_SET_LED_help)
def send_data(self, minclock=0): def send_data(self, minclock=0):
data = self.color_data data = self.color_data
for d in [data[i:i+20] for i in range(0, len(data), 20)]: for d in [data[i:i+20] for i in range(0, len(data), 20)]:
self.spi.spi_send(d, minclock=minclock, self.spi.spi_send(d, minclock=minclock,
reqclock=BACKGROUND_PRIORITY_CLOCK) reqclock=BACKGROUND_PRIORITY_CLOCK)
cmd_SET_LED_help = "Set the color of an LED" cmd_SET_LED_help = "Set the color of an LED"
def cmd_SET_LED(self, params): def cmd_SET_LED(self, gcmd):
# Parse parameters # Parse parameters
red = self.gcode.get_float('RED', params, 0., minval=0., maxval=1.) red = gcmd.get_float('RED', 0., minval=0., maxval=1.)
green = self.gcode.get_float('GREEN', params, 0., minval=0., maxval=1.) green = gcmd.get_float('GREEN', 0., minval=0., maxval=1.)
blue = self.gcode.get_float('BLUE', params, 0., minval=0., maxval=1.) blue = gcmd.get_float('BLUE', 0., minval=0., maxval=1.)
transmit = self.gcode.get_int('TRANSMIT', params, 1) transmit = gcmd.get_int('TRANSMIT', 1)
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)
color_data = [0xff, blue, green, red] color_data = [0xff, blue, green, red]
if 'INDEX' in params: index = gcmd.get_int('INDEX', None, minval=1, maxval=self.chain_count)
index = self.gcode.get_int('INDEX', params, if index is not None:
minval=1, maxval=self.chain_count)
self.color_data[index*4:(index+1)*4] = color_data self.color_data[index*4:(index+1)*4] = color_data
else: else:
self.color_data[4:-4] = color_data * self.chain_count self.color_data[4:-4] = color_data * self.chain_count