Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
led: Generalize template evaluation so it is not dependent on LEDs
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
- Loading branch information
1 parent
ef75346
commit 3358295
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| # Support for PWM driven LEDs | ||
| # | ||
| # Copyright (C) 2019-2024 Kevin O'Connor <kevin@koconnor.net> | ||
| # | ||
| # This file may be distributed under the terms of the GNU GPLv3 license. | ||
| import logging, ast | ||
|
|
@@ -22,14 +22,22 @@ def __init__(self, config, update_func, led_count=1): | |
| blue = config.getfloat('initial_BLUE', 0., minval=0., maxval=1.) | ||
| white = config.getfloat('initial_WHITE', 0., minval=0., maxval=1.) | ||
| self.led_state = [(red, green, blue, white)] * led_count | ||
| # Support setting an led template | ||
| self.template_eval = lookup_template_eval(config) | ||
| self.tcallbacks = [(lambda text, s=self, index=i: | ||
| s._template_update(index, text)) | ||
| for i in range(led_count)] | ||
| # Register commands | ||
| name = config.get_name().split()[-1] | ||
| gcode = self.printer.lookup_object('gcode') | ||
| gcode.register_mux_command("SET_LED", "LED", name, self.cmd_SET_LED, | ||
| desc=self.cmd_SET_LED_help) | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
KevinOConnor
Author
Collaborator
|
||
| gcode.register_mux_command("SET_LED_TEMPLATE", "LED", name, | ||
| self.cmd_SET_LED_TEMPLATE, | ||
| desc=self.cmd_SET_LED_TEMPLATE_help) | ||
| def get_status(self, eventtime=None): | ||
| return {'color_data': self.led_state} | ||
| def _set_color(self, index, color): | ||
| if index is None: | ||
| new_led_state = [color] * self.led_count | ||
| if self.led_state == new_led_state: | ||
|
|
@@ -41,7 +49,17 @@ def set_color(self, index, color): | |
| new_led_state[index - 1] = color | ||
| self.led_state = new_led_state | ||
| self.need_transmit = True | ||
| def _template_update(self, index, text): | ||
| try: | ||
| parts = [max(0., min(1., float(f))) | ||
| for f in text.split(',', 4)] | ||
| except ValueError as e: | ||
| logging.exception("led template render error") | ||
| parts = [] | ||
| if len(parts) < 4: | ||
| parts += [0.] * (4 - len(parts)) | ||
| self._set_color(index, tuple(parts)) | ||
| def _check_transmit(self, print_time=None): | ||
| if not self.need_transmit: | ||
| return | ||
| self.need_transmit = False | ||
|
|
@@ -62,53 +80,50 @@ def cmd_SET_LED(self, gcmd): | |
| color = (red, green, blue, white) | ||
| # Update and transmit data | ||
| def lookahead_bgfunc(print_time): | ||
| self._set_color(index, color) | ||
| if transmit: | ||
| self._check_transmit(print_time) | ||
| if sync: | ||
| #Sync LED Update with print time and send | ||
| toolhead = self.printer.lookup_object('toolhead') | ||
| toolhead.register_lookahead_callback(lookahead_bgfunc) | ||
| else: | ||
| #Send update now (so as not to wake toolhead and reset idle_timeout) | ||
| lookahead_bgfunc(None) | ||
| cmd_SET_LED_TEMPLATE_help = "Assign a display_template to an LED" | ||
| def cmd_SET_LED_TEMPLATE(self, gcmd): | ||
| index = gcmd.get_int("INDEX", None, minval=1, maxval=self.led_count) | ||
| set_template = self.template_eval.set_template | ||
| if index is not None: | ||
| set_template(gcmd, self.tcallbacks[index-1], self._check_transmit) | ||
| else: | ||
| for i in range(self.led_count): | ||
| set_template(gcmd, self.tcallbacks[i], self._check_transmit) | ||
|
|
||
| # Main template evaluation code | ||
| class PrinterTemplateEvaluator: | ||
| def __init__(self, config): | ||
| self.printer = config.get_printer() | ||
| self.active_templates = {} | ||
| self.render_timer = None | ||
| # Load templates | ||
| dtemplates = display.lookup_display_templates(config) | ||
| self.templates = dtemplates.get_display_templates() | ||
| gcode_macro = self.printer.load_object(config, "gcode_macro") | ||
| self.create_template_context = gcode_macro.create_template_context | ||
| def _activate_timer(self): | ||
| if self.render_timer is not None or not self.active_templates: | ||
| return | ||
| reactor = self.printer.get_reactor() | ||
| self.render_timer = reactor.register_timer(self._render, reactor.NOW) | ||
| def _activate_template(self, callback, template, lparams, flush_callback): | ||
| if template is not None: | ||
| uid = (template,) + tuple(sorted(lparams.items())) | ||
| self.active_templates[callback] = ( | ||
| uid, template, lparams, flush_callback) | ||
| return | ||
| if callback in self.active_templates: | ||
| del self.active_templates[callback] | ||
| def _render(self, eventtime): | ||
| if not self.active_templates: | ||
| # Nothing to do - unregister timer | ||
|
|
@@ -122,37 +137,27 @@ def render(name, **kwargs): | |
| return self.templates[name].render(context, **kwargs) | ||
| context['render'] = render | ||
| # Render all templates | ||
| flush_callbacks = {} | ||
| rendered = {} | ||
| template_info = self.active_templates.items() | ||
| for callback, (uid, template, lparams, flush_callback) in template_info: | ||
| text = rendered.get(uid) | ||
| if text is None: | ||
| try: | ||
| text = template.render(context, **lparams) | ||
| except Exception as e: | ||
| logging.exception("display template render error") | ||
| text = "" | ||
| rendered[uid] = text | ||
| if flush_callback is not None: | ||
| flush_callbacks[flush_callback] = 1 | ||
| callback(text) | ||
| context.clear() # Remove circular references for better gc | ||
| # Invoke optional flush callbacks | ||
| for flush_callback in flush_callbacks.keys(): | ||
| flush_callback() | ||
| return eventtime + RENDER_TIME | ||
| def set_template(self, gcmd, callback, flush_callback=None): | ||
| template = None | ||
| lparams = {} | ||
| tpl_name = gcmd.get("TEMPLATE") | ||
|
|
@@ -172,13 +177,17 @@ def cmd_SET_LED_TEMPLATE(self, gcmd): | |
| lparams[p] = ast.literal_eval(v) | ||
| except ValueError as e: | ||
| raise gcmd.error("Unable to parse '%s' as a literal" % (v,)) | ||
| self._activate_template(callback, template, lparams, flush_callback) | ||
| self._activate_timer() | ||
|
|
||
| def lookup_template_eval(config): | ||
| printer = config.get_printer() | ||
| te = printer.lookup_object("template_evaluator", None) | ||
| if te is None: | ||
| te = PrinterTemplateEvaluator(config) | ||
| printer.add_object("template_evaluator", te) | ||
| return te | ||
|
|
||
| PIN_MIN_TIME = 0.100 | ||
| MAX_SCHEDULE_TIME = 5.0 | ||
|
|
||
|
|
@@ -205,8 +214,7 @@ def __init__(self, config): | |
| % (config.get_name(),)) | ||
| self.last_print_time = 0. | ||
| # Initialize color data | ||
| self.led_helper = LEDHelper(config, self.update_leds, 1) | ||
| self.prev_color = color = self.led_helper.get_status()['color_data'][0] | ||
| for idx, mcu_pin in self.pins: | ||
| mcu_pin.setup_start_value(color[idx], 0.) | ||
|
|
@@ -225,8 +233,5 @@ def update_leds(self, led_state, print_time): | |
| def get_status(self, eventtime=None): | ||
| return self.led_helper.get_status(eventtime) | ||
|
|
||
| def load_config_prefix(config): | ||
| return PrinterPWMLED(config) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Why was this removed? I used that for the LED effects module.