-
-
Notifications
You must be signed in to change notification settings - Fork 378
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: add macro prompt dialog #1630
feat: add macro prompt dialog #1630
Conversation
Signed-off-by: Stefan Dej <meteyou@gmail.com>
Signed-off-by: Stefan Dej <meteyou@gmail.com>
Signed-off-by: Stefan Dej <meteyou@gmail.com>
Signed-off-by: Stefan Dej <meteyou@gmail.com>
…romptActionButton Signed-off-by: Stefan Dej <meteyou@gmail.com>
Signed-off-by: Stefan Dej <meteyou@gmail.com>
Signed-off-by: Stefan Dej <meteyou@gmail.com>
Signed-off-by: Stefan Dej <meteyou@gmail.com>
Signed-off-by: Stefan Dej <meteyou@gmail.com>
Signed-off-by: Stefan Dej <meteyou@gmail.com>
Signed-off-by: Stefan Dej <meteyou@gmail.com>
Signed-off-by: Stefan Dej <meteyou@gmail.com>
Signed-off-by: Stefan Dej <meteyou@gmail.com>
Signed-off-by: Stefan Dej <meteyou@gmail.com>
Signed-off-by: Stefan Dej <meteyou@gmail.com>
Awesome! The implementation does seem to deviate a bit from the octoprint "spec" though. Octoprint "protocol":
While in this PR it looks like (as far as I could infer from the code):
I like the extensions since they allow richer interactions, but I think the basic protocol should remain compatible with the one from octoprint. |
Very nice! |
@ulope both are not compatible. so you have to write your macros complete different, that you can use this in klipper, because klipper has no "wait for an user input" function and the prompt_end command don't definite the "end" of the declaration. so the "close" command is really a "close" of the prompt. I already wrote the docs for this feature. maybe it will be clearer with that: |
Well you don't have to. But it's probably right that the way you implemented it is much easier to use for Klipper users...
So is
|
Signed-off-by: Stefan Dej <meteyou@gmail.com>
@ulope: I prepared for our testing a flow that contains M600 and filament runout. Doing that gets pretty “ugly” fast. alao the use of Octoprint and moonraker/mainsail is nothing that is done in parallel so that there is in my opinion no need to be 100% compatible to the octoprint version. |
choice/button: we believe the word button is the better here and why having 2 cmds that do exactly the same |
Yeah, I've been working on a PR that adds support for prompts to KlipperScreen and after using it a bit I agree that the model you came up with will lead to much simpler and easier to write macros. My only concern regarding compatibility is that people may want to switch from / to octoprint and then would have to re-work their macros. |
In my opinion that will not be an issue. They need to rework there Octoprint command flow anyhow. Look at the M600 example I hope you using the same command we do to give the user a possibility to see and do the same regardless what UI he uses in that moment. |
Yes, that was my initial concern to have alignment across all implementations, but as I said above, I've come around to your point of view in the meantime. |
@ulope plus post your discord name, or write me a pn. I will add you to a channel. |
Cool, my username is |
You can actually create pseudo asynchronity in klipper by having a starting macro which sets everything up, then activates a delayed gcode that calls itself while checking a variable, then you have a macro which sets that variable and then the delayed gcode reads it and continues. |
sry. i cannot find this user on the Mainsail discord.... |
I’m definitely there. Sent you a PN on discord. |
Signed-off-by: Stefan Dej <meteyou@gmail.com>
is could be possible, that klipper is busy and dont execute the close command fast enough Signed-off-by: Stefan Dej <meteyou@gmail.com>
Signed-off-by: Stefan Dej meteyou@gmail.com
Description
This PR will add a function to Mainsail, to generate prompts via gcode/macros.
Related Tickets & Documents
fixes #1625
Mobile & Desktop Screenshots/Recordings
[optional] Are there any post-deployment tasks we need to perform?