Support loading gcode_macro templates from files #578
Conversation
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
kageurufu
force-pushed
the
macro_file_loader
branch
from
e2059cd to
a33b4d0
Compare
Currently, writing a python macro is somewhat painful, requiring preficing each line with a single `!` to make preserve indentation. This also heavily limits editor support. This PR adds support for `!!include path/to/macro.py` (and technically `!!include macro.notpy` resolves as jinja2 gcode templates). For python macros, I've also added type stubs in `klippy/macro.pyi` and added `TYPE_CHECKING` to the environment. This allows for basic typing support in macro definitions. In the future I would love to be able to generate a bespoke type stub including Printer objects, but thats long term. ``` if TYPE_CHECKING: from klippy.macro import * ```
kageurufu
force-pushed
the
macro_file_loader
branch
from
a33b4d0 to
548459a
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, writing a python macro is somewhat painful, requiring preficing each line with a single
!to make preserve indentation. This also heavily limits editor support.This PR adds support for
!!include path/to/macro.py(and technically!!include macro.notpyresolves as jinja2 gcode templates).For python macros, I've also added type stubs in
klippy/macro.pyiand addedTYPE_CHECKINGto the environment. This allows for basic typing support in macro definitions. In the future I would love to be able to generate a bespoke type stub including Printer objects, but thats long term.Checklist