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

display: add SET_DISPLAY_GROUP command (#2969) 

Signed-off-by: Florian Heilmann <Florian.Heilmann@gmx.net>
This commit is contained in:
Florian Heilmann 2020-06-09 18:07:25 +02:00 committed by GitHub
parent c630ecf3c7
commit 68fcbe2a62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/G-Codes.md
View File

@ -202,6 +202,11 @@ The following standard commands are supported:
adjustment will only be made every BAND millimeters of z height - in adjustment will only be made every BAND millimeters of z height - in
that case the formula used is `value = start + factor * that case the formula used is `value = start + factor *
((floor(z_height / band) + .5) * band)`. ((floor(z_height / band) + .5) * band)`.
- `SET_DISPLAY_GROUP DISPLAY=<display> GROUP=<group>`: Set the active
display group of the display. This allows to define multiple display
data groups in the config, e.g.`[display_data <group> <elementname>]`
and switch between them using this extended gcode command. use
`DISPLAY=display` to change the display group of the default display.
- `SET_IDLE_TIMEOUT [TIMEOUT=<timeout>]`: Allows the user to set the - `SET_IDLE_TIMEOUT [TIMEOUT=<timeout>]`: Allows the user to set the
idle timeout (in seconds). idle timeout (in seconds).
- `RESTART`: This will cause the host software to reload its config - `RESTART`: This will cause the host software to reload its config

11
klippy/extras/display/display.py
View File

@ -103,6 +103,10 @@ class PrinterLCD:
self.printer.register_event_handler("klippy:ready", self.handle_ready) self.printer.register_event_handler("klippy:ready", self.handle_ready)
self.screen_update_timer = self.reactor.register_timer( self.screen_update_timer = self.reactor.register_timer(
self.screen_update_event) self.screen_update_event)
gcode = self.printer.lookup_object("gcode")
gcode.register_mux_command(
'SET_DISPLAY_GROUP', 'DISPLAY', name, self.cmd_SET_DISPLAY_GROUP,
desc=self.cmd_SET_DISPLAY_GROUP_help)
# Configurable display # Configurable display
def _parse_glyph(self, config, glyph_name, data, width, height): def _parse_glyph(self, config, glyph_name, data, width, height):
glyph_data = [] glyph_data = []
@ -215,6 +219,13 @@ class PrinterLCD:
self.lcd_chip.write_graphics(col, row, i, data) self.lcd_chip.write_graphics(col, row, i, data)
self.lcd_chip.write_graphics(col, row, 15, [0xff]*width) self.lcd_chip.write_graphics(col, row, 15, [0xff]*width)
return "" return ""
cmd_SET_DISPLAY_GROUP_help = "Set the active display group"
def cmd_SET_DISPLAY_GROUP(self, gcmd):
group = gcmd.get('GROUP')
new_dg = self.display_data_groups.get(group)
if new_dg is None:
raise gcmd.error("Unknown display_data group '%s'" % (group,))
self.show_data_group = new_dg
def load_config(config): def load_config(config):
return PrinterLCD(config) return PrinterLCD(config)