Skip to content

Commit 6cd377b

Browse files
authored
fixup
* add description * nix the confusing "expected"/"actual" nomenclature in favor of "configured"/"sliced" and * use the nomenclature correctly in the error message
1 parent 0a4490e commit 6cd377b

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

macros.cfg

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,12 +235,13 @@ gcode:
235235
G0 X{safe_x} Y{y} F{speed}
236236

237237
[gcode_macro ASSERT_NOZZLE_DIAMETER]
238+
description: Raises an error unless the configured nozzle diameter is the same as the diameter passed in.
238239
gcode:
239-
{% set expected_diameter = params.NOZZLE_DIAMETER|float %}
240-
{% set actual_diameter = printer.configfile.config.extruder.nozzle_diameter|float %}
241-
{% if expected_diameter != actual_diameter %}
240+
{% set configured_diameter = printer.configfile.config.extruder.nozzle_diameter|float %}
241+
{% set sliced_diameter = params.NOZZLE_DIAMETER|float %}
242+
{% if configured_diameter != sliced_diameter %}
242243
M117 Aborting print due to nozzle-diameter mismatch between printer config and slicer.
243-
{ action_raise_error("Nozzle-diameter mismatch between printer config (%s mm) and slicer (%s mm)." % (expected_diameter, actual_diameter)) }
244+
{ action_raise_error("Nozzle-diameter mismatch between printer config (%s mm) and slicer (%s mm)." % (configured_diameter, sliced_diameter)) }
244245
{% endif %}
245246

246247
#####

0 commit comments

Comments
 (0)