Skip to content
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

fix: shows missing macro parameters #566

Merged

Conversation

pedrolamas
Copy link
Member

Fixes issue introduced with #524, were a macro parameter with no default value would not show up in the interface.

Tested with the following example:

[gcode_macro TEST]
gcode:
  {% set A = params.A | default(0, true) | float %}
  {% set B = params.B | int | default(0.005, true) | float %}
  {% set C = params.C | default("PLA", true) %}
  {% set D = params.D | default("PLA") %}
  {% set E = params.E | int | default(0.2) %}
  {% set F = params.F %}

Before (F missing):

image

After (F showing):

image

Signed-off-by: Pedro Lamas [email protected]

@pedrolamas pedrolamas added this to the 1.17.2 milestone Mar 8, 2022
matmen
matmen previously approved these changes Mar 9, 2022
Copy link
Member

@matmen matmen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just one line that could be simplified ;)

src/components/ui/AppMacroBtn.vue Outdated Show resolved Hide resolved
Signed-off-by: Pedro Lamas <[email protected]>
@pedrolamas pedrolamas requested a review from matmen March 9, 2022 22:50
@pedrolamas pedrolamas merged commit 18da8e4 into fluidd-core:develop Mar 10, 2022
@pedrolamas pedrolamas deleted the pedrolamas/fix-macro-params branch March 10, 2022 09:10
matmen added a commit to matmen/fluidd that referenced this pull request Jun 27, 2022
Signed-off-by: Pedro Lamas <[email protected]>
Co-authored-by: Mathis Mensing <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants